From 5bf732bf4bf76171463340d74ac4686e2dc85c87 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 23 Aug 2015 13:55:11 +0100 Subject: [PATCH 001/553] Restore the listing of Darwin packages. `nix-env -qaP -A pkgs.darwin` pkgs.darwin.libutil: Commented-out because the package definition doesn't exist. The source doesn't even provide a Makefile... pkgs.darwin.objc4_pure: Commented-out because the package is broken and referencing unknown applefetchsource and libc_old names. It doesn't seem to be used by any other packages too. --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index f29a2b5b911..43698629a46 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -76,11 +76,11 @@ let libpthread = applePackage "libpthread" "105.1.4" "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {}; libresolv = applePackage "libresolv" "54" "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {}; Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; - libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; + #libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {}; objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; - objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; + #objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; ppp = applePackage "ppp" "727.90.1" "166xz1q7al12hm3q3drlp2r6fgdrsq3pmazjp3nsqg3vnglyh4gk" {}; removefile = applePackage "removefile" "33" "0ycvp7cnv40952a1jyhm258p6gg5xzh30x86z5gb204x80knw30y" {}; Security = applePackage "Security" "55471.14.18" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; -- GitLab From 0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 10:32:57 +0200 Subject: [PATCH 002/553] xlibs.xlibs: remove It was really ugly that `xlibs.xlibs` meant something else than `xlibs`, especially when using `with xlibs`, such as in wine. Also, now `xlibs` is the same as `xorg`. --- pkgs/applications/video/vlc/default.nix | 2 +- pkgs/applications/video/xine-ui/default.nix | 2 +- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 4 ++-- .../libraries/gstreamer/legacy/gst-plugins-base/default.nix | 2 +- pkgs/development/libraries/libcm/default.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/misc/screensavers/electricsheep/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- pkgs/tools/graphics/graphviz/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +++-- 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index ae7f71e607e..5fcdf3a4581 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva - xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms + xlibs.xlibsWrapper xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 6ae4100c827..1f3c43b8dc7 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg - xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto + xlibs.xlibsWrapper xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto xlibs.libXinerama xlibs.libXi xlibs.libXft ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d230d19d588..1bf2635b987 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xlibs.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 47a2c63d328..e2d6b25e137 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty -, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs +, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; propagatedBuildInputs = - with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ] + with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] ++ optional (!stdenv.isDarwin) libXrender ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 040cf20c4ea..510ff86d1cf 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango + [ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix index 09ef21dff59..2b34f282d2a 100644 --- a/pkgs/development/libraries/libcm/default.nix +++ b/pkgs/development/libraries/libcm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; }; buildInputs = [ - pkgconfig glib xlibs.xlibs xlibs.libXdamage xlibs.libXcomposite + pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite xlibs.libXtst xlibs.inputproto # !!! inputproto should really be propagated by libXtst ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index bf63340d35d..db20d0aca19 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses ]) ++ (with pkgs.xlibs; [ - xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite + xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite ])); # Wine locates a lot of libraries dynamically through dlopen(). Add diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index dca60f55af0..bbba28a58c2 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibs xlibs.libXv]; + buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv]; preInstall = '' installFlags=GNOME_DATADIR=$out diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e018c7790b9..41fe345bb95 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ lib.optionals x11Support [ xlibs.xlibsWrapper xlibs.libXtst xlibs.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 80179539701..aecc7bba501 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 2fcea02519a..9c3213c878b 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af367e3d49e..5c1ded43b8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -189,7 +189,7 @@ let # old modular X libraries project (called `xlibs') but now it's just # the set of packages in the modular X.org tree (which also includes # non-library components like the server, drivers, fonts, etc.). - xlibs = xorg // {xlibs = xlibsWrapper;}; + xlibs = xorg; ### Helper functions. @@ -8350,6 +8350,7 @@ let xercesc = callPackage ../development/libraries/xercesc {}; + # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt @@ -9219,7 +9220,7 @@ let mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - }); + } // { inherit xlibsWrapper; } ); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; -- GitLab From 47ad941fbfe752f679d6bc577d2408f79aee7054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 10:37:13 +0200 Subject: [PATCH 003/553] x11,xlibs: deprecate these aliases --- pkgs/top-level/all-packages.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c1ded43b8f..62d90f924b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -181,17 +181,6 @@ let path = ../..; - ### Symbolic names. - - x11 = xlibsWrapper; - - # `xlibs' is the set of X library components. This used to be the - # old modular X libraries project (called `xlibs') but now it's just - # the set of packages in the modular X.org tree (which also includes - # non-library components like the server, drivers, fonts, etc.). - xlibs = xorg; - - ### Helper functions. inherit lib config stdenvAdapters; @@ -15025,6 +15014,8 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + xlibs = xorg; # added 2015-09 + x11 = xlibsWrapper; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 -- GitLab From 21e3ff658ac2d7b7986169f31550aa5f65bb7635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 11:13:22 +0200 Subject: [PATCH 004/553] x11: replace its usage by xlibsWrapper directly Scilab note: the parameters already had pointed to nonexistent dirs before this set of refactoring. But that config wasn't even used by default. --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- pkgs/applications/display-managers/lightdm/default.nix | 2 +- pkgs/applications/editors/emacs-24/default.nix | 4 ++-- pkgs/applications/editors/nedit/default.nix | 4 ++-- pkgs/applications/gis/qgis/default.nix | 4 ++-- pkgs/applications/graphics/feh/default.nix | 4 ++-- pkgs/applications/graphics/xfig/default.nix | 4 ++-- pkgs/applications/misc/synergy/default.nix | 4 ++-- pkgs/applications/misc/wordnet/default.nix | 4 ++-- pkgs/applications/misc/xfe/default.nix | 4 ++-- pkgs/applications/misc/xpdf/default.nix | 6 +++--- .../networking/browsers/elinks/default.nix | 4 ++-- .../mozilla-plugins/gecko-mediaplayer/default.nix | 4 ++-- pkgs/applications/networking/browsers/w3m/default.nix | 6 +++--- .../networking/instant-messengers/amsn/default.nix | 4 ++-- .../networking/instant-messengers/tkabber/default.nix | 4 ++-- pkgs/applications/science/math/scilab/default.nix | 10 +++------- pkgs/applications/video/gnash/default.nix | 4 ++-- pkgs/applications/video/mythtv/default.nix | 4 ++-- .../virtualization/open-vm-tools/default.nix | 4 ++-- pkgs/applications/window-managers/ion-3/default.nix | 4 ++-- pkgs/applications/window-managers/notion/default.nix | 4 ++-- pkgs/applications/window-managers/weston/default.nix | 4 ++-- pkgs/desktops/enlightenment/default.nix | 2 +- pkgs/development/compilers/ocaml/3.08.0.nix | 4 ++-- pkgs/development/compilers/ocaml/3.10.0.nix | 6 +++--- pkgs/development/compilers/ocaml/3.11.2.nix | 6 +++--- pkgs/development/compilers/ocaml/3.12.1.nix | 6 +++--- pkgs/development/compilers/ocaml/4.00.1.nix | 6 +++--- pkgs/development/compilers/ocaml/ber-metaocaml-003.nix | 6 +++--- pkgs/development/compilers/ocaml/metaocaml-3.09.nix | 6 +++--- pkgs/development/haskell-modules/hackage-packages.nix | 4 ++-- pkgs/development/interpreters/pypy/default.nix | 4 ++-- pkgs/development/interpreters/python/2.6/default.nix | 6 +++--- pkgs/development/interpreters/python/2.7/default.nix | 8 ++++---- pkgs/development/libraries/SDL/default.nix | 6 +++--- pkgs/development/libraries/SDL2/default.nix | 6 +++--- pkgs/development/libraries/Xaw3d/default.nix | 6 +++--- pkgs/development/libraries/cairomm/default.nix | 4 ++-- pkgs/development/libraries/dlib/default.nix | 6 +++--- pkgs/development/libraries/fltk/default.nix | 4 ++-- pkgs/development/libraries/fltk/fltk13.nix | 4 ++-- pkgs/development/libraries/fox/default.nix | 4 ++-- pkgs/development/libraries/fox/fox-1.6.nix | 4 ++-- pkgs/development/libraries/freeglut/default.nix | 4 ++-- pkgs/development/libraries/giblib/default.nix | 4 ++-- pkgs/development/libraries/glew/default.nix | 4 ++-- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- pkgs/development/libraries/gtk+/3.x.nix | 2 +- pkgs/development/libraries/imlib2/default.nix | 4 ++-- pkgs/development/libraries/lirc/default.nix | 4 ++-- pkgs/development/libraries/pango/default.nix | 4 ++-- pkgs/development/libraries/physics/geant4/default.nix | 8 ++++---- pkgs/development/libraries/qt-3/default.nix | 4 ++-- pkgs/development/libraries/snack/default.nix | 4 ++-- pkgs/development/pure-modules/gl/default.nix | 4 ++-- pkgs/development/pure-modules/tk/default.nix | 4 ++-- pkgs/development/python-modules/pycairo/default.nix | 4 ++-- pkgs/development/r-modules/default.nix | 2 +- pkgs/games/astromenace/default.nix | 4 ++-- pkgs/games/minetest/default.nix | 4 ++-- pkgs/games/quake3/game/default.nix | 4 ++-- pkgs/games/voxelands/default.nix | 4 ++-- pkgs/games/zoom/default.nix | 4 ++-- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 ++-- pkgs/misc/ghostscript/default.nix | 6 +++--- pkgs/misc/screensavers/rss-glx/default.nix | 4 ++-- pkgs/misc/screensavers/xautolock/default.nix | 4 ++-- pkgs/misc/screensavers/xtrlock-pam/default.nix | 4 ++-- pkgs/os-specific/linux/conky/default.nix | 6 +++--- pkgs/tools/X11/primus/lib.nix | 4 ++-- pkgs/tools/X11/xinput_calibrator/default.nix | 4 ++-- pkgs/tools/admin/tightvnc/default.nix | 4 ++-- pkgs/tools/audio/pasystray/default.nix | 4 ++-- pkgs/tools/graphics/glxinfo/default.nix | 4 ++-- pkgs/tools/graphics/graphviz/2.0.nix | 6 +++--- pkgs/tools/graphics/scrot/default.nix | 4 ++-- pkgs/tools/misc/unclutter/default.nix | 4 ++-- pkgs/tools/misc/xclip/default.nix | 4 ++-- pkgs/tools/misc/xsel/default.nix | 4 ++-- pkgs/tools/networking/x11-ssh-askpass/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 83 files changed, 183 insertions(+), 187 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 1b9323c1a7b..5bec7aa6dd0 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11 +{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper # transports , curl, libmms # input plugins @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ # basic requirements - cmake qt4 pkgconfig x11 + cmake qt4 pkgconfig xlibsWrapper # transports curl libmms # input plugins diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 94337989055..e0c5db18dbb 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, x11, libxklavier, libgcrypt +, intltool, xlibsWrapper, libxklavier, libgcrypt , qt4 ? null, qt5 ? null }: diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 6c52a899108..368b06b17e0 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d +{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX - [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK3) gtk3 diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index a4dfc4719dc..56a8ac62025 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, motif, libXpm }: +{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }: assert stdenv.isLinux; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - buildInputs = [ x11 motif libXpm ]; + buildInputs = [ xlibsWrapper motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 98663a946ae..8d9771c9134 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { name = "qgis-2.10.1"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla + buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql ] ++ (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index ac0a2ec0d4c..266f70e3008 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng +{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng , libXinerama, curl, libexif }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46"; }; - buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; + buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]; preBuild = '' makeFlags="PREFIX=$out exif=1" diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 88183c5e5a3..9e53fe3efe2 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, imake -, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: +, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: let version = "3.2.5b"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; + buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; nativeBuildInputs = [ imake makeWrapper ]; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index c010047845f..ac60d928587 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl + cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl ]; installPhase = '' diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index c70436e68f9..b244e9c1bfc 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, x11, makeWrapper}: +{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: let version = "3.0"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk x11 makeWrapper]; + buildInputs = [tcl tk xlibsWrapper makeWrapper]; patchPhase = '' sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 5055ac50089..0ea1159208f 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: +{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.37"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; }; - buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; + buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 2e690dcce09..e677164ecf4 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: -assert enableGUI -> x11 != null && motif != null && freetype != null; +assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optionals enableGUI [x11 motif] ++ + stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 0e4fd4db1ba..1a698b0effd 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl +{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl , spidermonkey, gpm , enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enablePython ? false, python ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 05e3a8bf613..ba40925e1d1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper , GConf, gnome_mplayer, mplayer, gmtk }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ]; + buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ]; # !!! fix this preBuild = diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index ade28b519bc..d8c421af46a 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -3,12 +3,12 @@ , graphicsSupport ? false , mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, x11 ? null, fbcon ? null +, imlib2 ? null, xlibsWrapper ? null, fbcon ? null , gpm-ncurses ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); +assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null); assert mouseSupport -> gpm-ncurses != null; stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional mouseSupport gpm-ncurses - ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; + ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon]; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 37c0b4a694d..770f0952e1f 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: +{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}: stdenv.mkDerivation { name = "amsn-0.98.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; - buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper]; + buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; postInstall = '' wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index d0cc333c71b..f9209f28cf2 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, makeWrapper, x11 +, bwidget, makeWrapper, xlibsWrapper , withSitePlugins ? true , theme ? null }: @@ -62,7 +62,7 @@ in mkTkabber (main // { done ''; - buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; + buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries; meta = { homepage = "http://tkabber.jabber.ru/"; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index bbb34e08c46..8482bd6fe94 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -8,7 +8,7 @@ , ocaml, withOCaml ? false #, withJava ? false #, atlasMath, withAtlas ? false -, x11, withX ? false +, xlibsWrapper, withX ? false }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran ncurses] ++ lib.optionals withGtk [gtk] ++ lib.optionals withOCaml [ocaml] - ++ lib.optionals withX [x11] + ++ lib.optional withX xlibsWrapper ; @@ -58,11 +58,7 @@ stdenv.mkDerivation rec { # do not compile Java interface + " --without-java" # use the X Window System - + (lib.optionalString withX " - --with-x - --x-libraries=${x11}/lib - --x-includes=${x11}/include - ") + + lib.optionalString withX "--with-x" ; makeFlags = "all"; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index fc773211f69..c129597151f 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # XXX: KDE is supported as well so we could make it available optionally. buildInputs = [ - gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good + gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg dbus curl pkgconfig glib gtk gtkglext pangox_compat diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index cd157a473e6..4320022192a 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec +{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; buildInputs = [ - freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec + freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib ]; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index cfe4ad3a8e1..e8c6b39f493 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, autoconf, automake, libmspack, openssl, pam, xercesc, icu, libdnet, procps, - x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gtk, gtkmm }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps - pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; patchPhase = '' sed -i s,-Werror,,g configure.ac diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 7a467b1fcdb..f4199073077 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, lua, gettext, groff }: +{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: stdenv.mkDerivation { name = "ion-3-20090110"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; - buildInputs = [ x11 lua gettext groff ]; + buildInputs = [ xlibsWrapper lua gettext groff ]; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; } diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index cd43c06d33e..2177d1a871f 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -4,7 +4,7 @@ stdenv, fetchurl, lua, gettext, groff, pkgconfig, busybox, - x11, libXinerama, libXrandr, libX11 + xlibsWrapper, libXinerama, libXrandr, libX11 }: assert enableXft -> libXft != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation { patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff; postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'"; - buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; + buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index d270d3a2b1d..7a662aaf09e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb -, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm + pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp ]; diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 61f58719b27..a69e13630ec 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, dbus, imlib2, freetype }: +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }: let version = "0.16.8.15"; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index f4640b36e67..a2581f29a3f 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation { name = "ocaml-3.08.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; configureScript = ./configure-3.08.0; dontAddPrefix = "True"; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = ["world" "bootstrap" "opt"]; checkTarget = ["opt.opt"]; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 69a6a1f5f67..2734bc3235d 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index ce61e562139..c62a8151ef7 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; prePatch = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index e6ed6f4b73e..e9073a42cf0 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; preConfigure = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index f8a7ed920a5..b366f20ffb6 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 882af287c04..6c2bc8cb9ca 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installFlags = "-i"; installTargets = "install"; # + optionalString useNativeCompilers " installopt"; prePatch = '' diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 9b340f69e90..6eca566dd2c 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9f628dab60..a0fdea2fc56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -60530,13 +60530,13 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, x11 }: + ({ mkDerivation, base, glib, gtk, xlibsWrapper }: mkDerivation { pname = "gtk-traymanager"; version = "0.1.5"; sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443"; libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ x11 ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index f5cf11ead97..fe209f6f114 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11 , makeWrapper, callPackage, self }: assert zlibSupport -> zlib != null; @@ -21,7 +21,7 @@ let sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 28f53f8ca95..32974778168 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: +, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; @@ -49,7 +49,7 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; @@ -198,7 +198,7 @@ let tkinter = buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 ]; + deps = [ tcl tk xlibsWrapper ]; }; readline = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 195caa583ad..6f951bc2837 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -5,7 +5,7 @@ , db, gdbm, ncurses, sqlite, readline -, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin +, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin , zlib ? null, zlibSupport ? true , expat, libffi @@ -15,7 +15,7 @@ assert zlibSupport -> zlib != null; assert x11Support -> tcl != null && tk != null - && x11 != null + && xlibsWrapper != null && libX11 != null; with stdenv.lib; @@ -92,7 +92,7 @@ let ++ optionals stdenv.isCygwin [ expat libffi ] ++ optionals includeModules ( [ db gdbm ncurses sqlite readline - ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib @@ -249,7 +249,7 @@ let tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 libX11 ]; + deps = [ tcl tk xlibsWrapper libX11 ]; }); } // { diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 1fae5d42ab7..ac895b5113e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile, libcap , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ x11 libXrandr ] ++ + optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ optional openglSupport mesa ++ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f5bd144a717..7573d1e1cd2 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 454c4e882f5..6084e7074fe 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: +{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: stdenv.mkDerivation { name = "Xaw3d-1.5E"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch ./laylex.patch]; - buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; - propagatedBuildInputs = [x11 libXmu]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; + propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { description = "3D widget set based on the Athena Widget set"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b8e9fd7966b..97636f7a957 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { name = "cairomm-1.11.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; + propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 0d262fb061e..8a24445dcca 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, x11 }: +{ stdenv, fetchurl, cmake, xlibsWrapper }: stdenv.mkDerivation rec { version = "18.10"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake x11 ]; - propagatedBuildInputs = [ x11 ]; + buildInputs = [ cmake xlibsWrapper ]; + propagatedBuildInputs = [ xlibsWrapper ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d51419f3754..6398e5542ac 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: let inherit (composableDerivation) edf; in @@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec { sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index a5b65f09e61..cb71724a360 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , automake, autoconf, libtool @@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; enableParallelBilding = true; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index dfd2c75184e..2d44444ab40 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e966388b2ad..3c823adf91b 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, mesa, libXft, libXfixes, xinput }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft mesa libXfixes xinput ]; doCheck = true; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6159ce7c9e0..368a1e27487 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 3ae649b6790..b6e515fef80 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, imlib2 }: +{ stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - buildInputs = [x11 imlib2]; + buildInputs = [xlibsWrapper imlib2]; meta = { homepage = http://linuxbrit.co.uk/giblib/; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5127311e7c9..cbdc2831187 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: with stdenv.lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 087be3bb6de..02d26759834 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper libXinerama libXcursor ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fec9d16cf95..01f7b6e1065 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty, x11 +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ x11 libXdamage ] + ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5fb70ac05ea..6fd583e7fee 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy +, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 50703f907d3..3ff608a4ac3 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { name = "imlib2-1.4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; - buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 4513530e6f0..a2e5d153060 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: stdenv.mkDerivation rec { name = "lirc-0.9.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ]; + buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ]; configureFlags = [ "--with-driver=devinput" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a92..2db67041ec3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 872576d9fb0..2c07c1e0858 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -26,7 +26,7 @@ # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. , mesa ? null -, x11 ? null +, xlibsWrapper ? null , libXmu ? null }: @@ -41,7 +41,7 @@ assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11 != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; let @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index ffad4418815..08d8f141deb 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -7,7 +7,7 @@ , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, mesa ? null, libXmu ? null -, x11, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; + propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index d7a0b11a8da..ef2db5ae5a6 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbisTools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }: +{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ]; + buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ]; postInstall = "aoeu"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 37026ad9344..eb1c01e4eef 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure freeglut mesa x11 ]; + propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index b36a58279fa..0fe1667b040 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure tcl tk x11 ]; + propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 0589bec36b9..cb93ccc2b58 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy }: if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; @@ -23,7 +23,7 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; - buildInputs = [ python pkgconfig cairo x11 ]; + buildInputs = [ python pkgconfig cairo xlibsWrapper ]; configurePhase = '' ( diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 62d39d768f9..2d1c1566185 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -289,7 +289,7 @@ let rgdal = [ pkgs.proj pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; - rgl = [ pkgs.mesa pkgs.x11 ]; + rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 76aed3f2cc6..681fec72f96 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, mesa, SDL, openal, freealut, libogg, libvorbis }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ]; + buildInputs = [ cmake xlibsWrapper mesa SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 72673ea010c..850b1d391c5 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype , gettext }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa - openal libvorbis x11 sqlite luajit freetype gettext + openal libvorbis xlibsWrapper sqlite luajit freetype gettext ]; postInstall = '' diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index ed447004345..2ad922834d3 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }: +{ lib, stdenv, fetchurl, xlibsWrapper, SDL, mesa, openal, gcc46 }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ./botlib.patch ]; - buildInputs = [ x11 SDL mesa openal gcc46 ]; + buildInputs = [ xlibsWrapper SDL mesa openal gcc46 ]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 7d96829f12b..4c0c76d60b8 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }: +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { name = "voxelands-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm mesa openal libvorbis x11 pkgconfig + libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index cb9974580d8..1ce2abf79b8 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, expat, x11, freetype }: +{ stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: # !!! assert freetype == xlibs.freetype @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - buildInputs = [ perl expat x11 freetype ]; + buildInputs = [ perl expat xlibsWrapper freetype ]; # Zoom doesn't add the right directory in the include path. CFLAGS = [ "-I" (freetype + "/include/freetype2") ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 32d47093d68..c1ff6cb9493 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 4d9d9cedde5..9f930900c41 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, expat, openssl , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec , libiconv -, x11Support ? false, x11 ? null +, x11Support ? false, xlibsWrapper ? null , cupsSupport ? false, cups ? null }: -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let version = "9.15"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec libiconv ] - ++ stdenv.lib.optional x11Support x11 + ++ stdenv.lib.optional x11Support xlibsWrapper ++ stdenv.lib.optional cupsSupport cups # [] # maybe sometimes jpeg2000 support ; diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 56d176a710c..606a4200d0e 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ]; + buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 114d745f140..b40827e7bfb 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, libXScrnSaver, scrnsaverproto}: +{stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto}: stdenv.mkDerivation rec { @@ -11,5 +11,5 @@ stdenv.mkDerivation rec makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man"; preBuild = "xmkmf"; installTargets = "install install.man"; - buildInputs = [x11 imake libXScrnSaver scrnsaverproto]; + buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto]; } diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 16a6622aa22..1f12ffa9301 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, pkgconfig, x11, pam }: +{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: stdenv.mkDerivation { name = "xtrlock-pam-3.4-post-20150909"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8"; }; - buildInputs = [ python pkgconfig x11 pam ]; + buildInputs = [ python pkgconfig xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 60bfe093017..b857d5ece45 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -9,7 +9,7 @@ # optional features with extra dependencies , ncursesSupport ? true , ncurses ? null -, x11Support ? true , x11 ? null +, x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null , imlib2Support ? x11Support, imlib2 ? null @@ -29,7 +29,7 @@ assert ncursesSupport -> ncurses != null; -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert xdamageSupport -> x11Support && libXdamage != null; assert imlib2Support -> x11Support && imlib2 != null; assert luaSupport -> lua != null; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib cmake ] ++ optional ncursesSupport ncurses - ++ optional x11Support x11 + ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index fb18907c50f..96a4ac16c9b 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, x11, mesa +, xlibsWrapper, mesa , nvidia }: let @@ -15,6 +15,6 @@ stdenv.mkDerivation { inherit nvidia mesa; - buildInputs = [ x11 mesa ]; + buildInputs = [ xlibsWrapper mesa ]; builder = ./builder.sh; } diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 8f21f6558ff..eda19b7a5bf 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }: +{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ]; + buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ]; meta = { homepage = https://github.com/tias/xinput_calibrator; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index a1a091a90cc..22b8a607fd3 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu +{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit xauth fontDirectories perl; gcc = stdenv.cc.cc; - buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw + buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth openssh ]; patchPhase = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index d214a75b441..01c6501f840 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}: +, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: stdenv.mkDerivation rec { name = "pasystray-0.5.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake makeWrapper pkgconfig gnome3.defaultIconTheme - avahi gtk3 libnotify libpulseaudio x11 ]; + avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; preConfigure = '' aclocal diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index d0235c5bade..35bc1e610de 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, mesa}: +{stdenv, fetchurl, xlibsWrapper, mesa}: let version = "8.1.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp"; }; - buildInputs = [x11 mesa]; + buildInputs = [xlibsWrapper mesa]; configurePhase = "true"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index fcc06871ef1..04fff805381 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (x11 == null) "--without-x"; + ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; meta = { description = "A program for visualising graphs"; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 411e2fb45c8..aa8958bb63d 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, giblib, x11 }: +{ stdenv, fetchurl, giblib, xlibsWrapper }: stdenv.mkDerivation rec { name = "scrot-0.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - buildInputs = [ giblib x11 ]; + buildInputs = [ giblib xlibsWrapper ]; meta = { homepage = http://linuxbrit.co.uk/scrot/; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index d97ba727bae..00f08ee0742 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11}: +{stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "unclutter-8"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; installPhase = '' mkdir -pv "$out/bin" diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 20d5e66cfa2..3f616fdad68 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }: +{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }: stdenv.mkDerivation rec { # The last release from 2012, 0.12, lacks '-targets' @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -vfi"; - buildInputs = [ x11 libXmu autoconf automake libtool ]; + buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ]; meta = { description = "Tool to access the X clipboard from a console application"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 74eadaf5e2e..3fe0f409f29 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11}: +{stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "xsel-1.2.0"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; } diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 5088d92a8c7..88e7f1aec5a 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake}: +{stdenv, fetchurl, xlibsWrapper, imake}: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildPhase = "xmkmf; make includes; make"; - buildInputs = [x11 imake]; + buildInputs = [xlibsWrapper imake]; meta = { homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c80901789c..838e5353b2f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12163,7 +12163,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; - buildInputs = [pkgs.x11]; + buildInputs = [pkgs.xlibsWrapper]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server }; @@ -12174,7 +12174,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; - buildInputs = [pkgs.x11 pkgs.xorg.libXtst pkgs.xorg.libXi]; + buildInputs = [pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi]; NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst"; doCheck = false; # requires an X server }; -- GitLab From 88c9f8b574ead01e32c5ee5228679723343cd52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 11:26:18 +0200 Subject: [PATCH 005/553] xlibs: replace occurrences by xorg This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before. --- doc/functions.xml | 2 +- .../services/x11/display-managers/gdm.nix | 2 +- .../services/x11/display-managers/kdm.nix | 2 +- pkgs/applications/audio/audacious/default.nix | 4 +- pkgs/applications/audio/bristol/default.nix | 6 +-- pkgs/applications/audio/distrho/default.nix | 6 +-- pkgs/applications/audio/eq10q/default.nix | 4 +- pkgs/applications/audio/jaaa/default.nix | 2 +- pkgs/applications/audio/rkrlv2/default.nix | 4 +- pkgs/applications/audio/spotify/default.nix | 22 ++++----- pkgs/applications/audio/tetraproc/default.nix | 4 +- pkgs/applications/editors/atom/default.nix | 8 ++-- .../editors/lighttable/default.nix | 6 +-- pkgs/applications/editors/sublime/default.nix | 4 +- .../applications/editors/sublime3/default.nix | 4 +- pkgs/applications/graphics/gimp/2.8.nix | 6 +-- pkgs/applications/inferno/default.nix | 4 +- pkgs/applications/kde-apps-15.04/default.nix | 10 ++-- pkgs/applications/misc/evilvte/default.nix | 6 +-- pkgs/applications/misc/finalterm/default.nix | 4 +- pkgs/applications/misc/keepassx/2.0.nix | 4 +- pkgs/applications/misc/xcruiser/default.nix | 4 +- .../networking/browsers/firefox/default.nix | 12 ++--- .../instant-messengers/hipchat/default.nix | 26 +++++----- .../instant-messengers/teamspeak/client.nix | 4 +- .../instant-messengers/viber/default.nix | 10 ++-- .../mailreaders/thunderbird/default.nix | 12 ++--- pkgs/applications/office/mendeley/default.nix | 4 +- pkgs/applications/office/zotero/default.nix | 2 +- .../science/math/mathematica/9.nix | 4 +- .../science/math/mathematica/default.nix | 4 +- .../science/misc/openmodelica/default.nix | 4 +- .../git-and-tools/default.nix | 4 +- pkgs/applications/video/tvtime/default.nix | 6 +-- pkgs/applications/video/vlc/default.nix | 4 +- pkgs/applications/video/xine-ui/default.nix | 6 +-- .../virtualization/xen/generic.nix | 4 +- .../window-managers/awesome/default.nix | 20 ++++---- .../window-managers/qtile/default.nix | 8 ++-- pkgs/data/documentation/zeal/default.nix | 4 +- pkgs/desktops/e19/efl.nix | 16 +++---- pkgs/desktops/e19/enlightenment.nix | 6 +-- pkgs/desktops/enlightenment/default.nix | 4 +- .../gnome-2/platform/gtkglext/default.nix | 4 +- .../gnome-2/platform/libgnomeui/default.nix | 4 +- pkgs/desktops/plasma-5.3/default.nix | 20 ++++---- .../compilers/cudatoolkit/generic.nix | 4 +- .../compilers/oraclejdk/jdk-linux-base.nix | 8 ++-- .../compilers/oraclejdk/jdk6-linux.nix | 8 ++-- pkgs/development/haskell-modules/default.nix | 2 +- .../haskell-modules/hackage-packages.nix | 48 +++++++++---------- pkgs/development/interpreters/erlang/R15.nix | 6 +-- pkgs/development/interpreters/erlang/R16.nix | 6 +-- pkgs/development/interpreters/erlang/R17.nix | 6 +-- pkgs/development/interpreters/erlang/R18.nix | 6 +-- .../development/interpreters/self/default.nix | 4 +- .../interpreters/xulrunner/default.nix | 12 ++--- .../libraries/at-spi2-atk/default.nix | 4 +- .../libraries/directfb/default.nix | 4 +- pkgs/development/libraries/frame/default.nix | 4 +- pkgs/development/libraries/geis/default.nix | 4 +- pkgs/development/libraries/grail/default.nix | 4 +- .../legacy/gst-plugins-base/default.nix | 4 +- pkgs/development/libraries/gtk+/2.x.nix | 6 +-- pkgs/development/libraries/gtk+/3.x.nix | 6 +-- pkgs/development/libraries/jasper/default.nix | 2 +- .../libraries/kde-frameworks-5.10/default.nix | 6 +-- .../libraries/kde-frameworks-5.12/default.nix | 6 +-- .../libraries/libclxclient/default.nix | 6 +-- pkgs/development/libraries/libcm/default.nix | 6 +-- .../libraries/qt-5/5.3/default.nix | 4 +- .../development/libraries/qt-5/5.4/qtbase.nix | 4 +- pkgs/development/libraries/wtk/default.nix | 4 +- .../libraries/xcb-util-cursor/HEAD.nix | 8 ++-- pkgs/development/pharo/vm/default.nix | 4 +- pkgs/development/r-modules/default.nix | 6 +-- pkgs/development/tools/electron/default.nix | 8 ++-- pkgs/development/tools/node-webkit/nw11.nix | 10 ++-- pkgs/development/tools/node-webkit/nw12.nix | 10 ++-- pkgs/development/tools/node-webkit/nw9.nix | 10 ++-- .../tools/selenium/server/default.nix | 4 +- pkgs/development/tools/thrust/default.nix | 8 ++-- pkgs/games/adom/default.nix | 4 +- pkgs/games/megaglest/default.nix | 4 +- pkgs/games/planetaryannihilation/default.nix | 8 ++-- pkgs/games/sdlmame/default.nix | 4 +- pkgs/games/snake4/default.nix | 4 +- pkgs/games/spring/default.nix | 4 +- pkgs/games/steam/chrootenv.nix | 36 +++++++------- pkgs/games/ue4demos/default.nix | 4 +- pkgs/games/ut2004demo/default.nix | 4 +- pkgs/games/zoom/default.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 2 +- .../screensavers/electricsheep/default.nix | 4 +- pkgs/misc/themes/qtcurve/default.nix | 4 +- .../os-specific/linux/ati-drivers/default.nix | 6 +-- pkgs/os-specific/linux/nvidia-x11/beta.nix | 8 ++-- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++-- .../linux/nvidia-x11/legacy173.nix | 6 +-- .../linux/nvidia-x11/legacy304.nix | 6 +-- .../linux/nvidia-x11/legacy340.nix | 8 ++-- .../linux/opengl/xorg-sys/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 4 +- pkgs/tools/X11/vdpauinfo/default.nix | 2 +- pkgs/tools/X11/xbrightness/default.nix | 16 +++---- pkgs/tools/X11/xrestop/default.nix | 4 +- pkgs/tools/graphics/glmark2/default.nix | 4 +- pkgs/tools/graphics/graphviz/2.32.nix | 6 +-- pkgs/tools/graphics/graphviz/default.nix | 10 ++-- pkgs/tools/inputmethods/touchegg/default.nix | 4 +- pkgs/tools/misc/antimicro/default.nix | 4 +- pkgs/tools/misc/ocz-ssd-guru/default.nix | 12 ++--- pkgs/tools/misc/pipelight/default.nix | 4 +- pkgs/tools/security/tor/torbrowser.nix | 6 +-- pkgs/top-level/all-packages.nix | 16 +++---- pkgs/top-level/perl-packages.nix | 14 +++--- pkgs/top-level/python-packages.nix | 14 +++--- 117 files changed, 406 insertions(+), 406 deletions(-) diff --git a/doc/functions.xml b/doc/functions.xml index 3e4ac3f3c6b..7fd30cabf16 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; } targetPkgs = pkgs: (with pkgs; [ udev alsaLib - ]) ++ (with pkgs.xlibs; + ]) ++ (with pkgs.xorg; [ libX11 libXcursor libXrandr diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 887b6f88a74..c9a56376832 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -106,7 +106,7 @@ in systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ]; - systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; + systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ]; services.dbus.packages = [ gdm ]; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d0b69c5452c..558f5e8cfc7 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -19,7 +19,7 @@ let ''} [X-*-Core] - Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb + Xrdb=${pkgs.xorg.xrdb}/bin/xrdb SessionsDirs=${dmcfg.session.desktops} Session=${dmcfg.session.script} FailsafeClient=${pkgs.xterm}/bin/xterm diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 3ab113c92e8..9476fbaf335 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs -, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg +, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , mpg123, neon, faad2 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib - libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio + libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio libcddb ffmpeg makeWrapper mpg123 neon faad2 ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index db1f7895f4b..e19acab36b5 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext - xlibs.xproto + alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext + xorg.xproto ]; preInstall = '' diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a590716537b..72893dfb19a 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }: +, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { name = "distrho-ports-git-2015-07-18"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 - xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext - xlibs.libXinerama xlibs.libXrender ladspa-sdk + xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext + xorg.libXinerama xorg.libXrender ladspa-sdk ]; buildPhase = '' diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 61c97953422..5d5b70a5898 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: +{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-2-${version}"; version = "beta7.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 0427283d54d..b0fbced2211 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 9c41c88b012..084d187c347 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchFromGitHub, -automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile +automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; }; - buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; meta = { description = "Rakarrak effects ported to LV2"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 005b3e1b60d..2868d760973 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , libgcrypt, chromium, udev, fontconfig , dbus, expat }: @@ -28,16 +28,16 @@ let qt4 stdenv.cc.cc udev - xlibs.libX11 - xlibs.libXcomposite - xlibs.libXdamage - xlibs.libXext - xlibs.libXfixes - xlibs.libXi - xlibs.libXrandr - xlibs.libXrender - xlibs.libXrender - xlibs.libXScrnSaver + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXrender + xorg.libXScrnSaver ]; in diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index a107dd9794b..d450cce7b86 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient -, libsndfile, libxcb, xlibs +, libsndfile, libxcb, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype - libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender + libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender ]; makeFlags = [ diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 4de862b0254..9bcad5b7649 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd }: let @@ -9,9 +9,9 @@ let paths = [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap systemd + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 6db7130896f..6dbeff55063 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev +, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes ]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index ffa1c4eed34..c7b0f9864c9 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk}: +{ fetchurl, stdenv, glib, xorg, cairo, gtk}: let - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 1764c85ca7d..b26d27a8bc5 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let build = "3083"; - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; in let # package with just the binaries sublime = stdenv.mkDerivation { diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 83f409457fb..7c394ae11c6 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: +, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: stdenv.mkDerivation rec { name = "gimp-2.8.14"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext xlibs.libXpm + python pygtk libart_lgpl libexif gettext xorg.libXpm wrapPython ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" + NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 0d61d5635a5..a0e2796a302 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }: +{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; # Fails with gcc48 due to inferno triggering an optimisation issue with floating point. - buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ]; + buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ]; infernoWrapper = ./inferno; diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 83aca36bc00..d1f909edf09 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -174,7 +174,7 @@ let libvncserver libical networkmanager openal opencv openexr perl phonon pkgconfig polkit_qt4 prison python qca2 qimageblitz qjson qt4 samba saneBackends soprano speechd - strigi taglib udev xlibs xplanet xscreensaver xz; + strigi taglib udev xorg xplanet xscreensaver xz; alsa = alsaLib; assuan = libassuan; boost = boost156; @@ -289,7 +289,7 @@ let kde-wallpapers = kde4Package super.kde-wallpapers; kde-workspace = extendDerivation (kde4Package super.kde-workspace) { - buildInputs = with scope.xlibs; [ + buildInputs = with scope.xorg; [ libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil ]; nativeBuildInputs = [ scope.pkgconfig ]; @@ -385,7 +385,7 @@ let }; kmousetool = extendDerivation (kde4Package super.kmousetool) { - buildInputs = with scope.xlibs; [ libXtst libXt ]; + buildInputs = with scope.xorg; [ libXtst libXt ]; }; kmouth = kde4Package super.kmouth; @@ -407,13 +407,13 @@ let krdc = kde4Package super.krdc; kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) { - buildInputs = [ scope.xlibs.libXtst ]; + buildInputs = [ scope.xorg.libXtst ]; }; kreversi = kde4Package super.kreversi; krfb = extendDerivation (kde4Package super.krfb) { - buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ]; + buildInputs = with scope; [ xorg.libXtst ktp-common-internals ]; }; ksaneplugin = kde4Package super.ksaneplugin; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 5921cc308b5..f7a8fe4eafc 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, - gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, + gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, configH }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 - xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig + gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11 + xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig ]; buildPhase = '' diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index bdd1a9e8e28..c8e8bb01e5d 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, makeWrapper , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify -, libxkbcommon, xlibs, udev +, libxkbcommon, xorg, udev , bashInteractive }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper - xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence + xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ lib.optionals stdenv.isLinux [ udev diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 6a5ce9fd604..acdd91aaf68 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: stdenv.mkDerivation { name = "keepassx2-2.0beta2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"; }; - buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; + buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 15202a1e90c..f580c41c0a4 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gccmakedep, xlibs }: +{ stdenv, fetchurl, gccmakedep, xorg }: stdenv.mkDerivation { name = "xcruiser-0.30"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; }; - buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ]; + buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ]; configurePhase = "xmkmf -a"; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 12d581b1566..6ca36f504d3 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -39,11 +39,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ gstreamer gst_plugins_base icu libpng jemalloc libpulseaudio # only headers are needed diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index f82ffa5ecd3..2462664b0c4 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib +{ stdenv, fetchurl, libtool, xorg, freetype, fontconfig, openssl, glib , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra , makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }: @@ -10,18 +10,18 @@ let rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc libtool - xlibs.libXext - xlibs.libSM - xlibs.libICE - xlibs.libX11 - xlibs.libXft - xlibs.libXau - xlibs.libXdmcp - xlibs.libXrender - xlibs.libXfixes - xlibs.libXcomposite - xlibs.libxcb - xlibs.libXi + xorg.libXext + xorg.libSM + xorg.libICE + xorg.libX11 + xorg.libXft + xorg.libXau + xorg.libXdmcp + xorg.libXrender + xorg.libXfixes + xorg.libXcomposite + xorg.libxcb + xorg.libXi freetype fontconfig openssl diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 13798061b71..ece4b9f0e01 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype -, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null +, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which, unzip }: @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 4ebfddf82e1..8e07bbf975b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: +{ fetchurl, stdenv, dpkg, makeWrapper, xorg, qt5Full, gstreamer, zlib, sqlite, libxslt }: assert stdenv.system == "x86_64-linux"; @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [ qt5Full - xlibs.libX11 + xorg.libX11 gstreamer zlib sqlite - xlibs.libXrender + xorg.libXrender libxslt stdenv.cc.cc - xlibs.libXScrnSaver - xlibs.libXext + xorg.libXScrnSaver + xorg.libXext ]; installPhase = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 5d6e0faad4a..96dd7bb9af0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification cairo icu ] ++ [ m4 ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b0c3e58cfbb..ea6d565a10b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, dpkg, makeWrapper, which -,gcc, xlibs, qt4, zlib +,gcc, xorg, qt4, zlib , ...}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -24,7 +24,7 @@ let deps = [ gcc.cc qt4 - xlibs.libX11 + xorg.libX11 zlib ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9283072c0c1..be1729b57c9 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }: +{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }: let diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c9357d7352f..b24863a200f 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { opencv openssl unixODBC - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 5fc70417883..331f2db34e2 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib , libxml2 , libuuid @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { unixODBC libxml2 libuuid - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 3741187067d..5357ff09b21 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }: +doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu + doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu git gtk makeWrapper]; patchPhase = '' diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index adf8027bf27..62fab543abd 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -51,13 +51,13 @@ rec { qgit = import ./qgit { inherit fetchurl stdenv; - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; qt = qt4; }; qgitGit = import ./qgit/qgit-git.nix { inherit fetchurl sourceFromHead stdenv; - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; qt = qt4; }; diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix index 2ec5e813c41..459ea533dba 100644 --- a/pkgs/applications/video/tvtime/default.nix +++ b/pkgs/applications/video/tvtime/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, +{stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, pkgconfig, kernel, file, libXi}: @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { ''; configureFlags = '' - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib + --x-includes=${xorg.libX11}/include + --x-libraries=${xorg.libX11}/lib ''; buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 5fcdf3a4581..69a3f418328 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray +{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva - xlibs.xlibsWrapper xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms + xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 1f3c43b8dc7..fd7b31de16e 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl +{stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg - xlibs.xlibsWrapper xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto - xlibs.libXinerama xlibs.libXi xlibs.libXft + xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto + xorg.libXinerama xorg.libXi xorg.libXft ]; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 2ff66d843ca..71c26c5f99c 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , lvm2, utillinux, procps, texinfo, perl, pythonPackages -, glib, bridge-utils, xlibs, pixman, iproute, udev, bison +, glib, bridge-utils, xorg, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt @@ -66,7 +66,7 @@ stdenv.mkDerivation { [ which zlib pkgconfig SDL openssl libuuid gettext ncurses dev86 iasl pciutils bzip2 xz texinfo perl yajl pythonPackages.python pythonPackages.wrapPython - glib bridge-utils pixman iproute udev bison xlibs.libX11 + glib bridge-utils pixman iproute udev bison xorg.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig glusterfs acl cmake spice spice_protocol usbredir diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index c57a89193b5..9c9d3d5f451 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf -, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs +, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen @@ -46,15 +46,15 @@ stdenv.mkDerivation rec { pango pkgconfig xcb-util-cursor - xlibs.libXau - xlibs.libXdmcp - xlibs.libxcb - xlibs.libxshmfence - xlibs.xcbutil - xlibs.xcbutilimage - xlibs.xcbutilkeysyms - xlibs.xcbutilrenderutil - xlibs.xcbutilwm + xorg.libXau + xorg.libXdmcp + xorg.libxcb + xorg.libxshmfence + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm #xmlto docbook_xml_dtd_45 docbook_xsl ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 39d942362be..236baa131c9 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -17,20 +17,20 @@ buildPythonPackage rec { substituteInPlace libqtile/manager.py --subst-var-by out $out ''; - buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; + buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; cairocffi-xcffib = python27Packages.cairocffi.override { - LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; pythonPath = [ python27Packages.xcffib ]; }; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; - LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; postInstall = '' wrapProgram $out/bin/qtile \ - --prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \ + --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index ccfb43b14d5..a6c77deb12e 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }: +{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive + xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; configurePhase = '' diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 10b69647c0e..16c934b3b3a 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto - xlibs.libX11 udev utillinuxCurses ]; + gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto + xorg.libX11 udev utillinuxCurses ]; - propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite - xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext - bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr - xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit + propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite + xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext + bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr + xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm libinput ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; - NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; patches = [ ./efl-elua.patch ]; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 7a350d7396b..e4396073c03 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 +{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2 , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: stdenv.mkDerivation rec { @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb - xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 + buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb + xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; preConfigure = '' diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index a69e13630ec..5aa3d781e4b 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }: +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }: let version = "0.16.8.15"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ let version = "0.16.8.15"; in }; buildInputs = [pkgconfig imlib2 freetype - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft ]; + xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ]; meta = { description = "Desktop shell built on the Enlightenment Foundation Libraries"; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index b278dadfe24..ff50bcd5e5c 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: +{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - buildInputs = with xlibs; + buildInputs = with xorg; [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 1bf2635b987..961fb1c0a19 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango +{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xlibs.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index f9026b5843a..550491731dc 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -128,7 +128,7 @@ let freetype glib gnugrep gnused gtk2 gtk3 libinput libssh modemmanager openconnect openexr pam pango qt4 samba socat substituteAll taglib utillinux wayland xapian - xkeyboard_config xlibs xorg; + xkeyboard_config xorg; boost = boost156; canberra = libcanberra; epub = ebook_tools; @@ -157,7 +157,7 @@ let breeze-qt4 = overrideDerivation super.breeze (drv: { name = "breeze-qt4-${version}"; - buildInputs = [ pkgs.xlibs.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; + buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=ON" @@ -194,18 +194,18 @@ let }; kwin = extendDerivation super.kwin { - buildInputs = with scope.xlibs; [ libICE libSM libXcursor ]; + buildInputs = with scope.xorg; [ libICE libSM libXcursor ]; patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; }; libkscreen = extendDerivation super.libkscreen { - buildInputs = [ scope.xlibs.libXrandr]; + buildInputs = [ scope.xorg.libXrandr]; }; plasma-desktop = extendDerivation super.plasma-desktop { buildInputs = with scope; [ canberra ] - ++ (with xlibs; [ libxkbfile libXcursor libXft ]); + ++ (with xorg; [ libxkbfile libXcursor libXft ]); patches = [ (scope.substituteAll { src = ./plasma-desktop/plasma-desktop-hwclock.patch; @@ -217,13 +217,13 @@ let xkb = scope.xkeyboard_config; }) ]; - NIX_CFLAGS_COMPILE = with scope.xlibs; + NIX_CFLAGS_COMPILE = with scope.xorg; lib.concatStringsSep " " [ "-I${xf86inputsynaptics}/include/xorg" "-I${xf86inputevdev}/include/xorg" "-I${xorgserver}/include/xorg" ]; - cmakeFlags = with scope.xlibs; [ + cmakeFlags = with scope.xorg; [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include" ]; @@ -231,7 +231,7 @@ let plasma-workspace = extendDerivation super.plasma-workspace { patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; - buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ]; + buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ]; inherit (scope) bash coreutils gnused gnugrep socat; inherit (scope) kconfig kinit kservice qt5tools; @@ -246,11 +246,11 @@ let }; powerdevil = extendDerivation super.powerdevil { - buildInputs = [ scope.xlibs.libXrandr ]; + buildInputs = [ scope.xorg.libXrandr ]; }; sddm-kcm = extendDerivation super.sddm-kcm { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; }; diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix index d4970b278bb..a02c917ab24 100644 --- a/pkgs/development/compilers/cudatoolkit/generic.nix +++ b/pkgs/development/compilers/cudatoolkit/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib -, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc +, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc # generic inputs , version, sha256, url ? null, ... } : @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { runtimeDependencies = [ ncurses expat python zlib glibc - xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsaLib ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 35ee1a04a26..9d1d836db83 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -13,7 +13,7 @@ , requireFile , unzip , file -, xlibs ? null +, xorg ? null , installjdk ? true , pluginSupport ? true , installjce ? false @@ -34,7 +34,7 @@ }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xlibs != null; +assert swingSupport -> xorg != null; let @@ -173,8 +173,8 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []); + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 84fdf63f359..1b33a40635a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -3,14 +3,14 @@ , requireFile , unzip , makeWrapper -, xlibs ? null +, xorg ? null , installjdk ? true , pluginSupport ? true , installjce ? false }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xlibs != null; +assert swingSupport -> xorg != null; let @@ -73,10 +73,10 @@ stdenv.mkDerivation { */ libraries = [stdenv.cc.libc] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt] else []); inherit swingSupport pluginSupport architecture jce; - inherit (xlibs) libX11; + inherit (xorg) libX11; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7e6f1c0552d..81687bd56a2 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -43,7 +43,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a0fdea2fc56..3e85e7374ef 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5309,7 +5309,7 @@ self: { description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5323,7 +5323,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5388,7 +5388,7 @@ self: { description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -6903,7 +6903,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xlibs) libX11;}; + inherit (pkgs.xorg) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -16518,9 +16518,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs.xlibs) libXrender;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -16536,7 +16536,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11;}; + }) {inherit (pkgs.xorg) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -16588,7 +16588,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -16625,7 +16625,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) xinput;}; + }) {inherit (pkgs.xorg) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -16693,7 +16693,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXau;}; + }) {inherit (pkgs.xorg) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -22017,7 +22017,7 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -26520,10 +26520,10 @@ self: { jailbreak = true; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; - inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; - inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; inherit (pkgs) mesa;}; "bindings-K8055" = callPackage @@ -71956,7 +71956,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -101655,7 +101655,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage @@ -123173,7 +123173,7 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: @@ -145274,7 +145274,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -145435,7 +145435,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -146584,8 +146584,8 @@ self: { description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {Xrender = null; inherit (pkgs.xlibs) libXpm; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xorg) libXpm; + inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -147043,7 +147043,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXtst;}; + }) {inherit (pkgs.xorg) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix index e9c8380c35a..12f7a020032 100644 --- a/pkgs/development/interpreters/erlang/R15.nix +++ b/pkgs/development/interpreters/erlang/R15.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , makeWrapper, gnused, gawk -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }: -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; let version = "15B03"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xorg.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 23243803e8d..cc15a2d21f5 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }: -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; assert odbcSupport -> unixODBC != null; with stdenv.lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] + ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] ++ optional odbcSupport [ unixODBC ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 3a3d7434515..6c24f6ecb79 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null +, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null , enableHipe ? true }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xlibs != null); + else mesa != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) + ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ optional odbcSupport [ unixODBC ] ++ optional javacSupport [ openjdk ]; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 9bc36ee47de..7646de28a85 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null +, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null , enableHipe ? true }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xlibs != null); + else mesa != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) + ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ optional odbcSupport [ unixODBC ] ++ optional javacSupport [ openjdk ]; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index f53e42f0bde..d37d6099394 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }: +{ fetchurl, fetchgit, stdenv, xorg, gcc44, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works. - buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ]; + buildInputs = [ gcc44 ncurses xorg.libX11 xorg.libXext makeWrapper cmake ]; selfWrapper = ./self; diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 1f24b4dde54..bc943a80ac7 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo gstreamer gst_plugins_base icu ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 940fc2bb6cc..7e6286abcce 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"; }; - buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 81c23f7e41c..b4dd865dec0 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, xlibs +, enableX11 ? true, xorg , enableSDL ? true, SDL }: let s = @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 (with xlibs; [ + ++ stdenv.lib.optionals enableX11 (with xorg; [ xproto libX11 libXext #xextproto #renderproto libXrender ]); diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 86ebaa0d8d9..fa8e9f0ef2c 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: stdenv.mkDerivation rec { name = "frame-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv pkgconfig - ] ++ stdenv.lib.optional enableX11 [xlibs.xorgserver xlibs.libX11 xlibs.libXext xlibs.libXi]; + ] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 24c24fe5f12..5ef53ec7939 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }: stdenv.mkDerivation rec { name = "geis-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 dbus_libs frame grail ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver]; configureFlags = stdenv.lib.optional enableX11"--enable-x11"; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 3cf946bb4ba..a4f27824d13 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xlibs, python3, frame }: + stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { name = "grail-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 frame ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.libXfixes]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 510ff86d1cf..eb55ae874e5 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty , # Whether to build no plugins that have external dependencies @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango + [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 01f7b6e1065..e821e693b0c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg , gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 6fd583e7fee..1929dd01c6b 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy +, xorg, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ wayland ] ++ optional xineramaSupport libXinerama diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 7b86403b0aa..2fa9cf7dbf9 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xlibs, libjpeg }: +{ stdenv, fetchurl, unzip, xorg, libjpeg }: stdenv.mkDerivation rec { name = "jasper-1.900.1"; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index d5bb3f78ce8..8196aeab6c2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -147,7 +147,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -164,7 +164,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix index d8f51fe7eb7..1b42bab4263 100644 --- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost156; gif = giflib; glib2 = glib; @@ -154,7 +154,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -171,7 +171,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 4dc103515ac..4dca6b57c75 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; - buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; + buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; - NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include"; patchPhase = '' sed -e "s@ldconfig@@" -i Makefile diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix index 2b34f282d2a..1d4e96d55b6 100644 --- a/pkgs/development/libraries/libcm/default.nix +++ b/pkgs/development/libraries/libcm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}: +{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}: stdenv.mkDerivation { name = "libcm-0.1.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; }; buildInputs = [ - pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite - xlibs.libXtst xlibs.inputproto + pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite + xorg.libXtst xorg.inputproto # !!! inputproto should really be propagated by libXtst ]; propagatedBuildInputs = [mesa]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index d1a049d78a7..0f46fec5a9a 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -2,7 +2,7 @@ , libXfixes, freetype, fontconfig, zlib, libjpeg, libpng , mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi -, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage +, gdk_pixbuf, python, gdb, xorg, libX11, libxcb, xcbutil, xcbutilimage , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , alsaLib, gstreamer, gst_plugins_base , libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu libwebp alsaLib gstreamer gst_plugins_base libpulseaudio diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 2e4a1c1c161..30d53eb874b 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll , srcs, version -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre , zlib, libjpeg, libpng, libtiff, sqlite, icu @@ -163,7 +163,7 @@ stdenv.mkDerivation { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index bde3f6e4efb..0ed4f24ef86 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, xlibs }: +{ stdenv, requireFile, unzip, xorg }: assert stdenv.system == "i686-linux"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ]; + libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e503ade3ebc..cf14490c514 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig -, git, xlibs, gnum4, libxcb, gperf }: +, git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-gf03cc27"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { libtool libxcb pkgconfig - xlibs.utilmacros - xlibs.xcbutilimage - xlibs.xcbutilrenderutil + xorg.utilmacros + xorg.xcbutilimage + xorg.xcbutilrenderutil ]; configurePhase = '' diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b98d1f2385d..a62088824ff 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }: stdenv.mkDerivation rec { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { unzip ${sources40Zip} -d $prefix/lib/pharo-vm/ ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; + buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2d1c1566185..a9d81f028f4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -235,7 +235,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl ]; curl = [ pkgs.curl ]; - devEMF = [ pkgs.xlibs.libXft ]; + devEMF = [ pkgs.xorg.libXft ]; diversitree = [ pkgs.gsl pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; fftw = [ pkgs.fftw ]; @@ -340,7 +340,7 @@ let TAQMNGR = [ pkgs.zlib ]; tiff = [ pkgs.libtiff ]; TKF = [ pkgs.gsl ]; - tkrplot = [ pkgs.xlibs.libX11 ]; + tkrplot = [ pkgs.xorg.libX11 ]; topicmodels = [ pkgs.gsl ]; udunits2 = [ pkgs.udunits pkgs.expat ]; V8 = [ pkgs.v8 ]; @@ -1632,7 +1632,7 @@ let }); devEMF = old.devEMF.overrideDerivation (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b3867be6377..d686da98fa3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip , systemd }: let @@ -9,9 +9,9 @@ let paths = [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap systemd + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 978213f6760..ed3b99aad00 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 0ad3ece2465..7492acb1367 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 97399e5268c..213b94102b0 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,10 +8,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc - xlibs.libXtst xlibs.libXi + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc + xorg.libXtst xorg.libXi ]; }; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 26435088ade..2efd85f8401 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs +{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg , chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a5bfb8bfc59..a59d656b625 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss -, xlibs, libcap, unzip +, xorg, libcap, unzip }: let @@ -8,9 +8,9 @@ let name = "env-thrust"; paths = [ stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf - cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 - xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite - xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap + cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 + xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite + xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 74fe5232fa1..07075571c7e 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio -, xlibs }: +, xorg }: assert stdenv.system == "x86_64-linux"; let - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2de42fd86ee..059fa74f8be 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu , mesa_drivers }: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; }; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index a94f388b322..ed682e7bed9 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,12 +34,12 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f done ''; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 6e063a34bc8..7cc4c2b96b1 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xlibs }: +{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.cc}/lib" \ + --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \ share/sdlmame/sdlmame mkdir -p "$out/bin" diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index 081604d2ce8..2899f712098 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, shhmsg, shhopt, xlibs }: +{ stdenv, fetchurl, shhmsg, shhopt, xorg }: stdenv.mkDerivation rec { name = "snake4-1.0.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; - buildInputs = with xlibs; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; + buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; preInstall = '' substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" "" diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index aabd3656505..fe764c90b4b 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL - xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b9d13265ce7..ffd68562dee 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -13,7 +13,7 @@ buildFHSUserEnv { pkgs.python pkgs.gnome2.zenity pkgs.xdg_utils - pkgs.xlibs.xrandr + pkgs.xorg.xrandr pkgs.which ] ++ lib.optional (config.steam.java or false) pkgs.jdk @@ -28,23 +28,23 @@ buildFHSUserEnv { pkgs.pango pkgs.freetype - pkgs.xlibs.libICE - pkgs.xlibs.libSM - pkgs.xlibs.libX11 - pkgs.xlibs.libXau - pkgs.xlibs.libxcb - pkgs.xlibs.libXcursor - pkgs.xlibs.libXdamage - pkgs.xlibs.libXdmcp - pkgs.xlibs.libXext - pkgs.xlibs.libXfixes - pkgs.xlibs.libXi - pkgs.xlibs.libXinerama - pkgs.xlibs.libXrandr - pkgs.xlibs.libXrender - pkgs.xlibs.libXScrnSaver - pkgs.xlibs.libXtst - pkgs.xlibs.libXxf86vm + pkgs.xorg.libICE + pkgs.xorg.libSM + pkgs.xorg.libX11 + pkgs.xorg.libXau + pkgs.xorg.libxcb + pkgs.xorg.libXcursor + pkgs.xorg.libXdamage + pkgs.xorg.libXdmcp + pkgs.xorg.libXext + pkgs.xorg.libXfixes + pkgs.xorg.libXi + pkgs.xorg.libXinerama + pkgs.xorg.libXrandr + pkgs.xorg.libXrender + pkgs.xorg.libXScrnSaver + pkgs.xorg.libXtst + pkgs.xorg.libXxf86vm pkgs.ffmpeg pkgs.libpng12 diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index a0e583e1075..ed2ea23d415 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }: +{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: assert stdenv.isLinux; assert stdenv.isx86_64; @@ -11,7 +11,7 @@ let buildInputs = [ unzip patchelf ]; rtdeps = stdenv.lib.makeLibraryPath - [ xlibs.libXxf86vm xlibs.libXext openal ] + [ xorg.libXxf86vm xorg.libXext openal ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; buildCommand = diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index a828d22ca0b..13f770eab2b 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, mesa}: +{stdenv, fetchurl, xorg, mesa}: assert stdenv.system == "i686-linux"; @@ -17,7 +17,7 @@ let { name = raw.name; builder = ./make-wrapper.sh; inherit raw mesa; - inherit (xlibs) libX11 libXext; + inherit (xorg) libX11 libXext; }; } diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 1ce2abf79b8..200b9c24c7d 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: -# !!! assert freetype == xlibs.freetype +# !!! assert freetype == xorg.freetype stdenv.mkDerivation { name = "zoom-1.1.5"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db20d0aca19..1e2d656fb0e 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses - ]) ++ (with pkgs.xlibs; [ + ]) ++ (with pkgs.xorg; [ xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite ])); diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index bbba28a58c2..27e26d6d5df 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}: +{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}: stdenv.mkDerivation rec { name = "electricsheep-2.6.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv]; + buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; preInstall = '' installFlags=GNOME_DATADIR=$out diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index e63f6846002..2aa73f1e0c1 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools , gtk2, kde_workspace, kdelibs # Toolkit dependencies -, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies +, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { libXdmcp libxcb pkgconfig - xlibs.libxshmfence + xorg.libxshmfence ]; patches = [ diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 834e798e8d1..bb088885509 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, which, imake +{ stdenv, fetchurl, kernel ? null, which, imake , mesa # for fgl_glxgears , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf @@ -48,8 +48,8 @@ stdenv.mkDerivation { patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = - [ xlibs.libXext xlibs.libX11 xlibs.libXinerama - xlibs.libXrandr which imake makeWrapper + [ xorg.libXext xorg.libX11 xorg.libXinerama + xorg.libXrandr which imake makeWrapper patchelf unzip mesa diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix index dc6af818837..d3111a4f75a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/beta.nix +++ b/pkgs/os-specific/linux/nvidia-x11/beta.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -43,14 +43,14 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xlibs.libXv ]; + programPath = makeLibraryPath [ xorg.libXv ]; buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 953c8c60125..4390d5bdf3c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -46,14 +46,14 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xlibs.libXv ]; + programPath = makeLibraryPath [ xorg.libXv ]; buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 432a756b6f6..6bde91d0ffc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: +{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}: let @@ -30,11 +30,11 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 7f13b6795d4..42e65f927b3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -36,12 +36,12 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index a53906ed020..bb974410e37 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -46,13 +46,13 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 2cebb8d9dcc..5bb757a73a0 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -6,11 +6,11 @@ # Of course, use of the driver in /usr/lib is highly impure. But it # might actually work ;-) -{stdenv, xlibs, expat, libdrm}: +{stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { name = "xorg-sys-opengl-3"; builder = ./builder.sh; - neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.cc]; + neededLibs = [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 41fe345bb95..86bcb3e1cec 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook , json_c, libsndfile, libtool -, xlibs, libcap, alsaLib, glib +, xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xlibs.xlibsWrapper xlibs.libXtst xlibs.libXi ] + ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 167c710dd26..7a18a6a98b6 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: +{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }: stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index cb10718a11b..e7c5c5baf45 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs }: +{ stdenv, fetchurl, xorg }: stdenv.mkDerivation { @@ -9,13 +9,13 @@ stdenv.mkDerivation { }; buildInputs = [ - xlibs.imake - xlibs.libX11 - xlibs.libXaw - xlibs.libXext - xlibs.libXmu - xlibs.libXpm - xlibs.libXxf86vm + xorg.imake + xorg.libX11 + xorg.libXaw + xorg.libXext + xorg.libXmu + xorg.libXpm + xorg.libXxf86vm ]; configurePhase = "xmkmf"; diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 5158963258c..2f18f678483 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }: +{ stdenv, fetchurl, xorg, pkgconfig, ncurses }: stdenv.mkDerivation rec { name = "xrestop-${version}"; @@ -9,5 +9,5 @@ stdenv.mkDerivation rec { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ]; + buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ]; } diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 97fcd1addd0..12ae9b6d89b 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xlibs, libX11, mesa, libdrm, python27 }: +{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }: stdenv.mkDerivation rec { name = "glmark2-${version}"; version = "2014.03"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libjpeg libpng12 xlibs.libxcb libX11 mesa libdrm python27 + pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27 ]; buildPhase = '' diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index aecc7bba501..2743bd78aa7 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender ] + ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-cgraph=no" "--with-sparse=no" ] - ++ stdenv.lib.optional (xlibs == null) "--without-x"; + ++ stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 9c3213c878b..fbf1c114d0a 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex }: @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender pango libXaw ] + ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; - CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") + CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; configureFlags = @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (xlibs == null) "--without-x"; + ++ stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile ''; # "command -v" is POSIX, "which" is not - postInstall = stdenv.lib.optionalString (xlibs != null) '' + postInstall = stdenv.lib.optionalString (xorg != null) '' sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty sed -i 's|which|command -v|' $out/bin/vimdot ''; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 1cf3cfa00af..4ac3c02d410 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, xorgserver, qt4, mesa, geis }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; - buildInputs = [ xorgserver mesa xlibs.libX11 xlibs.libXtst xlibs.libXext qt4 geis ]; + buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; configurePhase = '' sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 80791756e65..a2eed913930 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }: +{ stdenv, cmake, pkgconfig, SDL2, qt5, xorg, fetchzip }: stdenv.mkDerivation rec { name = "antimicro-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst + cmake pkgconfig SDL2 qt5.base qt5.tools xorg.libXtst ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 7ee6089c249..21786f3f15f 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }: let system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ - xlibs.libX11 - xlibs.libxcb + xorg.libX11 + xorg.libxcb freetype fontconfig - xlibs.libXext - xlibs.libXi - xlibs.libXrender + xorg.libXext + xorg.libXi + xorg.libXrender stdenv.cc.cc glibc mesa diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 89459eb281b..40f441e065d 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; - buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ]; + buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ]; propagatedbuildInputs = [ curl cabextract ]; patches = [ ./pipelight.patch ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index aa85793be18..bd7531af18f 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv -, xlibs, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib}: let bits = if stdenv.system == "x86_64-linux" then "64" @@ -10,8 +10,8 @@ let name = "tor-env"; paths = [ stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype - fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext - xlibs.libXt + fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext + xorg.libXt ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62d90f924b2..52697ff43e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1655,7 +1655,7 @@ let graphviz = callPackage ../tools/graphics/graphviz { }; graphviz-nox = callPackage ../tools/graphics/graphviz { - xlibs = null; + xorg = null; libdevil = libdevil-nox; }; @@ -3869,7 +3869,7 @@ let inherit zip unzip zlib boehmgc gettext pkgconfig perl; inherit gtk; inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender + inherit (xorg) libX11 libXt libSM libICE libXtst libXi libXrender libXrandr xproto renderproto xextproto inputproto randrproto; }); @@ -8342,9 +8342,9 @@ let # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ - freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt - xlibs.libXft xlibs.libXext xlibs.libSM xlibs.libICE - xlibs.xextproto + freetype fontconfig xorg.xproto xorg.libX11 xorg.libXt + xorg.libXft xorg.libXext xorg.libSM xorg.libICE + xorg.xextproto ]; }; @@ -10950,7 +10950,7 @@ let emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features - libXaw = xlibs.libXaw; + libXaw = xorg.libXaw; Xaw3d = null; gconf = null; alsaLib = null; @@ -13064,7 +13064,7 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; @@ -14848,7 +14848,7 @@ let vbam = callPackage ../misc/emulators/vbam {}; vice = callPackage ../misc/emulators/vice { - libX11 = xlibs.libX11; + libX11 = xorg.libX11; giflib = giflib_4_1; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 838e5353b2f..a6b75136325 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4687,7 +4687,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetoptLong ]; + pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm GetoptLong ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. @@ -4697,7 +4697,7 @@ let self = _self // overrides; _self = with self; { # tests fail doCheck = false; - makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; + makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xorg.libXpm}"; }; GDSecurityImage = buildPerlPackage { @@ -8249,7 +8249,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; }; - buildInputs = with pkgs; [ mesa mesa_glu freeglut xlibs.libX11 xlibs.libXi xlibs.libXmu xlibs.libXext xdummy ]; + buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -11723,8 +11723,8 @@ let self = _self // overrides; _self = with self; { url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; }; - makeMakerFlags = "X11LIB=${pkgs.xlibs.libX11}/lib"; - buildInputs = with pkgs; [ xlibs.libX11 libpng ]; + makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib"; + buildInputs = with pkgs; [ xorg.libX11 libpng ]; configurePhase = '' perl Makefile.PL PREFIX=$out $makeMakerFlags ''; @@ -12149,9 +12149,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AW/AWENDT/${name}.tar.gz"; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; - buildInputs = [ pkgs.xlibs.libXext pkgs.xlibs.libXScrnSaver pkgs.xlibs.libX11 ]; + buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xlibs.libX11}/lib/ -L${pkgs.xlibs.libXext}/lib/ -L${pkgs.xlibs.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 411057541df..c8555904fbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10267,7 +10267,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] - ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; + ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -11197,7 +11197,7 @@ let }; patchPhase = let - libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ]; + libs = [ pkgs.mesa pkgs.xorg.libX11 pkgs.freetype pkgs.fontconfig ]; paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; @@ -13218,7 +13218,7 @@ let sha256 = "0l70pqwg88imbylcd831vg8nj8ipy4zr331f6qjccss7vn56i2h5"; }; - buildInputs = with self; [pkgs.xlibs.libX11]; + buildInputs = with self; [pkgs.xorg.libX11]; # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some # absolute paths. Replaced by relative path so it is found when used in nix. @@ -13232,7 +13232,7 @@ let patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xlibs.libX11}/lib/libX11.so.6" + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ @@ -13819,7 +13819,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 pkgs.pythonDBus pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; @@ -14446,7 +14446,7 @@ let # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? postInstall = '' - libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib + libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib wrapProgram $out/bin/taskcoach.py \ --prefix LD_LIBRARY_PATH : $libspaths ''; @@ -15587,7 +15587,7 @@ let # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 ]; meta = { description = "Fully functional X client library for Python programs"; -- GitLab From eb09b1fd856e7346d60188b2df64fdfe758c2fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 12:53:48 +0200 Subject: [PATCH 006/553] hackage-packages: revert the xlib renaming changes The file is generated anyway. @peti: is there an easy way to make the generator use different attribute names? (But this case isn't important at all.) --- .../haskell-modules/hackage-packages.nix | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3e85e7374ef..f9f628dab60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5309,7 +5309,7 @@ self: { description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5323,7 +5323,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5388,7 +5388,7 @@ self: { description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -6903,7 +6903,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xorg) libX11;}; + inherit (pkgs.xlibs) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -16518,9 +16518,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; - inherit (pkgs.xorg) libXrender;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; + inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; + inherit (pkgs.xlibs) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -16536,7 +16536,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11;}; + }) {inherit (pkgs.xlibs) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -16588,7 +16588,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) {inherit (pkgs.xorg) libXft;}; + }) {inherit (pkgs.xlibs) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -16625,7 +16625,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) xinput;}; + }) {inherit (pkgs.xlibs) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -16693,7 +16693,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXau;}; + }) {inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -22017,7 +22017,7 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) {inherit (pkgs.xorg) libXScrnSaver;}; + }) {inherit (pkgs.xlibs) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -26520,10 +26520,10 @@ self: { jailbreak = true; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; + inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; + inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs) mesa;}; "bindings-K8055" = callPackage @@ -60530,13 +60530,13 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, xlibsWrapper }: + ({ mkDerivation, base, glib, gtk, x11 }: mkDerivation { pname = "gtk-traymanager"; version = "0.1.5"; sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443"; libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; + libraryPkgconfigDepends = [ x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; @@ -71956,7 +71956,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -101655,7 +101655,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage @@ -123173,7 +123173,7 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXft;}; + }) {inherit (pkgs.xlibs) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: @@ -145274,7 +145274,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -145435,7 +145435,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXi;}; + }) {inherit (pkgs.xlibs) libXi;}; "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -146584,8 +146584,8 @@ self: { description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {Xrender = null; inherit (pkgs.xorg) libXpm; - inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xlibs) libXpm; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -147043,7 +147043,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXtst;}; + }) {inherit (pkgs.xlibs) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft -- GitLab From 47cd462823e5bcbf2bdec2e1fbe6bd7b098ac0bd Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 12 Sep 2015 00:29:17 +0200 Subject: [PATCH 007/553] pythin-sphinx_rtd_update: 0.1.7 -> 0.1.8 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c071831a837..7d0b230e68a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13955,11 +13955,11 @@ let sphinx_rtd_theme = buildPythonPackage (rec { - name = "sphinx_rtd_theme-0.1.7"; + name = "sphinx_rtd_theme-0.1.8"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz"; - md5 = "3ffe014445195705968d899c38b305fd"; + sha256 = "12mnb7qscr07mllmyyqfpx37778sr21m8663b4fivnk17bnk7xkl"; }; postPatch = '' -- GitLab From 63b0a6c527dc542395a93616c1f8db1707c2c675 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 12 Sep 2015 00:29:42 +0200 Subject: [PATCH 008/553] python-INGInious: 0.3.dev1 -> 0.3a2.dev0 Fixes hydra build failure(s). Fixes #9873. --- pkgs/top-level/python-packages.nix | 52 +++++++++++++++++++----------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d0b230e68a..c46d698708e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7109,40 +7109,56 @@ let }; }; - inginious = buildPythonPackage rec { - version = "0.3.dev1"; - name = "inginious-${version}"; - - disabled = isPy3k; - + inginious = let # patched version of docker bindings. docker-custom = self.docker.override { name = "docker-1.3.0-dirty"; src = pkgs.fetchFromGitHub { owner = "GuillaumeDerval"; repo = "docker-py"; - rev = "1.3.0-dev"; - sha256 = "0rx686riw4w6kanw4nsyzhcy84fz251g9x59piba2n62qpa1rlxf"; + # tip of branch "master" + rev = "966becd0af514e67de5afbf885257a5005e49626"; + sha256 = "09k41dh86cbb7z4b8926fi5b2qq670mm6agl5py3giacakrap66c"; }; }; + webpy-custom = self.web.override { + name = "web.py-INGI"; + src = pkgs.fetchFromGitHub { + owner = "UCL-INGI"; + repo = "webpy-INGI"; + # tip of branch "ingi" + rev = "f487e78d65d6569eb70003e588d5c6ace54c384f"; + sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd"; + }; + }; + in buildPythonPackage rec { + version = "0.3a2.dev0"; + name = "inginious-${version}"; + + disabled = isPy3k; + propagatedBuildInputs = with self; [ - requests2 # Needs to be first; - cgroup-utils docker-custom docutils lti pygments pymongo - pyyaml rpyc selenium sh simpleldap tidylib virtual-display web - websocket_client + requests2 # Needs to be first, no idea why... + cgroup-utils docker-custom docutils lti mock pygments + pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib + websocket_client watchdog webpy-custom ]; + buildInputs = with self; [ nose selenium virtual-display ]; + + /* Hydra fix exists only on github for now. src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz"; md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; }; - - # Remove multiprocessing - # https://github.com/UCL-INGI/INGInious/issues/73 - patchPhase = '' - sed -i '34d' setup.py - ''; + */ + src = pkgs.fetchFromGitHub { + owner = "UCL-INGI"; + repo = "INGInious"; + rev = "e019a0e28c442b4201ec4a0be2a816c4ab639683"; + sha256 = "1pwbm7f7xn50rxzwrqpji58n2ami5r3lgbdpb61q0w3dwkxvvvfk"; + }; meta = { description = "An intelligent grader that allows secured and automated testing of code made by students."; -- GitLab From cc1af6640c0ca24ee8dd64b987377eda0d429ae5 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 16 Sep 2015 16:28:13 -0400 Subject: [PATCH 009/553] swig3: re-enable darwin builds --- pkgs/development/tools/misc/swig/3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 88e73276a77..389e473240b 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ urkud ]; }; -- GitLab From d42fbef595abc9e84a94d8c7f662e31f32ae97f6 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Fri, 18 Sep 2015 07:03:17 -0700 Subject: [PATCH 010/553] xf86-input-synaptics: make use of 50-synaptics.conf The default synaptics functionality (without this file) is limited for clickpads: the right soft button area in the bottom right isn't active by default, so the entire pad generates left-clicks. There is no way to right-drag. This file defines soft button areas and provides some matching rules. These settings don't conflict with the synaptics options that NixOS provides. --- nixos/modules/services/x11/hardware/synaptics.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index e967dc91141..e50ed08a218 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -18,6 +18,8 @@ let cfg = config.services.xserver.synaptics; Option "TapButton2" "0" Option "TapButton3" "0" ''; + pkg = pkgs.xorg.xf86inputsynaptics; + etcFile = "X11/xorg.conf.d/50-synaptics.conf"; in { options = { @@ -146,9 +148,12 @@ in { config = mkIf cfg.enable { - services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ]; + services.xserver.modules = [ pkg ]; - environment.systemPackages = [ pkgs.xorg.xf86inputsynaptics ]; + environment.etc."${etcFile}".source = + "${pkg}/share/X11/xorg.conf.d/50-synaptics.conf"; + + environment.systemPackages = [ pkg ]; services.xserver.config = '' -- GitLab From 75ba6b553ca3ed0f40b568e3fe0c54f55f47228f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 21 Apr 2015 00:13:42 +0000 Subject: [PATCH 011/553] nixos: add physlock service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/security/physlock.nix | 114 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 nixos/modules/services/security/physlock.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 82e0cdc6926..e8bb2c24c3f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -374,6 +374,7 @@ ./services/security/haveged.nix ./services/security/hologram.nix ./services/security/munge.nix + ./services/security/physlock.nix ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix new file mode 100644 index 00000000000..34d0be3b1be --- /dev/null +++ b/nixos/modules/services/security/physlock.nix @@ -0,0 +1,114 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.physlock; +in + +{ + + ###### interface + + options = { + + services.physlock = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the physlock screen locking mechanism. + + Enable this and then run systemctl start physlock + to securely lock the screen. + + This will switch to a new virtual terminal, turn off console + switching and disable SysRq mechanism (when + is set) + until the root or + password is given. + ''; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User whose password will be used to unlock the screen on par + with the root password. + ''; + }; + + disableSysRq = mkOption { + type = types.bool; + default = true; + description = '' + Whether to disable SysRq when locked with physlock. + ''; + }; + + lockOn = { + + suspend = mkOption { + type = types.bool; + default = true; + description = '' + Whether to lock screen with physlock just before suspend. + ''; + }; + + hibernate = mkOption { + type = types.bool; + default = true; + description = '' + Whether to lock screen with physlock just before hibernate. + ''; + }; + + extraTargets = mkOption { + type = types.listOf types.str; + default = []; + example = [ "display-manager.service" ]; + description = '' + Other targets to lock the screen just before. + + Useful if you want to e.g. both autologin to X11 so that + your ~/.xsession gets executed and + still to have the screen locked so that the system can be + booted relatively unattended. + ''; + }; + + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + # for physlock -l and physlock -L + environment.systemPackages = [ pkgs.physlock ]; + + systemd.services."physlock" = { + enable = true; + description = "Physlock"; + wantedBy = optional cfg.lockOn.suspend "suspend.target" + ++ optional cfg.lockOn.hibernate "hibernate.target" + ++ cfg.lockOn.extraTargets; + before = optional cfg.lockOn.suspend "systemd-suspend.service" + ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ cfg.lockOn.extraTargets; + serviceConfig.Type = "forking"; + script = '' + ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.user != null) " -u ${cfg.user}"} + ''; + }; + + }; + +} -- GitLab From 9dee532ce7e69b76af551824f45b8db597a4915d Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Fri, 18 Sep 2015 16:38:04 -0500 Subject: [PATCH 012/553] flexget: depend on beautifulsoup 4.1.3 The beautifulsoup expression was recently updated to version 4.4, flexget depends on version < 4.4. --- pkgs/top-level/python-packages.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92fa94b7ab5..64b9a4f924a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -980,6 +980,23 @@ let }; }); + # flexget needs beatifulsoup < 4.4 for now + beautifulsoup_4_1_3 = buildPythonPackage (rec { + name = "beautifulsoup4-4.1.3"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz"; + sha256 = "0cbcml88bkx9gf1wznxa0kqz1wpyakfbyh9gmxw0wljhda1q0zk1"; + }; + + meta = { + homepage = http://crummy.com/software/BeautifulSoup/bs4/; + description = "HTML and XML parser"; + license = licenses.mit; + maintainers = with maintainers; [ iElectric ]; + }; + }); + beaker = buildPythonPackage rec { name = "Beaker-1.6.4"; @@ -6088,7 +6105,7 @@ let buildInputs = with self; [ nose ]; propagatedBuildInputs = with self; [ paver feedparser sqlalchemy9 pyyaml rpyc - beautifulsoup4 html5lib pyrss2gen pynzb progressbar jinja2 flask + beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 guessit pathpy apscheduler ] # enable deluge and transmission plugin support, if they're installed -- GitLab From 2fe151a8d86c5d736fe769a60c374b4aaee730dd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 19 Sep 2015 18:27:14 +0200 Subject: [PATCH 013/553] ocaml-fontconfig: init at 20131103 --- .../ocaml-modules/fontconfig/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/fontconfig/default.nix diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix new file mode 100644 index 00000000000..65311683d0c --- /dev/null +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: + +stdenv.mkDerivation { + name = "ocaml-fontconfig-20131103"; + src = fetchFromGitHub { + owner = "flh"; + repo = "ocaml-fontconfig"; + rev = "42daf1697ffcee9c89ee4be3103b6427f7a7b7e5"; + sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; + }; + + buildInputs = [ ocaml pkgconfig fontconfig ]; + makeFlags = "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/ OCAML_HAVE_OCAMLOPT=yes"; + + meta = { + description = "Fontconfig bindings for OCaml"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d35555e1995..e81e28478b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4369,6 +4369,10 @@ let fix = callPackage ../development/ocaml-modules/fix { }; + fontconfig = callPackage ../development/ocaml-modules/fontconfig { + inherit (pkgs) fontconfig; + }; + functory = callPackage ../development/ocaml-modules/functory { }; herelib = callPackage ../development/ocaml-modules/herelib { }; -- GitLab From 7cfcbae958b7924cac660e8278623e1fef743523 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 19 Sep 2015 19:55:24 +0200 Subject: [PATCH 014/553] gusb: refactor, enable vala This exports the vapi files to share/vala/vapi --- pkgs/development/libraries/gusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index f7bbe75f116..c33920953ce 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1 +, glib, systemd, libusb1, vala }: stdenv.mkDerivation rec { name = "gusb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt - systemd libusb1 + systemd libusb1 vala glib ]; -- GitLab From 8358272046196003f9b6c2cdfb2bf698cdddef91 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 18 Sep 2015 22:08:31 +0000 Subject: [PATCH 015/553] doc: update haskell-users-guide.xml with ghcWithHoogle stuff --- doc/haskell-users-guide.xml | 84 +++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml index 87c8e1b92dd..2f3b1eabb11 100644 --- a/doc/haskell-users-guide.xml +++ b/doc/haskell-users-guide.xml @@ -354,6 +354,90 @@ if [ -e ~/.nix-profile/bin/ghc ]; then fi +
+ How to install a compiler with libraries, hoogle and documentation indexes + + If you plan to use your environment for interactive programming, + not just compiling random Haskell code, you might want to + replace ghcWithPackages in all the listings + above with ghcWithHoogle. + + + This environment generator not only produces an environment with + GHC and all the specified libraries, but also generates a + hoogle and haddock indexes + for all the packages, and provides a wrapper script around + hoogle binary that uses all those things. A + precise name for this thing would be + "ghcWithPackagesAndHoogleAndDocumentationIndexes", + which is, regrettably, too long and scary. + + + For example, installing the following environment + + +{ + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskellPackages.ghcWithHoogle + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; +} + + + allows one to browse module documentation index not + too dissimilar to this for all the specified packages and + their dependencies by directing a browser of choice to + ~/.nix-profiles/share/doc/hoogle/index.html + (or + /run/current-system/sw/share/doc/hoogle/index.html + in case you put it in + environment.systemPackages in NixOS). + + + After you've marveled enough at that try adding the following to + your ~/.ghc/ghci.conf + + +:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\"" +:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\"" + + + and test it by typing into ghci: + + +:hoogle a -> a +:doc a -> a + + + Be sure to note the links to haddock files in + the output. With any modern and properly configured terminal + emulator you can just click those links to navigate there. + + + Finally, you can run + + +hoogle server -p 8080 + + + and navigate to for + your own local Hoogle. + Note, however, that Firefox and possibly other browsers disallow + navigation from http: to + file: URIs for security reasons, which might + be quite an inconvenience. See this + page for workarounds. + +
How to create ad hoc environments for <literal>nix-shell</literal> -- GitLab From 49a5d06d3c3b164ef63965f97fc2cb45e71ecac2 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sat, 19 Sep 2015 21:18:22 +0100 Subject: [PATCH 016/553] transmission-remote-gtk: 1.1.1 -> 1.2 This commit includes some rework since the original googlecode repository redirects to the GitHub page. Built and tested successfully on local. From the Changelog: ``` * Wed Jun 11 2014 1.2 - A basic RSS reader which uses libmrss. - Fix some 32bit platforms reporting 0 connected peers and unknown ETA. - Resolve some GTK deprecations. - Fix a crash in port test callback. - Fix decimal marker in status bar version. - Support for GeoIPCity.dat. - Fix a crash when removing lots of columns (something changed in GTK). - Optional and non-default support for validating SSL certs. - Remove all GTK2 support. - Allow alt-speed limits to override global speed limits in the statusbar display. ``` --- .../p2p/transmission-remote-gtk/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 01ba9ff47ea..5d76b295dda 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,15 +1,21 @@ -{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }: +{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig +, intltool, gtk3, json_glib, curl }: stdenv.mkDerivation rec { - name = "transmission-remote-gtk-1.1.1"; + name = "transmission-remote-gtk-${version}"; + version = "1.2"; - src = fetchurl { - url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz"; - sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz"; + src = fetchgit { + url = "https://github.com/ajf8/transmission-remote-gtk.git"; + rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8"; + sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b"; }; - buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ]; + buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool + gtk3 json_glib curl ]; + + preConfigure = "sh autogen.sh"; preFixup = '' wrapProgram "$out/bin/transmission-remote-gtk" \ @@ -19,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = http://code.google.com/p/transmission-remote-gtk/; + homepage = https://github.com/ajf8/transmission-remote-gtk; license = licenses.gpl2; maintainers = [ maintainers.emery ]; platforms = platforms.linux; -- GitLab From d9fd037e889ccfa1b9dd903ea7164fd11d3403f9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 19 Sep 2015 15:02:59 -0700 Subject: [PATCH 017/553] zfs + zfs_git: 0.6.5 -> 0.6.5.1 --- .../linux/zfs/0.6.5-fix-corruption.patch | 28 ------------------- pkgs/os-specific/linux/zfs/default.nix | 9 ++---- pkgs/os-specific/linux/zfs/git.nix | 11 +++----- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch diff --git a/pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch b/pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch deleted file mode 100644 index af4ce1333c8..00000000000 --- a/pkgs/os-specific/linux/zfs/0.6.5-fix-corruption.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Fri, 18 Sep 2015 08:32:52 -0400 -Subject: [PATCH] Discard on zvols should not exceed the length of a block - -37f9dac592bf5889c3efb305c48ac39b4c7dd140 replaced the end-start -calculation with a cached value, but neglected to update it on discard -operations. This can cause us to discard data not requested, causing -data loss on zvols. - -Reported-by: Richard Connon -Signed-off-by: Richard Yao ---- - module/zfs/zvol.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c -index 492f8ff..c5a8071 100644 ---- a/module/zfs/zvol.c -+++ b/module/zfs/zvol.c -@@ -661,6 +661,7 @@ zvol_discard(struct bio *bio) - if (!(bio->bi_rw & REQ_SECURE)) { - start = P2ROUNDUP(start, zv->zv_volblocksize); - end = P2ALIGN(end, zv->zv_volblocksize); -+ size = end - start; - } - #endif - diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index df74f1c76e2..1432fa3e79b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,17 +1,14 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.5"; + version = "0.6.5.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz"; + sha256 = "0lbii5kc3b68zj8mvvznl05czwdkr0ld3a2javbkngfvrcn09rz2"; }; - patches = [ - ./nix-build.patch - ./0.6.5-fix-corruption.patch - ]; + patches = [ ./nix-build.patch ]; }) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index bf127301d2e..0423d139c83 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,19 +1,16 @@ { callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-09-11"; + version = "2015-09-19"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; - rev = "7a27ad00ae142b38d4aef8cc0af7a72b4c0e44fe"; - sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz"; + rev = "3af56fd95fbe8b417d7ed7c9c25ef59d6f1ee161"; + sha256 = "08sx1jzwrsdyvvlcf5as7rkglgbx5x6zvfn8ps8gk4miqfckq4z0"; }; - patches = [ - ./nix-build.patch - ./0.6.5-fix-corruption.patch - ]; + patches = [ ./nix-build.patch ]; spl = spl_git; }) -- GitLab From 3efdf1e135d4354e4df79b273673099537c65310 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Sat, 19 Sep 2015 16:20:29 -0600 Subject: [PATCH 018/553] pythonPackages.fonttools: 2.4 -> 3.0 --- pkgs/top-level/python-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e114986ebb..e9c3192a412 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6231,13 +6231,12 @@ let }); fonttools = buildPythonPackage (rec { - version = "2.4"; + version = "3.0"; name = "fonttools-${version}"; - disabled = isPy3k; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/F/FontTools/FontTools-${version}.tar.gz"; - sha256 = "13ggkzcj34kcca6bsxjkaqsxkp2bvxxf6ijiyhq1xlyb0z37z4qa"; + url = "https://pypi.python.org/packages/source/F/FontTools/fonttools-${version}.tar.gz"; + sha256 = "0f4iblpbf3y3ghajiccvdwk2f46cim6dsj6fq1kkrbqfv05dr4nz"; }; buildInputs = with self; [ @@ -6245,7 +6244,7 @@ let ]; meta = { - homepage = "http://sourceforge.net/projects/fonttools/"; + homepage = "https://github.com/behdad/fonttools"; description = "Font file processing tools"; }; }); -- GitLab From d229db38d2b5de53348c39edd7c86bf462d97b18 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Sat, 19 Sep 2015 16:21:29 -0600 Subject: [PATCH 019/553] nototools: init at git-2015-09-16 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9c3192a412..25757000934 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8248,6 +8248,29 @@ let }; }; + nototools = buildPythonPackage rec { + version = "git-2015-09-16"; + name = "nototools-${version}"; + disabled = isPy3k; + + pythonPath = with self; [ fonttools numpy ]; + + postPatch = '' + sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py + ''; + + postInstall = '' + cp -r third_party $out + ''; + + src = pkgs.fetchFromGitHub { + owner = "googlei18n"; + repo = "nototools"; + rev = "5a79bee819941849da7b414447929fc7ba6c2c08"; + sha256 = "0srrmyrjgksk4c6smgi1flyq325r4ma8r6bpkvbn731q3yykhmaa"; + }; + }; + rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; version = "1.2.7"; -- GitLab From 2017fa5f4e4b4ddc6cd4eff89f83222bb192a11b Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Sat, 19 Sep 2015 16:22:20 -0600 Subject: [PATCH 020/553] noto-fonts: init at git-2015-09-08 noto-fonts-cjk: init at 1.004 noto-fonts-emoji: init at git-2015-08-17 --- pkgs/data/fonts/noto-fonts/default.nix | 119 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 122 insertions(+) create mode 100644 pkgs/data/fonts/noto-fonts/default.nix diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix new file mode 100644 index 00000000000..a231d3b93c1 --- /dev/null +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -0,0 +1,119 @@ +{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, fontforge, pythonPackages, pkgconfig }: +rec { + # 18MB + noto-fonts = let version = "git-2015-09-08"; in stdenv.mkDerivation { + name = "noto-fonts-${version}"; + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "noto-fonts"; + rev = "9d677e7e47a13f6e88052833277783fe4f27671f"; + sha256 = "1dw1142znlk19a4mzhfi9pg3jzmz8pl1ivix7sd2grg70vxscxqc"; + }; + phases = "unpackPhase installPhase"; + installPhase = '' + mkdir -p $out/share/fonts/noto + cp hinted/*.ttf $out/share/fonts/noto + # Also copy unhinted & alpha fonts for better glyph coverage, + # if they don't have a hinted version + # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) + cp -n unhinted/*.ttf $out/share/fonts/noto + cp -n alpha/*.ttf $out/share/fonts/noto + ''; + meta = with stdenv.lib; { + inherit version; + description = "Beautiful and free fonts for many languages"; + homepage = https://www.google.com/get/noto/; + longDescription = + '' + When text is rendered by a computer, sometimes characters are displayed as + “tofuâ€. They are little boxes to indicate your device doesn’t have a font to + display the text. + + Google has been developing a font family called Noto, which aims to support all + languages with a harmonious look and feel. Noto is Google’s answer to tofu. The + name noto is to convey the idea that Google’s goal is to see “no more tofuâ€. + Noto has multiple styles and weights, and freely available to all. + + This package also includes the Arimo, Cousine, and Tinos fonts. + ''; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 ]; + }; + }; + # 89MB + noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation { + name = "noto-fonts-cjk-${version}"; + + src = fetchurl { + # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file + url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; + sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6"; + }; + + buildInputs = [ unzip ]; + + phases = "unpackPhase installPhase"; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/noto + cp *.ttc $out/share/fonts/noto + ''; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + inherit version; + description = "Beautiful and free fonts for CJK languages"; + homepage = https://www.google.com/get/noto/help/cjk/; + longDescription = + '' + Noto Sans CJK is a sans serif typeface designed as an intermediate style + between the modern and traditional. It is intended to be a multi-purpose + digital font for user interface designs, digital content, reading on laptops, + mobile devices, and electronic books. Noto Sans CJK comprehensively covers + Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font + family. It supports regional variants of ideographic characters for each of the + four languages. In addition, it supports Japanese kana, vertical forms, and + variant characters (itaiji); it supports Korean hangeul — both contemporary and + archaic. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 ]; + }; + }; + # 12MB + noto-fonts-emoji = let version = "git-2015-08-17"; in stdenv.mkDerivation { + name = "noto-fonts-emoji-${version}"; + + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "noto-emoji"; + rev = "ffd7cfd0c84b7bf37210d0908ac94adfe3259ff2"; + sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2"; + }; + + buildInputs = [ optipng cairo fontforge pythonPackages.nototools pythonPackages.fonttools pkgconfig ]; + + preBuild = '' + export PYTHONPATH=$PYTHONPATH:$PWD + ''; + + installPhase = '' + mkdir -p $out/share/fonts/noto + cp NotoColorEmoji.ttf NotoEmoji-Regular.ttf $out/share/fonts/noto + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Color and Black-and-White emoji fonts"; + homepage = https://github.com/googlei18n/noto-emoji; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 ]; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a1323ea8d0..c634010e7ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10439,6 +10439,9 @@ let nafees = callPackage ../data/fonts/nafees { }; + inherit (callPackages ../data/fonts/noto-fonts {}) + noto-fonts noto-fonts-cjk noto-fonts-emoji; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; -- GitLab From 2664685d6782cc7ca781d138171717f6d01e03c4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 19 Sep 2015 16:05:38 -0700 Subject: [PATCH 021/553] quassel: Build with fPIC to fix ssl use on gcc5 --- pkgs/applications/networking/irc/quassel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index c1944cf6d0d..4cc54b9f812 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -54,6 +54,8 @@ in with stdenv; mkDerivation rec { ]) ); + NIX_CFLAGS_COMPILE = "-fPIC"; + cmakeFlags = [ "-DEMBED_DATA=OFF" "-DSTATIC=OFF" ] -- GitLab From 8756ac99eb8e4ca6554cb84de825a7df2b49d50c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 20 Sep 2015 02:26:56 +0300 Subject: [PATCH 022/553] picocom: 1.8 -> 2.0 - Upstream changed manpage filename - Home page no longer at Google Code --- pkgs/tools/misc/picocom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 3ebb0397a8f..cc5b6a70715 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "picocom-${version}"; - version = "1.8"; + version = "2.0"; src = fetchFromGitHub { owner = "npat-efault"; repo = "picocom"; rev = version; - sha256 = "1954hnmnnr9yj5skynj2x5wjap8vlr4ski2rhwr36p5pzwmr9gni"; + sha256 = "0s990jiqlbcg3isvhr3bn4sb7b0k6qqbf1jdvs1fyy9h0iiwprjw"; }; buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin $out/share/man/man8 + mkdir -p $out/bin $out/share/man/man1 cp picocom $out/bin - cp picocom.8 $out/share/man/man8 + cp picocom.1 $out/share/man/man1 wrapProgram $out/bin/picocom \ --prefix PATH ":" "${lrzsz}/bin" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; - homepage = http://code.google.com/p/picocom/; + homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; -- GitLab From 4cf60b3452fe7afe2ab649d56dca5087b59326ae Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 20 Sep 2015 02:55:55 +0300 Subject: [PATCH 023/553] sl: 3.03 -> 5.02 - Source moved to GitHub - No need to patch Makefile - Install manpage --- pkgs/tools/misc/sl/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index f5bc2edf3ca..d21143f56e2 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation { - name = "sl-3.03"; +stdenv.mkDerivation rec { + name = "sl-${version}"; + version = "5.02"; - src = fetchurl { - url = "http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/sl.tar"; - sha256 = "1x3517aza0wm9hhb02npl8s7xy947cdidxmans27q0gjmj3bvg5j"; + src = fetchFromGitHub { + owner = "mtoyoda"; + repo = "sl"; + rev = version; + sha256 = "1zrfd71zx2px2xpapg45s8xvi81xii63yl0h60q72j71zh4sif8b"; }; - patchPhase = '' - sed -i "s/-lcurses -ltermcap/-lncurses/" Makefile - ''; - buildInputs = [ ncurses ]; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/share/man/man1 cp sl $out/bin + cp sl.1 $out/share/man/man1 ''; meta = { -- GitLab From 3a8756913c2f8dcbe29ac345b77815c19a76835d Mon Sep 17 00:00:00 2001 From: Robbin C Date: Sun, 20 Sep 2015 12:57:50 +0800 Subject: [PATCH 024/553] zimreader: init at 20150710. This adds zimreader, a tool to serve ZIM files using HTTP. Its dependencies, cxxtools and tntnet are included in this derivation because zimreader needs specific (not latest) versions of them to compile. --- pkgs/tools/text/zimreader/default.nix | 43 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/text/zimreader/default.nix diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix new file mode 100644 index 00000000000..afc02e62301 --- /dev/null +++ b/pkgs/tools/text/zimreader/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchgit, fetchurl, automake, autoconf, libtool +, zlib, openssl, zip, zimlib +}: + +let + cxxtools = stdenv.mkDerivation rec { + name = "cxxtools-${version}"; + version = "2.1.1"; + src = fetchurl { + url = "http://www.tntnet.org/download/cxxtools-${version}.tar.gz"; + sha256 = "0jh5wrk9mviz4xrp1wv617gwgl4b5mc21h21wr2688kjmc0i1q4d"; + }; + }; + tntnet = stdenv.mkDerivation rec { + name = "tntnet-${version}"; + version = "2.1"; + src = fetchurl { + url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz"; + sha256 = "1dhs10yhpmdqyykyh8jc67m5xgsgm1wrpd58fdps2cp5g1gjf8w6"; + }; + buildInputs = [ zlib cxxtools openssl zip ]; + }; + +in stdenv.mkDerivation rec { + name = "zimreader-${version}"; + version = "20150710"; + + src = fetchgit { + url = https://gerrit.wikimedia.org/r/p/openzim.git; + rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456"; + sha256 = "0x0d3rx6zcc8k66nqkacmwdvslrz70h9bliqawzv90ribq3alb0q"; + }; + + buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; + setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`"; + preConfigurePhases = [ "./autogen.sh" ]; + + meta = { + description = "A tool to serve ZIM files using HTTP"; + homepage = http://git.wikimedia.org/log/openzim; + maintainers = with stdenv.lib.maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a1323ea8d0..7a01500be4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3570,6 +3570,8 @@ let zinnia = callPackage ../tools/inputmethods/zinnia { }; tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; + zimreader = callPackage ../tools/text/zimreader { }; + zimwriterfs = callPackage ../tools/text/zimwriterfs { }; zip = callPackage ../tools/archivers/zip { }; -- GitLab From f08fb6e6c7de77c8133dc4f8ae86a1f61206d07c Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 19 Sep 2015 23:38:37 -0400 Subject: [PATCH 025/553] broadcom-sta: fix build on kernel >= 4.2 (close #9953) Also cherry-pick a licensing fix from torvalds/linux@7d3e2eb1786 necessary for building broadcom-sta on kernel 4.2. For more details, see: https://github.com/longsleep/bcmwl-ubuntu/issues/6 Fixes #9948. --- .../linux/broadcom-sta/linux-recent.patch | 16 ++++++++++++++-- .../linux/kernel/flush_workqueue-export.patch | 13 +++++++++++++ pkgs/os-specific/linux/kernel/linux-4.2.nix | 8 ++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/flush_workqueue-export.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch b/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch index 81d27204b4e..a690558eb5b 100644 --- a/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch +++ b/pkgs/os-specific/linux/broadcom-sta/linux-recent.patch @@ -79,7 +79,19 @@ if (unlikely(!cbss)) return -ENOMEM; -@@ -2071,7 +2096,26 @@ +@@ -2047,7 +2072,11 @@ + } + else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) || + event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL); ++#else + cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL); ++#endif + clear_bit(WL_STATUS_CONNECTED, &wl->status); + wl_link_down(wl); + wl_init_prof(wl->profile); +@@ -2071,7 +2100,26 @@ wl_get_assoc_ies(wl); memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); wl_update_bss_info(wl); @@ -106,7 +118,7 @@ set_bit(WL_STATUS_CONNECTED, &wl->status); wl->profile->active = true; } -@@ -2629,7 +2673,15 @@ +@@ -2629,7 +2677,15 @@ void wl_cfg80211_detach(struct net_device *ndev) { diff --git a/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch b/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch new file mode 100644 index 00000000000..17583e31730 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch @@ -0,0 +1,13 @@ +diff --git a/kernel/workqueue.c b/kernel/workqueue.c +index 4c4f061..a413acb 100644 +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c +@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq) + out_unlock: + mutex_unlock(&wq->mutex); + } +-EXPORT_SYMBOL_GPL(flush_workqueue); ++EXPORT_SYMBOL(flush_workqueue); + + /** + * drain_workqueue - drain a workqueue diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index ff5fd912db3..aa87249e5c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -15,4 +15,12 @@ import ./generic.nix (args // rec { features.needsCifsUtils = true; features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; + + # cherry-pick from upstream to resolve a licensing problem that prevents + # compiling the broadcom-sta wireless driver on kernels >= 4.2 + # see: https://github.com/longsleep/bcmwl-ubuntu/issues/6 + kernelPatches = [ { + name = "flush-workqueue-export"; + patch = ./flush_workqueue-export.patch; + } ]; } // (args.argsOverride or {})) -- GitLab From 2822a45758bb882d35db08c4d89dfa583394bfba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Sep 2015 08:31:02 +0200 Subject: [PATCH 026/553] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150903-85-gaab3160 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/d45d08e556a8d4d0fa3d8927c0944e1ee60fb044 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/da73308b6359aa6083591ec7a2069090977d3be7 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/7d1956be84686f1f348c98c6dbc88bfdb87f681f --- .../haskell-modules/configuration-lts-0.0.nix | 5 + .../haskell-modules/configuration-lts-0.1.nix | 5 + .../haskell-modules/configuration-lts-0.2.nix | 5 + .../haskell-modules/configuration-lts-0.3.nix | 5 + .../haskell-modules/configuration-lts-0.4.nix | 5 + .../haskell-modules/configuration-lts-0.5.nix | 5 + .../haskell-modules/configuration-lts-0.6.nix | 5 + .../haskell-modules/configuration-lts-0.7.nix | 5 + .../haskell-modules/configuration-lts-1.0.nix | 5 + .../haskell-modules/configuration-lts-1.1.nix | 5 + .../configuration-lts-1.10.nix | 5 + .../configuration-lts-1.11.nix | 5 + .../configuration-lts-1.12.nix | 5 + .../configuration-lts-1.13.nix | 5 + .../configuration-lts-1.14.nix | 5 + .../configuration-lts-1.15.nix | 5 + .../haskell-modules/configuration-lts-1.2.nix | 5 + .../haskell-modules/configuration-lts-1.4.nix | 5 + .../haskell-modules/configuration-lts-1.5.nix | 5 + .../haskell-modules/configuration-lts-1.7.nix | 5 + .../haskell-modules/configuration-lts-1.8.nix | 5 + .../haskell-modules/configuration-lts-1.9.nix | 5 + .../haskell-modules/configuration-lts-2.0.nix | 5 + .../haskell-modules/configuration-lts-2.1.nix | 5 + .../configuration-lts-2.10.nix | 6 + .../configuration-lts-2.11.nix | 6 + .../configuration-lts-2.12.nix | 6 + .../configuration-lts-2.13.nix | 6 + .../configuration-lts-2.14.nix | 6 + .../configuration-lts-2.15.nix | 6 + .../configuration-lts-2.16.nix | 6 + .../configuration-lts-2.17.nix | 6 + .../configuration-lts-2.18.nix | 6 + .../configuration-lts-2.19.nix | 6 + .../haskell-modules/configuration-lts-2.2.nix | 5 + .../configuration-lts-2.20.nix | 6 + .../configuration-lts-2.21.nix | 6 + .../configuration-lts-2.22.nix | 6 + .../haskell-modules/configuration-lts-2.3.nix | 5 + .../haskell-modules/configuration-lts-2.4.nix | 5 + .../haskell-modules/configuration-lts-2.5.nix | 5 + .../haskell-modules/configuration-lts-2.6.nix | 5 + .../haskell-modules/configuration-lts-2.7.nix | 5 + .../haskell-modules/configuration-lts-2.8.nix | 5 + .../haskell-modules/configuration-lts-2.9.nix | 6 + .../haskell-modules/configuration-lts-3.0.nix | 6 + .../haskell-modules/configuration-lts-3.1.nix | 6 + .../haskell-modules/configuration-lts-3.2.nix | 6 + .../haskell-modules/configuration-lts-3.3.nix | 6 + .../haskell-modules/configuration-lts-3.4.nix | 6 + .../haskell-modules/configuration-lts-3.5.nix | 6 + .../haskell-modules/hackage-packages.nix | 511 ++++++++++++++---- 52 files changed, 689 insertions(+), 97 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 97f759f0257..f423ae84bf0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -936,6 +936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3069,6 +3070,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3151,6 +3153,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7239,6 +7243,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index be8209ac3e5..1f1be15ac17 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -936,6 +936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3068,6 +3069,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3150,6 +3152,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7238,6 +7242,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 241e6a35efd..15c9da959f1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -936,6 +936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3068,6 +3069,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3150,6 +3152,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7238,6 +7242,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 3958126866e..10ba28eef40 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -936,6 +936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3068,6 +3069,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3150,6 +3152,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7238,6 +7242,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 9761195dd21..9fffe27fe4c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -936,6 +936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3067,6 +3068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3149,6 +3151,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7233,6 +7237,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 695890333b3..83e5cd24db0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -936,6 +936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3067,6 +3068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3149,6 +3151,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7233,6 +7237,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 85f0e0bbe9a..3e8c7342f3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -935,6 +935,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3064,6 +3065,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3146,6 +3148,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7227,6 +7231,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 7e057cb90d8..4e96d1faf3c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -935,6 +935,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3064,6 +3065,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3146,6 +3148,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7227,6 +7231,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index dd57b2ba1de..9e1e237c3bf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -931,6 +931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3048,6 +3049,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3130,6 +3132,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7205,6 +7209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 6e976ac3188..513b58ad44b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -931,6 +931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3041,6 +3042,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3123,6 +3125,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7189,6 +7193,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_8_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 2fda9ea3d2c..4ef9bdbbf4f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3030,6 +3031,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3111,6 +3113,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7153,6 +7157,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 8bcdd325d1b..8bb273f88e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3029,6 +3030,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3110,6 +3112,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7147,6 +7151,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 31a5e972e08..a24d72a38e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3029,6 +3030,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3110,6 +3112,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7145,6 +7149,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 382e77e3b82..13827243cb1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3028,6 +3029,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3109,6 +3111,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7142,6 +7146,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index b406fb4c180..977350175cc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -929,6 +929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3025,6 +3026,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_8"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3106,6 +3108,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7133,6 +7137,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index c1feccb2ad9..71ed124fe32 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -927,6 +927,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3019,6 +3020,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_8"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3100,6 +3102,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7121,6 +7125,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index c4519b3d731..44d33682d2f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -931,6 +931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3039,6 +3040,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3121,6 +3123,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7183,6 +7187,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 0a34f13e0f5..4240e9a2697 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3036,6 +3037,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3118,6 +3120,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7176,6 +7180,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 96be78983eb..d59d97ff233 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3035,6 +3036,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3117,6 +3119,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7174,6 +7178,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 042a2b0f7bd..02faeb84ae5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3034,6 +3035,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3116,6 +3118,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7167,6 +7171,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 2e4fa124873..453fa00c053 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3032,6 +3033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3114,6 +3116,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7162,6 +7166,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index c89a6bf6136..7def4be5548 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -930,6 +930,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -3032,6 +3033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_7"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3113,6 +3115,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7158,6 +7162,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index fae97e05358..eff80738a2a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -917,6 +917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2993,6 +2994,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3074,6 +3076,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7041,6 +7045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index d88043cd905..5424c2dae6d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -917,6 +917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2992,6 +2993,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3073,6 +3075,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7039,6 +7043,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 49c91031007..1e984a2feb8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2967,6 +2968,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_10"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3048,6 +3050,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4750,6 +4754,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6965,6 +6970,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index f5daf0f8cfd..1acae55174b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2966,6 +2967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_10"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3047,6 +3049,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4743,6 +4747,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6954,6 +6959,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 7799440857d..acf3289d5f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2966,6 +2967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_10"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3047,6 +3049,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4743,6 +4747,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6953,6 +6958,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 15a411179f8..967b99e9a24 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2966,6 +2967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3047,6 +3049,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4741,6 +4745,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6949,6 +6954,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 7ca519aa723..993c0b08433 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2963,6 +2964,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3044,6 +3046,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4737,6 +4741,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6943,6 +6948,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 0ff015e43a9..c232fc7388b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2960,6 +2961,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3041,6 +3043,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4734,6 +4738,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6935,6 +6940,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 201c943d8ec..3d9f8647754 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -910,6 +910,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2952,6 +2953,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3033,6 +3035,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4722,6 +4726,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6921,6 +6926,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index b1107bacdf1..42ba9aee048 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -910,6 +910,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2947,6 +2948,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3028,6 +3030,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4714,6 +4718,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6909,6 +6914,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index e2a3970e458..18bb88b135f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -909,6 +909,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2941,6 +2942,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3022,6 +3024,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4706,6 +4710,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6898,6 +6903,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index ec2578a9938..d1f8663af2c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -909,6 +909,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2941,6 +2942,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3021,6 +3023,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4705,6 +4709,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6892,6 +6897,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 2c420f4dd46..2c12e7fd327 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -916,6 +916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2989,6 +2990,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3070,6 +3072,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7034,6 +7038,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index beba76cec32..21124a4263a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -909,6 +909,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2937,6 +2938,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3017,6 +3019,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4700,6 +4704,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6885,6 +6890,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index a4423937762..b3292b94c1e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -909,6 +909,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2936,6 +2937,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3016,6 +3018,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4697,6 +4701,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6878,6 +6883,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index ff1342cf9d9..7bb840a92d7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -908,6 +908,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2935,6 +2936,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_11"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3015,6 +3017,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4694,6 +4698,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6874,6 +6879,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 9cb1dac09b5..9e75d1731d4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -916,6 +916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2987,6 +2988,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3068,6 +3070,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7030,6 +7034,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_11"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 55fa05b30f6..1927ea1d5bb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -916,6 +916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2986,6 +2987,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3067,6 +3069,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7023,6 +7027,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index ebb43c6b3cb..6e825963044 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -916,6 +916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2984,6 +2985,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3065,6 +3067,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7019,6 +7023,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 18fa235f764..03ef3a1c493 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -916,6 +916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2979,6 +2980,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3060,6 +3062,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7011,6 +7015,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 5847477c15f..d8f8f9e8a6b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -914,6 +914,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2977,6 +2978,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_9"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3058,6 +3060,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7009,6 +7013,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 51d52a738cf..139196542ff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2974,6 +2975,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_10"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3055,6 +3057,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -7000,6 +7004,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 5ed82d78fe8..0297a978ceb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -913,6 +913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2969,6 +2970,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "foldl" = doDistribute super."foldl_1_0_10"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -3050,6 +3052,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4758,6 +4762,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "lendingclub" = dontDistribute super."lendingclub"; "lens" = doDistribute super."lens_4_7_0_1"; "lens-action" = doDistribute super."lens-action_0_1_0_1"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-family" = dontDistribute super."lens-family"; "lens-properties" = dontDistribute super."lens-properties"; @@ -6984,6 +6989,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index e0158489252..70a38a23c63 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -883,6 +883,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2807,6 +2808,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -2885,6 +2887,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4478,6 +4482,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-properties" = dontDistribute super."lens-properties"; "lens-regex" = dontDistribute super."lens-regex"; @@ -6560,6 +6565,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 8aa372dff73..b136a8d3c0e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -883,6 +883,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2801,6 +2802,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -2879,6 +2881,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4471,6 +4475,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-properties" = dontDistribute super."lens-properties"; "lens-regex" = dontDistribute super."lens-regex"; @@ -6548,6 +6553,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 44246045f0e..25d45e618e9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -880,6 +880,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2796,6 +2797,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -2874,6 +2876,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4462,6 +4466,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-properties" = dontDistribute super."lens-properties"; "lens-regex" = dontDistribute super."lens-regex"; @@ -6531,6 +6536,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index ea37a86c608..ca1280d6989 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -879,6 +879,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2786,6 +2787,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -2864,6 +2866,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4450,6 +4454,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-properties" = dontDistribute super."lens-properties"; "lens-regex" = dontDistribute super."lens-regex"; @@ -6508,6 +6513,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index dec4a5f3953..8562b83c1dd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -879,6 +879,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2785,6 +2786,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -2863,6 +2865,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4449,6 +4453,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-properties" = dontDistribute super."lens-properties"; "lens-regex" = dontDistribute super."lens-regex"; @@ -6503,6 +6508,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 19d0c74c8c6..f615543076e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -878,6 +878,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Thingie" = dontDistribute super."Thingie"; "ThreadObjects" = dontDistribute super."ThreadObjects"; "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; "TicTacToe" = dontDistribute super."TicTacToe"; "TigerHash" = dontDistribute super."TigerHash"; "TimePiece" = dontDistribute super."TimePiece"; @@ -2776,6 +2777,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; "folds" = dontDistribute super."folds"; "folds-common" = dontDistribute super."folds-common"; "follower" = dontDistribute super."follower"; @@ -2854,6 +2856,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "full-text-search" = dontDistribute super."full-text-search"; "fullstop" = dontDistribute super."fullstop"; "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funcmp" = dontDistribute super."funcmp"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; @@ -4434,6 +4438,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-properties" = dontDistribute super."lens-properties"; "lens-regex" = dontDistribute super."lens-regex"; @@ -6475,6 +6480,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2e95d218169..b77293806ac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2363,6 +2363,7 @@ self: { filepath HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/cabal/"; @@ -5951,6 +5952,8 @@ self: { sha256 = "4a8177e154ead5a7bcc110f8fe408f9cf720783dde024ac1936cd95b659b2d59"; libraryHaskellDepends = [ array base containers OpenGL OpenGLRaw ]; librarySystemDepends = [ freeglut mesa ]; + doHaddock = false; + doCheck = false; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; @@ -8282,6 +8285,7 @@ self: { aeson aeson-pretty base bytestring directory filepath HUnit mtl process random regex-compat temporary text unordered-containers ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; @@ -8438,6 +8442,7 @@ self: { http-types httpd-shed HUnit mtl network network-uri pureMD5 split test-framework test-framework-hunit wai warp ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "https://github.com/haskell/HTTP"; @@ -8922,6 +8927,7 @@ self: { base bytestring containers filepath polyparse pretty random ]; executableHaskellDepends = [ base directory polyparse pretty ]; + doHaddock = false; homepage = "http://projects.haskell.org/HaXml/"; description = "Utilities for manipulating XML documents"; license = "LGPL"; @@ -11574,7 +11580,7 @@ self: { "MFlow_0_4_5_9" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, conduit, conduit-extra - , containers, directory, extensible-exceptions, http-types + , containers, cpphs, directory, extensible-exceptions, http-types , monadloc, mtl, old-time, parsec, pwstore-fast, random , RefSerialize, resourcet, stm, TCache, text, time, transformers , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow @@ -11591,6 +11597,7 @@ self: { transformers utf8-string vector wai wai-extra warp warp-tls Workflow ]; + libraryToolDepends = [ cpphs ]; description = "stateful, RESTful web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11606,8 +11613,8 @@ self: { }: mkDerivation { pname = "MFlow"; - version = "0.4.5.11"; - sha256 = "789aceb77d0e2497a6194dba2677e32b003292075bc36db66f272f559234f25f"; + version = "0.4.5.10"; + sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -11621,7 +11628,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "MFlow_0_4_5_12" = callPackage + "MFlow_0_4_5_13" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, conduit, conduit-extra , containers, directory, extensible-exceptions, http-types @@ -11631,8 +11638,8 @@ self: { }: mkDerivation { pname = "MFlow"; - version = "0.4.5.12"; - sha256 = "baf7ecae6ce4a50b0193205e4f697bc7dda04434161d861e66fd1c44663e73bc"; + version = "0.4.5.13"; + sha256 = "cd0664d1ca4f447537a4a1f82cc5ab0f5793a8e48c0027e642b48bafa4b77415"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -11926,6 +11933,7 @@ self: { hslogger HUnit mtl network old-locale old-time parsec process QuickCheck random regex-compat testpack time unix ]; + doCheck = false; homepage = "http://software.complete.org/missingh"; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; @@ -13436,19 +13444,6 @@ self: { }) {inherit (pkgs) mesa;}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, mesa, transformers }: - mkDerivation { - pname = "OpenGLRaw"; - version = "2.5.3.0"; - sha256 = "b749afebac567ffb4a0f6a0ce2eb480d975a0a89d4b07a3186f0ecdbec14f7f1"; - libraryHaskellDepends = [ base transformers ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mesa;}; - - "OpenGLRaw_2_5_4_0" = callPackage ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; @@ -13459,7 +13454,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesa;}; "OpenGLRaw21" = callPackage @@ -17265,6 +17259,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Tic-Tac-Toe" = callPackage + ({ mkDerivation, base, safe }: + mkDerivation { + pname = "Tic-Tac-Toe"; + version = "0.1.0.2"; + sha256 = "bfe5dd9b3bc2b7396282fe3036b096a3dfcac19d73ad10fc8609fb4e59c8c799"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base safe ]; + homepage = "https://github.com/2016rshah/Tic-Tac-Toe"; + description = "Tic Tac Toe in your command line!"; + license = stdenv.lib.licenses.asl20; + }) {}; + "TicTacToe" = callPackage ({ mkDerivation, base, containers, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -20298,6 +20306,7 @@ self: { ]; testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; + doCheck = false; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -21597,6 +21606,7 @@ self: { array base containers directory QuickCheck ]; testHaskellDepends = [ base process ]; + doCheck = false; homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25278,6 +25288,7 @@ self: { data-binary-ieee754 hspec hspec-expectations network split text vector ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; @@ -25636,6 +25647,8 @@ self: { pname = "ansi-pretty"; version = "0.1.0.0"; sha256 = "9eba90356a94e3acc9227d60a2afa1f8e6bc853379b1da467a74913d04ffda1d"; + revision = "1"; + editedCabalFile = "7c4da8ee543df166730de7ac7bfdc2534b51dc39b138bcc160cf1e834b28f1d0"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -28448,6 +28461,7 @@ self: { sha256 = "3e809f4e354ef392cd7266dc35b8f660cb5810974159c5106a0c3ed7bf1db6a3"; libraryHaskellDepends = [ base conduit ]; doHaddock = false; + doCheck = false; homepage = "http://github.com/snoyberg/conduit"; description = "Consume attoparsec parsers via conduit. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -32002,6 +32016,8 @@ self: { pname = "binary-orphans"; version = "0.1.1.0"; sha256 = "a34b6ea3a5485859c3d83aa6d1e4535e05590ef543d01482beba757db1d14431"; + revision = "2"; + editedCabalFile = "1a7c9d712f0bacd638ea86d1fe3b0cd7a63af45a272f58ce704b88e9640c3067"; libraryHaskellDepends = [ aeson base binary hashable scientific tagged text text-binary time unordered-containers vector vector-binary-instances @@ -32149,6 +32165,8 @@ self: { pname = "binary-tagged"; version = "0.1.1.0"; sha256 = "90cc9ae7d2d7bd24f0e8bd919ab948c26a478e96fbb0572905b2518948febdc0"; + revision = "1"; + editedCabalFile = "fd550ffa78871db7e461ba3fba5b85ec3bafe4c75a60f4f70237df6812045926"; libraryHaskellDepends = [ aeson array base binary bytestring containers generics-sop hashable scientific SHA tagged text time unordered-containers vector @@ -33533,6 +33551,7 @@ self: { sha256 = "e626310d69e0808586a9c7cc965a0c2eb3413d643271e523fef8037fc8f4458b"; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base directory doctest filepath ]; + doHaddock = false; doCheck = false; homepage = "http://github.com/analytics/bits"; description = "Various bit twiddling and bitwise serialization primitives"; @@ -35374,7 +35393,9 @@ self: { base binary bytestring cryptohash data-binary-ieee754 mtl network QuickCheck test-framework test-framework-quickcheck2 text time ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://github.com/mongodb-haskell/bson"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; @@ -36314,6 +36335,7 @@ self: { ]; doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; @@ -36617,6 +36639,8 @@ self: { base filepath HUnit shelly test-framework test-framework-hunit text transformers ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = stdenv.lib.licenses.gpl2; @@ -38917,6 +38941,7 @@ self: { testHaskellDepends = [ base HTF HUnit loch-th placeholders QuickCheck text ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/cases"; @@ -39419,6 +39444,7 @@ self: { libraryHaskellDepends = [ base bytestring directory filepath unix ]; + doHaddock = false; doCheck = false; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; @@ -39935,8 +39961,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.5.4"; - sha256 = "2dd9112da6cde89934d8a65a93597b161928c23c01b1af25ffae72ee104c768a"; + version = "6.5.5"; + sha256 = "a886c6a406a6d0f371457536616ebc67bed0f03f2419e72e11412d3d0b41c828"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40746,6 +40772,7 @@ self: { base byteable bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + doCheck = false; homepage = "https://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; license = stdenv.lib.licenses.bsd3; @@ -40768,6 +40795,7 @@ self: { base byteable bytestring crypto-cipher-tests crypto-cipher-types QuickCheck test-framework test-framework-quickcheck2 ]; + doCheck = false; homepage = "https://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; license = stdenv.lib.licenses.bsd3; @@ -44010,6 +44038,7 @@ self: { sha256 = "dfec0c4ce1eccd34c228951454a8f2ebab0bfbdf1cde68a70688196db2b9ff8f"; libraryHaskellDepends = [ base comonad ]; doHaddock = false; + doCheck = false; homepage = "http://github.com/ekmett/comonad-transformers/"; description = "This package has been merged into comonad 4.0"; license = stdenv.lib.licenses.bsd3; @@ -44023,6 +44052,7 @@ self: { sha256 = "3a70386e2ef3d6f444585f082de42e842a47dfe7bdbd807550839faf1bd8b7a7"; libraryHaskellDepends = [ base comonad ]; doHaddock = false; + doCheck = false; homepage = "http://github.com/ekmett/comonads-fd/"; description = "This package has been merged into comonad 4.0"; license = stdenv.lib.licenses.bsd3; @@ -44343,17 +44373,6 @@ self: { }) {}; "composition-extra" = callPackage - ({ mkDerivation, base, composition, contravariant }: - mkDerivation { - pname = "composition-extra"; - version = "1.2.0"; - sha256 = "de94ac4652901fd5da3c1c96cc18fa2ffef71465a293eca10adb08eac01bce18"; - libraryHaskellDepends = [ base composition contravariant ]; - description = "Combinators for unorthodox structure composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "composition-extra_2_0_0" = callPackage ({ mkDerivation, base, composition, contravariant }: mkDerivation { pname = "composition-extra"; @@ -44362,7 +44381,6 @@ self: { libraryHaskellDepends = [ base composition contravariant ]; description = "Combinators for unorthodox structure composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compressed" = callPackage @@ -44687,6 +44705,7 @@ self: { async base HUnit random stm test-framework test-framework-hunit unbounded-delays ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; @@ -45909,8 +45928,8 @@ self: { }: mkDerivation { pname = "connection-pool"; - version = "0.1.2.1"; - sha256 = "f047b99c3a540f35435aa04a7c87ffe4b2280e9d273ac3a05f093fe0e1a00552"; + version = "0.1.3"; + sha256 = "0570c457c2d633487ab44edaaea9ebd117259e770048c4e26edd9504f65cbcfa"; libraryHaskellDepends = [ base between data-default-class monad-control network resource-pool streaming-commons time transformers-base @@ -53599,6 +53618,7 @@ self: { ]; doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; @@ -55910,6 +55930,7 @@ self: { old-locale random rank1dynamic stm syb template-haskell time transformers ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "http://haskell-distributed.github.com/"; @@ -58205,8 +58226,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "dynamic-mvector"; - version = "0.1.0.3"; - sha256 = "650ce3518979be73c89adf627d64104bf486f370861d7bc9b3d6bf366175cddb"; + version = "0.1.0.4"; + sha256 = "a36fc29ba4b91d52beb1f2df6ba8a837c6f112ef31358b20f5d0056f20d788a6"; libraryHaskellDepends = [ base primitive vector ]; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; @@ -61113,6 +61134,7 @@ self: { mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck transformers ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "http://github.com/ekmett/ersatz"; @@ -61979,6 +62001,7 @@ self: { transformers transformers-compat ]; jailbreak = true; + doCheck = false; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; @@ -63309,8 +63332,8 @@ self: { pname = "fay"; version = "0.23.1.8"; sha256 = "66bf327322a2342ce7dee9b981c5e8bd2876935acb1cbc847e0c1635717be29c"; - revision = "1"; - editedCabalFile = "ba0e82e6bdfe1037d7777281f84063d068aeffad244cb967b657554af69f7160"; + revision = "2"; + editedCabalFile = "e4c9ff4e2d4684879802958fe2cef7250a88d65827c027a81c5a5b329d47d8c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66222,6 +66245,7 @@ self: { version = "0.1.3"; sha256 = "1eab0c24475725b0d29f4ac3cefe07a75b06a48ed77a9758201f542132cd8686"; libraryHaskellDepends = [ base ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/focus"; @@ -66421,6 +66445,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "foldl-transduce-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, foldl + , foldl-transduce, monoid-subclasses, tasty, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "foldl-transduce-attoparsec"; + version = "0.1.0.1"; + sha256 = "380616c9d8ef4997ad6793ae3ac9ddd699091cefabcfcff4c981279543bdb677"; + libraryHaskellDepends = [ + attoparsec base bytestring foldl-transduce monoid-subclasses text + transformers + ]; + testHaskellDepends = [ + attoparsec base doctest foldl foldl-transduce tasty tasty-hunit + text transformers + ]; + description = "Attoparsec and foldl-transduce integration"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "folds" = callPackage ({ mkDerivation, base, bytestring, comonad, contravariant, deepseq , directory, doctest, filepath, lens, mtl, pointed, profunctors @@ -67901,6 +67946,7 @@ self: { async base directory system-fileio system-filepath tasty tasty-hunit temporary-rc ]; + doHaddock = false; doCheck = false; description = "Cross platform library for file change notification"; license = stdenv.lib.licenses.bsd3; @@ -68160,6 +68206,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "funbot-client" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , funbot-ext-events, HTTP, network-uri + }: + mkDerivation { + pname = "funbot-client"; + version = "0.1.0.1"; + sha256 = "22072804b49929a100e92a067c7e79f6d30b506cbb3f3bb487db02501b33afba"; + revision = "1"; + editedCabalFile = "449437e7cb240595b590cc3d34b0f08471870961bbf9faf9b4344646223c402b"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring funbot-ext-events HTTP + network-uri + ]; + homepage = "https://notabug.org/fr33domlover/funbot-client/"; + description = "Report events to FunBot over a JSON/HTTP API"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + + "funbot-ext-events" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "funbot-ext-events"; + version = "0.1.0.0"; + sha256 = "5e37649835bc82210744615b623608f5e5d450487a4a598b1b43eed8184c37c8"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "https://notabug.org/fr33domlover/funbot-ext-events/"; + description = "Interact with FunBot's external events"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "funcmp" = callPackage ({ mkDerivation, base, filepath, process }: mkDerivation { @@ -70590,6 +70667,7 @@ self: { base cmdargs containers directory extra filepath process tasty tasty-hunit terminal-size time ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; @@ -70868,6 +70946,8 @@ self: { array base bytestring containers glib mtl ]; libraryToolDepends = [ gtk2hs-buildtools ]; + doHaddock = false; + doCheck = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GIO"; license = stdenv.lib.licenses.lgpl21; @@ -72201,7 +72281,9 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; libraryToolDepends = [ gtk2hs-buildtools ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; @@ -74456,6 +74538,7 @@ self: { sha256 = "6671953fa0970c13ac8014278fcd6227b4c07e1a69d5a23965e2df1418218a22"; libraryHaskellDepends = [ base semigroupoids ]; doHaddock = false; + doCheck = false; homepage = "http://github.com/ekmett/groupoids/"; description = "This package has been absorbed into semigroupoids 4.0"; license = stdenv.lib.licenses.bsd3; @@ -74694,6 +74777,8 @@ self: { ]; libraryPkgconfigDepends = [ gtk ]; libraryToolDepends = [ gtk2hs-buildtools ]; + doHaddock = false; + doCheck = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; @@ -78007,6 +78092,7 @@ self: { sha256 = "d1c94b259163cb37f5c02ef3418ebf4caf8d95c8ee00588d4493aa3aae1a8a66"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; + doCheck = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked (deprecated)"; license = stdenv.lib.licenses.mit; @@ -78818,7 +78904,9 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -79452,7 +79540,9 @@ self: { base bytestring ghc-prim HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 text unix ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; @@ -82605,6 +82695,7 @@ self: { testHaskellDepends = [ base bytestring directory HUnit mtl syb text ]; + doCheck = false; homepage = "http://github.com/lymar/hastache"; description = "Haskell implementation of Mustache templates"; license = stdenv.lib.licenses.bsd3; @@ -83992,6 +84083,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; + doCheck = false; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; @@ -84717,6 +84809,8 @@ self: { pname = "hermit"; version = "1.0.0.0"; sha256 = "7b66b8d8c9d1f6eb2c7e37dfc932884f299e26e80b6dad163174f428c47d6dd4"; + revision = "1"; + editedCabalFile = "e16afd9af9b41f5d2f1e30625045865bb315f0c8daf469a0f5b491064323060d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94387,6 +94481,8 @@ self: { revision = "1"; editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f"; libraryHaskellDepends = [ base hspec hspec-discover ]; + doHaddock = false; + doCheck = false; homepage = "http://hspec.github.io/"; description = "Alpha version of Hspec 2.0"; license = stdenv.lib.licenses.mit; @@ -104337,6 +104433,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "json-autotype_1_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, GenericPretty, hashable, hflags, hint, lens, mtl + , pretty, process, QuickCheck, scientific, smallcheck, text + , uniplate, unordered-containers, vector + }: + mkDerivation { + pname = "json-autotype"; + version = "1.0.10"; + sha256 = "38201e4322d1bc98c05cab499704a52e1725c3547edd58d3e45e97a3929c70ea"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers filepath GenericPretty hashable + hflags hint lens mtl pretty process scientific text uniplate + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers filepath GenericPretty hashable + hflags hint lens mtl pretty process scientific text uniplate + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath GenericPretty + hashable hflags lens mtl pretty process QuickCheck scientific + smallcheck text uniplate unordered-containers vector + ]; + homepage = "https://github.com/mgajda/json-autotype"; + description = "Automatic type declaration for JSON input data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "json-b" = callPackage ({ mkDerivation, base, bytestring, bytestring-nums, bytestring-trie , bytestringparser-temporary, containers, utf8-string @@ -105738,15 +105867,16 @@ self: { }) {}; "keera-hails-reactive-gtk" = callPackage - ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-reactivevalues - , mtl, transformers + ({ mkDerivation, base, bytestring, cairo, glib, gtk, gtk-helpers + , keera-hails-reactivevalues, mtl, transformers }: mkDerivation { pname = "keera-hails-reactive-gtk"; - version = "0.1"; - sha256 = "81353ed9e0a293359ebd30e520191290ee25929ad5136f2d606721ad3800f411"; + version = "0.3"; + sha256 = "7b647e929779e021a324864ad370998eafc47cbc985a181f84816bd2004c722c"; libraryHaskellDepends = [ - base gtk gtk-helpers keera-hails-reactivevalues mtl transformers + base bytestring cairo glib gtk gtk-helpers + keera-hails-reactivevalues mtl transformers ]; homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets"; @@ -105817,8 +105947,8 @@ self: { ({ mkDerivation, base, contravariant }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.1.2.1"; - sha256 = "2631e4ae7ddc8a99ba39173d8a2e19f77bc39d339cf0b24e58e07c940b8c34e8"; + version = "0.2.0.0"; + sha256 = "79f88ebd5b1902f37bfc2aa74f414fd4fabc9cba997e778395817c7ae51e9616"; libraryHaskellDepends = [ base contravariant ]; homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Values"; @@ -107940,6 +108070,7 @@ self: { mtl parsec QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 uniplate wl-pprint ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "http://github.com/jswebtools/language-ecmascript"; @@ -108151,6 +108282,7 @@ self: { base directory filepath HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + doHaddock = false; doCheck = false; homepage = "http://github.com/vincenthz/language-java"; description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; @@ -108396,6 +108528,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; + "language-nix_2_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens + , pretty, QuickCheck + }: + mkDerivation { + pname = "language-nix"; + version = "2.1"; + sha256 = "ade0e0d0722e5b4fca532b4f0d1bc4827b767f912393b9023a80554fa889e044"; + libraryHaskellDepends = [ + base base-compat Cabal deepseq lens pretty QuickCheck + ]; + testHaskellDepends = [ + base base-compat Cabal deepseq doctest lens pretty QuickCheck + ]; + homepage = "https://github.com/peti/language-nix#readme"; + description = "Data types and useful functions to represent and manipulate the Nix language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + "language-objc" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, newtype, pretty, process, syb @@ -108790,6 +108943,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lattices_1_4" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck + , semigroups, tagged, tasty, tasty-quickcheck, transformers + , universe-base, universe-reverse-instances, unordered-containers + , void + }: + mkDerivation { + pname = "lattices"; + version = "1.4"; + sha256 = "89ef3b9b7989a420484943b4d839b098473b5e9aa56524816e3312dfb524a5b9"; + revision = "1"; + editedCabalFile = "509124867c08a750b451a89c5a35b7f80036cb449ccb3e1117dbeca9fc73ded2"; + libraryHaskellDepends = [ + base containers deepseq hashable semigroups tagged universe-base + universe-reverse-instances unordered-containers void + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck transformers + ]; + homepage = "http://github.com/phadej/lattices/"; + description = "Fine-grained library for constructing and manipulating lattices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -109355,7 +109533,9 @@ self: { test-framework-quickcheck2 test-framework-th text transformers unordered-containers vector ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; @@ -109536,7 +109716,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lens-aeson" = callPackage + "lens-aeson_1_0_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , doctest, filepath, generic-deriving, lens, scientific, semigroups , simple-reflect, text, unordered-containers, vector @@ -109558,9 +109738,10 @@ self: { homepage = "http://github.com/lens/lens-aeson/"; description = "Law-abiding lenses for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lens-aeson_1_0_0_5" = callPackage + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , doctest, filepath, generic-deriving, lens, scientific, semigroups , simple-reflect, text, unordered-containers, vector @@ -109582,7 +109763,6 @@ self: { homepage = "http://github.com/lens/lens-aeson/"; description = "Law-abiding lenses for aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-datetime" = callPackage @@ -110857,6 +111037,7 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; + doCheck = false; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; @@ -114227,6 +114408,7 @@ self: { base bytestring conduit HUnit QuickCheck resourcet test-framework test-framework-hunit test-framework-quickcheck2 ]; + doCheck = false; homepage = "http://github.com/alphaHeavy/lzma-conduit"; description = "Conduit interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; @@ -115963,6 +116145,7 @@ self: { base HUnit ieee754 QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; @@ -118799,6 +118982,8 @@ self: { version = "0.3.3.0"; sha256 = "ef44c9943760f2120eb450182852d6150390daa2de4b87e9dda9591e89714e6e"; libraryHaskellDepends = [ base transformers transformers-base ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -119346,6 +119531,8 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th time ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; license = stdenv.lib.licenses.bsd3; @@ -121161,6 +121348,7 @@ self: { version = "1.0.2"; sha256 = "dedd1e54e8d433140f485e187de448e96270ca2e4a873cacbd034fda51f68067"; libraryHaskellDepends = [ mtl transformers ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/nikita-volkov/mtl-prelude"; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; @@ -123252,6 +123440,7 @@ self: { base base-prelude parsec template-haskell ]; testHaskellDepends = [ base-prelude HTF ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/neat-interpolation"; @@ -123757,6 +123946,7 @@ self: { QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; @@ -124902,6 +125092,7 @@ self: { testHaskellDepends = [ base network network-transport network-transport-tests ]; + doHaddock = false; doCheck = false; homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; @@ -128940,7 +129131,9 @@ self: { process QuickCheck syb test-framework test-framework-hunit test-framework-quickcheck2 text zip-archive ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -129064,7 +129257,9 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; + doHaddock = false; jailbreak = true; + doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129162,6 +129357,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_7_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hs-bibutils, mtl + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time, vector + , xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.7.4"; + sha256 = "905112d8995fb6de5ee4c4bfd62cc89baa3bf1598f258aaba1704f85cf739fd2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time vector xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring containers directory + filepath pandoc pandoc-types process syb temporary text vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath pandoc pandoc-types + process temporary text yaml + ]; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-crossref" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, hspec , mtl, pandoc, pandoc-types, process, yaml @@ -129188,10 +129414,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.1"; - sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c"; - revision = "3"; - editedCabalFile = "4168dab7a87533c54ed9108ae6a65c71ec20642b85091d74b7dbf46b5c27b683"; + version = "1.0.2"; + sha256 = "0818e8b8e88e98b162a4fb7a9369cf3e54a2108f428d3a88b0217c7b58a6d961"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -129367,6 +129591,8 @@ self: { ]; libraryPkgconfigDepends = [ pango ]; libraryToolDepends = [ gtk2hs-buildtools ]; + doHaddock = false; + doCheck = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; @@ -130002,6 +130228,7 @@ self: { attoparsec base bytestring containers directory doctest filepath parsec QuickCheck quickcheck-instances ]; + doCheck = false; homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; license = stdenv.lib.licenses.bsd3; @@ -130091,6 +130318,7 @@ self: { revision = "1"; editedCabalFile = "30dcb7f4190d779bcc35e9bfa48bb3620b8c48fbfa8627ab8a9a4633409e3288"; libraryHaskellDepends = [ base ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/partial-handler"; @@ -136109,6 +136337,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple_0_5_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, bytestring-builder, case-insensitive, containers + , cryptohash, hashable, HUnit, postgresql-libpq, scientific + , template-haskell, text, time, transformers, uuid-types, vector + }: + mkDerivation { + pname = "postgresql-simple"; + version = "0.5.0.0"; + sha256 = "820799a45f715938e7c5b427e1e273a6116cd616e8b210843ad462f7f299ed1f"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-builder + case-insensitive containers hashable postgresql-libpq scientific + template-haskell text time transformers uuid-types vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring containers cryptohash HUnit + text time vector + ]; + description = "Mid-Level PostgreSQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple-migration" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , directory, hspec, postgresql-simple, time @@ -136172,8 +136424,8 @@ self: { pname = "postgresql-simple-url"; version = "0.1.0.1"; sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0"; - revision = "1"; - editedCabalFile = "8cdcca53b40836c02b8922c56c9f7bd4be142392ecfcdaf89cb9e973f9200651"; + revision = "6"; + editedCabalFile = "316507c07968bf66036b35f24ee6899bfcca65978730197a2687c9ccc3b2a48d"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -136181,7 +136433,7 @@ self: { base postgresql-simple tasty tasty-quickcheck ]; homepage = "https://github.com/futurice/postgresql-simple-url"; - description = "PostgreSQL"; + description = "Parse postgres:// url into ConnectInfo"; license = stdenv.lib.licenses.mit; }) {}; @@ -136519,29 +136771,6 @@ self: { }) {}; "pred-trie" = callPackage - ({ mkDerivation, base, composition-extra, mtl, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "pred-trie"; - version = "0.2.4"; - sha256 = "5c527bdf613fc14111d4fb3c133c00f44506eae4bae2fa983915a3bf2679f891"; - revision = "1"; - editedCabalFile = "e3dd1ffa6101e3ac094e8065133fccd90d0c07da32761adb7023ead9ac8b587a"; - libraryHaskellDepends = [ - base composition-extra mtl QuickCheck semigroups - ]; - testHaskellDepends = [ - base composition-extra mtl QuickCheck quickcheck-instances - semigroups tasty tasty-hunit tasty-quickcheck - ]; - doCheck = false; - description = "Predicative tries"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pred-trie_0_3_0" = callPackage ({ mkDerivation, base, composition-extra, containers, mtl , QuickCheck, semigroups, tries }: @@ -136552,10 +136781,9 @@ self: { libraryHaskellDepends = [ base composition-extra containers mtl QuickCheck semigroups tries ]; - jailbreak = true; + doCheck = false; description = "Predicative tries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "predicates" = callPackage @@ -137737,6 +137965,7 @@ self: { sha256 = "8a3c51ef41d686e39f87875dd48e72e5aa83956125bdf9922edf531c292a4482"; libraryHaskellDepends = [ base profunctors ]; doHaddock = false; + doCheck = false; homepage = "http://github.com/ekmett/profunctor-extras/"; description = "This package has been absorbed into profunctors 4.0"; license = stdenv.lib.licenses.bsd3; @@ -138851,6 +139080,7 @@ self: { testHaskellDepends = [ base bytestring cereal encoding HUnit mtl QuickCheck text ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/litherum/punycode"; description = "Encode unicode strings to ascii forms according to RFC 3492"; @@ -140888,12 +141118,11 @@ self: { ({ mkDerivation, base, containers, tasty, tasty-quickcheck }: mkDerivation { pname = "range-set-list"; - version = "0.0.7"; - sha256 = "489cc05cbea9201e48c4e9f2ee9d23a1e19f7e6bc214a3e20859f5b55f49fce1"; + version = "0.1.0.0"; + sha256 = "c5edb5773ca6df108625f1bf9002b5f71868bab43d0ef9b7c84cb3fc2e0529a9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers tasty tasty-quickcheck ]; - jailbreak = true; - homepage = "https://github.com/phadej/range-set-list"; + homepage = "https://github.com/phadej/range-set-list#readme"; description = "Memory efficient sets with continuous ranges of elements"; license = stdenv.lib.licenses.mit; }) {}; @@ -143351,8 +143580,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.5.2.0"; - sha256 = "5858ba3cec48e46eedfa4b8255fd6b3bc250e5256fe2c0e6e3e0944fb5453b41"; + version = "0.6.0.0"; + sha256 = "2b310981f78613fcb3f884430c3dbb13d3e9804890d9f664c51f499b09f3bcc5"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -147433,6 +147662,7 @@ self: { array base cereal containers lens lens-action quickcheck-instances tasty tasty-quickcheck template-haskell time vector ]; + doCheck = false; homepage = "http://acid-state.seize.it/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; @@ -149767,6 +149997,7 @@ self: { sha256 = "6f54b62203043fca77b13a2105bb2f82fa5cd90d6b20ac6bba99716fc93f4a1d"; libraryHaskellDepends = [ base semigroupoids ]; doHaddock = false; + doCheck = false; homepage = "http://github.com/ekmett/semigroupoid-extras"; description = "This package has been absorbed into semigroupoids 4.0"; license = stdenv.lib.licenses.bsd3; @@ -151459,6 +151690,7 @@ self: { revision = "1"; editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b"; libraryHaskellDepends = [ base unix ]; + doCheck = false; description = "A cross-platform library for setting environment variables"; license = stdenv.lib.licenses.mit; }) {}; @@ -152387,6 +152619,7 @@ self: { sha256 = "4518987cf113b8c8a52f8043dcb60f70f2cad12d778dd181ed6da276727a102a"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; + doCheck = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A type-based approach to internationalization. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -152413,6 +152646,7 @@ self: { sha256 = "2c1b041116648d5b0a13e524e94024f5bd17e2649d2e9e3418c66295568f3da2"; libraryHaskellDepends = [ base shakespeare ]; doHaddock = false; + doCheck = false; homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Interpolation with quasi-quotation: put variables strings (deprecated)"; license = stdenv.lib.licenses.mit; @@ -153703,6 +153937,7 @@ self: { base bytestring conduit conduit-extra directory hspec HUnit network process resourcet unix ]; + doHaddock = false; doCheck = false; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; @@ -154117,6 +154352,7 @@ self: { testHaskellDepends = [ base Cabal constraints filepath process tasty tasty-golden ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; @@ -154294,6 +154530,8 @@ self: { pname = "sized-types"; version = "0.5.1"; sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db"; + revision = "1"; + editedCabalFile = "b6a0520904cba8a44505d78d4188a94ccdf67be3c376c0cbd49c92e07943d17c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154624,6 +154862,7 @@ self: { testHaskellDepends = [ base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore ]; + doHaddock = false; jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/slave-thread"; @@ -159956,6 +160195,7 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector vector-algorithms ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; @@ -161071,14 +161311,16 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, mmorph, mtl, transformers }: + ({ mkDerivation, base, bytestring, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.17"; - sha256 = "577e8adf2fec1abc29dc06f7ddd15b2d8adc2fb015fbb4b27a2f35a1eca9bfc4"; - libraryHaskellDepends = [ base mmorph mtl transformers ]; + version = "0.1.0.20"; + sha256 = "59214d21300f44945b23f8e71c82445993ce854c95c0a22a8f747792d0d2deaa"; + libraryHaskellDepends = [ + base bytestring mmorph mtl transformers + ]; homepage = "https://github.com/michaelt/streaming"; - description = "a free monad transformer optimized for streaming applications"; + description = "an elementary streaming prelude and a free monad transformer optimized for streaming applications"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -161088,12 +161330,13 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.0.6"; - sha256 = "64741cef68f724824b2ea143e62b68713872e5c834015d601331a54090ab0f99"; + version = "0.1.0.8"; + sha256 = "1ac455477c88342c3f98df791086b37be8c3445eab8d6074f00e8dc1f91293d0"; libraryHaskellDepends = [ base bytestring deepseq mmorph mtl streaming transformers ]; - description = "effectful byte steams, or: lazy bytestring done right"; + homepage = "https://github.com/michaelt/streaming-bytestring"; + description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -161326,6 +161569,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "streaming-utils" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, http-client + , http-client-tls, mtl, pipes, streaming, streaming-bytestring + , transformers + }: + mkDerivation { + pname = "streaming-utils"; + version = "0.1.0.1"; + sha256 = "bafec5fba8521c8ff8220f823c6c9a256a269b2ed3d2ef9e6777040d529316ec"; + libraryHaskellDepends = [ + attoparsec base bytestring http-client http-client-tls mtl pipes + streaming streaming-bytestring transformers + ]; + homepage = "https://github.com/michaelt/streaming-utils"; + description = "http, attoparsec and pipes utilities for streaming and streaming-bytestring"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -165135,6 +165396,7 @@ self: { testHaskellDepends = [ base bytestring mtl tasty tasty-hunit tasty-quickcheck ]; + doCheck = false; homepage = "https://github.com/vincenthz/tasty-kat"; description = "Known Answer Tests (KAT) framework for tasty"; license = stdenv.lib.licenses.mit; @@ -168478,6 +168740,7 @@ self: { old-locale profunctors QuickCheck random system-posix-redirect text time vector-space ]; + doHaddock = false; doCheck = false; homepage = "https://github.com/liyang/thyme"; description = "A faster time library"; @@ -170401,7 +170664,9 @@ self: { version = "0.3.3.3"; sha256 = "a74b7b26d58856e3d6d81dd49cd2d444a2ea36e4dc3a6a719227b1071c7c98a1"; libraryHaskellDepends = [ base transformers ]; + doHaddock = false; jailbreak = true; + doCheck = false; homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; @@ -170802,7 +171067,6 @@ self: { containers keys mtl QuickCheck quickcheck-instances rose-trees semigroups sets tasty tasty-quickcheck ]; - jailbreak = true; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -171854,6 +172118,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "twitter-feed_0_2_0_4" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , containers, http-conduit, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "twitter-feed"; + version = "0.2.0.4"; + sha256 = "fd6a8fbf316f855182d0b9371e890eba77d09821ca4fc1238ec22469e6910bd9"; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring http-conduit + ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/stackbuilders/twitter-feed"; + description = "Client for fetching Twitter timeline via Oauth"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "twitter-types" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, derive , directory, filepath, HUnit, old-locale, QuickCheck @@ -173897,6 +174182,8 @@ self: { testHaskellDepends = [ base bytestring doctest hspec old-locale old-time QuickCheck time ]; + doHaddock = false; + doCheck = false; description = "Unix time parser/formatter and utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -176144,6 +176431,7 @@ self: { test-framework-quickcheck2 transformers ]; jailbreak = true; + doCheck = false; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -177784,6 +178072,7 @@ self: { sha256 = "785005f23bf9bf4e1dfaae0705472c0e3ea4c3843ff6a8625db8d1e327a6bfc0"; libraryHaskellDepends = [ wai ]; doHaddock = false; + doCheck = false; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI support for server-sent events (deprecated)"; license = stdenv.lib.licenses.mit; @@ -178417,6 +178706,7 @@ self: { unix-time wai ]; testHaskellDepends = [ base doctest ]; + doHaddock = false; doCheck = false; description = "A logging system for WAI"; license = stdenv.lib.licenses.bsd3; @@ -179049,6 +179339,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-routes_0_9_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, wai, wai-app-static, wai-extra + }: + mkDerivation { + pname = "wai-routes"; + version = "0.9.0"; + sha256 = "67a287a1a2347ce4239bce87ecf4b8845866b52493981a58ea4f48654d9ebd8e"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types + monad-loops mtl path-pieces random template-haskell text wai + wai-app-static wai-extra + ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json wai wai-app-static + ]; + homepage = "https://ajnsit.github.io/wai-routes/"; + description = "Typesafe URLs for Wai applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-routing" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie @@ -184443,6 +184759,7 @@ self: { base bytestring containers filepath HUnit hxt process QuickCheck text unix ]; + doHaddock = false; doCheck = false; description = "Fast XML generation library"; license = stdenv.lib.licenses.bsd3; -- GitLab From 80a9e5a1831f87095f417051d6b16bf01f50eb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 08:25:36 +0200 Subject: [PATCH 027/553] pciutils: feature+bugfix update 3.3.1 -> 3.4.0 --- pkgs/tools/system/pciutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 349da460485..447b1cd63b9 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.3.1"; # with database from 2015-04 + name = "pciutils-3.4.0"; # with database from 2015-09 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "1ag3skny1bamqil46dlppw8j1fp08spqa60fjygbxkg4fzdknjji"; + sha256 = "15liffqvdwbpza210wfqy2y135dvg7sbyqr7gvhyjllgspv8z2gq"; }; buildInputs = [ pkgconfig zlib kmod which ]; -- GitLab From a4d721efd7633db39ebb9fa434044e8af77f837a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 08:43:32 +0200 Subject: [PATCH 028/553] djview: update 4.8 -> 4.10.3 Also kill tabs, remove unneeded (and failing) patch. No qt5 yet, unfortunately. --- pkgs/applications/graphics/djview/default.nix | 34 +++++++++-------- .../graphics/djview/djview4-qt-4.8.patch | 38 ------------------- 2 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/graphics/djview/djview4-qt-4.8.patch diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 4ded807cb29..e5c49846b23 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,27 +1,29 @@ -{stdenv, fetchurl, djvulibre, qt4, pkgconfig }: +{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }: +let + qt = qt4; + # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error +in stdenv.mkDerivation rec { - name = "djview-4.8"; - src = fetchurl { - url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c"; - }; - - buildInputs = [djvulibre qt4]; + name = "djview-4.10.3"; + src = fetchurl { + url = "mirror://sourceforge/djvu/${name}.tar.gz"; + sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h"; + }; nativeBuildInputs = [ pkgconfig ]; - patches = [ ./djview4-qt-4.8.patch ]; + buildInputs = [ djvulibre qt xorg.libXt libtiff ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; }; - meta = { - homepage = http://djvu.sourceforge.net/djview4.html; - description = "A new portable DjVu viewer and browser plugin"; - license = stdenv.lib.licenses.gpl2; - inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; + meta = with stdenv.lib; { + homepage = http://djvu.sourceforge.net/djview4.html; + description = "A portable DjVu viewer and browser plugin"; + license = licenses.gpl2; + inherit (qt.meta) platforms; + maintainers = [ maintainers.urkud ]; + }; } diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch deleted file mode 100644 index ce3694197f6..00000000000 --- a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch +++ /dev/null @@ -1,38 +0,0 @@ -Origin: OpenSUSE -Index: djview-4.8/src/qdjvuwidget.cpp -=================================================================== ---- djview-4.8.orig/src/qdjvuwidget.cpp -+++ djview-4.8/src/qdjvuwidget.cpp -@@ -153,7 +153,7 @@ all_numbers(const char *s) - } - - template static inline void --swap(T& x, T& y) -+myswap(T& x, T& y) - { - T tmp; - tmp = x; -@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k) - /* Sort v[lo], v[m], v[hi] by insertion */ - m = (lo+hi)/2; - if (v[lo]>v[m]) -- swap(v[lo],v[m]); -+ myswap(v[lo],v[m]); - if (v[m]>v[hi]) { -- swap(v[m],v[hi]); -+ myswap(v[m],v[hi]); - if (v[lo]>v[m]) -- swap(v[lo],v[m]); -+ myswap(v[lo],v[m]); - } - /* Extract pivot, place sentinel */ - pivot = v[m]; -@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k) - do ++l; while (v[l]pivot); - if (l < h) { -- swap(v[l],v[h]); -+ myswap(v[l],v[h]); - goto loop; - } - /* Finish up */ -- GitLab From d77588d127d4916eba76a2d692184133263f7add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 09:04:22 +0200 Subject: [PATCH 029/553] gdk_pixbuf: maintenance update 2.31.6 -> 2.31.7 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 5f5a0496954..754fddd101a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11 -, jasper, libintlOrEmpty, gobjectIntrospection }: +, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: let ver_maj = "2.31"; - ver_min = "6"; + ver_min = "7"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "062x2gqd7p6yxhxlib1ha4l3gk9ihcj080hrwwv9vmlmybb064hi"; + sha256 = "046n9wz16kh3rpzxaiiwphf5bihxgj4g14cjn65wwmw82q4y0dj7"; }; setupHook = ./setup-hook.sh; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). - doCheck = false; + inherit (doCheck); postInstall = "rm -rf $out/share/gtk-doc"; -- GitLab From 67ad72140b73eaedd9471c3544c0576ce8b862b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 09:05:02 +0200 Subject: [PATCH 030/553] harfbuzz: update 1.0.2 -> 1.0.3 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 866c7f43811..d2f8416b3ea 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-1.0.2"; + name = "harfbuzz-1.0.3"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "0rmlwfxyzdblnvg72hpfcz2py8rjflx0m08wlvfgq420cpwcmcxy"; + sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b"; }; outputs = [ "out" "doc" ]; -- GitLab From a5b0136b1a3d648a0f2fd473a8230934e354a92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 09:05:19 +0200 Subject: [PATCH 031/553] gkt3: maintenance update 3.16.6 -> 3.16.7 --- pkgs/development/libraries/gtk+/3.x.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5fb70ac05ea..a7f4bdad48a 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -10,7 +10,7 @@ assert cupsSupport -> cups != null; let ver_maj = "3.16"; - ver_min = "6"; + ver_min = "7"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1gpzlnfrifc17yfk0zki6b2vmsfpf5cmrbh232s6iaan11np44jd"; + sha256 = "1fkzdhqa1pjzb1qsh2ll3y2567ylyszks59qspx85lalvqa9ss0r"; }; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; enableParallelBuilding = true; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + postInstall = "rm -rf $out/share/gtk-doc"; passthru = { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; # workaround for bug of nix-mode for Emacs */ ''; }; - meta = { + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; longDescription = '' @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { homepage = http://www.gtk.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ urkud raskin vcunat lethalman ]; + platforms = platforms.all; }; } -- GitLab From aaa985e31740f9b806dc20709bbd6e0d005c4373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 09:40:56 +0200 Subject: [PATCH 032/553] xgd-utils: update p7 -> p46 (close #9851) This update probably contains a fix for CVE-2014-9622. Thanks to @jb55 for the PR. We take even newer version. --- pkgs/tools/X11/xdg-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 170539b3805..a8915e38d37 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { - name = "xdg-utils-1.1.0-rc3p7"; + name = "xdg-utils-1.1.0-rc3p46"; src = fetchzip { name = "${name}.tar.gz"; - url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/e8ee3b18d16e4.tar.gz"; - sha256 = "1hz6rv45blcii1a8n1j45rg8vzm98vh4fvlca3zmay1kp57yr4jl"; + url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/03577f987730.tar.gz"; + sha256 = "1fs0kxalmpqv6x0rv4xg65w8r26sk464xisrbwp4p6a033y5x34l"; }; # just needed when built from git -- GitLab From c8f462b80b9fc6ae26a91b4a074d85839b1f8fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 10:23:39 +0200 Subject: [PATCH 033/553] libdrm: update 2.4.64 -> 2.4.65 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 2323a423700..533512e9b68 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.64"; + name = "libdrm-2.4.65"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1dilm6cwqfx9plf3i5kkaf6m5v1zyrcadqbcjsrsshkfgpz8c1xn"; + sha256 = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 94e3e1195e79867dd6c5c5bb50d39332e1e9bfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 20 Sep 2015 01:11:10 +0200 Subject: [PATCH 034/553] chromium: remove preferLocalBuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's another attempt to fix chromium builds. See http://hydra.nixos.org/build/26086977/nixlog/4/raw Unpacking sources is actually taking more than 2h so build fails. Instead, rather build it remotely and then copy over the output as we don't have limits for download time. See 089bdce621c1e5e5ff85b5a6e8077c21bcee2685 for reference cc @aszlig (cherry picked from commit cef54e7d67870ff68c9787ff60cd50ca4bf1d8af) Signed-off-by: Domen Kožar --- .../networking/browsers/chromium/source/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 732568291d3..965c7885416 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -74,8 +74,6 @@ in stdenv.mkDerivation { cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; - preferLocalBuild = true; - passthru = { inherit version channel; plugins = fetchurl binary; -- GitLab From ccce09a396fb6945eebb30ae820db45aee3487e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 11:25:49 +0200 Subject: [PATCH 035/553] beast: switch to a working src location, fixes #9936 It also needs an update, it seems, but I don't know this SW. --- pkgs/applications/audio/beast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 3997855a75b..7113a169e80 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool , gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "beast-0.7.1"; src = fetchurl { - url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2; + url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; }; -- GitLab From d4e36bd2d6517756553271e89ce23caea4a2c65c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 5 Jul 2015 16:02:35 +0200 Subject: [PATCH 036/553] vit: init at 1.2 Suggested-by: Robert Helgesson --- pkgs/applications/misc/vit/default.nix | 36 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/vit/default.nix diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix new file mode 100644 index 00000000000..d8dea641c3a --- /dev/null +++ b/pkgs/applications/misc/vit/default.nix @@ -0,0 +1,36 @@ +{ pkgs, fetchgit, stdenv, makeWrapper, taskwarrior, ncurses, +perl, perlPackages }: + +let + version = "1.2"; +in +stdenv.mkDerivation { + name = "vit-${version}"; + + src = fetchgit { + url = "https://git.tasktools.org/scm/ex/vit.git"; + rev = "7d0042ca30e9d09cfbf9743b3bc72096e4a8fe1e"; + sha256 = "92cad7169b3870145dff02256e547ae270996a314b841d3daed392ac6722827f"; + }; + + preConfigure = '' + substituteInPlace Makefile.in \ + --replace sudo "" + substituteInPlace configure \ + --replace /usr/bin/perl ${perl}/bin/perl + ''; + + postInstall = '' + wrapProgram $out/bin/vit --prefix PERL5LIB : $PERL5LIB + ''; + + buildInputs = [ taskwarrior ncurses perlPackages.Curses perl makeWrapper ]; + + meta = { + description = "Visual Interactive Taskwarrior"; + maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ]; + platforms = pkgs.lib.platforms.linux; + license = pkgs.lib.licenses.gpl3; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a1323ea8d0..4fd3a1b08a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3271,6 +3271,8 @@ let inherit (gnome3) gexiv2; }; + vit = callPackage ../applications/misc/vit { }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = builderDefsPackage (callPackage ../tools/video/vncrec) {}; -- GitLab From 07aefa403d80530d7c23a3efd796941076f4830b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 19 Sep 2015 23:48:47 +0200 Subject: [PATCH 037/553] filezilla: 3.13.1 -> 3.14.0 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index f57f48e357a..51b5df176cc 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml }: -let version = "3.13.1"; in +let version = "3.14.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1iz82zqi1dqxm21ngmvh3sv97mj8069xy276gpv3yrmnyv4psvn1"; + sha256 = "1zbrsmrqnxzj6cnf2y1sx384nv6c8l3338ynazjfbiqbyfs5lf4j"; }; configureFlags = [ -- GitLab From 34b3860909e57b104bd95d99195a1ddc7db6f54f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 20 Sep 2015 15:36:31 +0200 Subject: [PATCH 038/553] pal: 0.4.2 -> 0.4.3 --- pkgs/tools/misc/pal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 2a081b882ab..ff7279d0d57 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }: stdenv.mkDerivation rec { - name = "pal-0.4.2"; + name = "pal-0.4.3"; src = fetchurl { url = "mirror://sourceforge/palcal/${name}.tgz"; - sha256 = "1601nsspxscm7bp9g9bkia0ij0mx2lpskl2fqhs5r0smp92121nx"; + sha256 = "072mahxvd7lcvrayl32y589w4v3vh7bmlcnhiksjylknpsvhqiyf"; }; patchPhase = '' -- GitLab From e8c6b2d0e69ab443def238015028180e509ea8f1 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 20 Sep 2015 15:37:36 +0200 Subject: [PATCH 039/553] mosh: 1.2.4 -> 1.2.5 --- pkgs/tools/networking/mosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 5209e58ff24..ec2f8d78dc6 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -2,11 +2,11 @@ , makeWrapper, perl, openssl }: stdenv.mkDerivation rec { - name = "mosh-1.2.4"; + name = "mosh-1.2.5"; src = fetchurl { url = "http://mosh.mit.edu/${name}.tar.gz"; - sha256 = "0inzfmqrab3n97m7rrmhd4xh3hjz0xva2sfl5m06w11668r0skg7"; + sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s"; }; buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; -- GitLab From 232bafe6c356e80000dcfee44e529e3d2e692549 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 20 Sep 2015 15:38:53 +0200 Subject: [PATCH 040/553] mupdf: 1.7a -> 1.7 --- pkgs/applications/misc/mupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 12dbbe6a9aa..e1807b3aff9 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,12 +2,12 @@ , libX11, libXext }: stdenv.mkDerivation rec { - version = "1.7a"; + version = "1.7"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "073xq6kczq331awycvznpc49b22idqzdlw4g9254zi0z07x5y0wc"; + sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; -- GitLab From bf21b42db91999ac208e769dc7f0564e79d22122 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 20 Sep 2015 15:40:13 +0200 Subject: [PATCH 041/553] xterm: 317 -> 320 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 1caa78d580d..2c47e1c9805 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-317"; + name = "xterm-320"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0v9mirqws1vb8wxbdgn1w166ln7xmapg1913c7kzjs3mwkdv1rfj"; + sha256 = "19r4rs5pjq944m7aiqligazf6wgmv4f023x3bx183h1l8dbvn3d6"; }; buildInputs = -- GitLab From b868ec950d7a85e7856baa6e5f85c4d80f1a91a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 15:57:33 +0200 Subject: [PATCH 042/553] mesa: maintenance update 10.6.7 -> 10.6.8 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 96dad654de8..90db53ae7eb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -22,7 +22,7 @@ else */ let - version = "10.6.7"; + version = "10.6.8"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "feb1f640b915dada88a7c793dfaff0ae23580f8903f87a6b76469253de0d28d8"; + sha256 = "e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd"; }; prePatch = "patchShebangs ."; -- GitLab From 8e393dde0f716978fde32f0f9345983f1e6e3077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Sep 2015 17:37:09 +0200 Subject: [PATCH 043/553] xfce.exo: maintenance update 0.10.6 -> 0.10.7 --- pkgs/desktops/xfce/core/exo.nix | 10 +++++----- pkgs/desktops/xfce/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index f48a3e3808b..83610a4e4a6 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "exo"; ver_maj = "0.10"; - ver_min = "6"; + ver_min = "7"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752"; + sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { + meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 459158a136a..f2a9f848342 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -4,7 +4,7 @@ let callPackage = newScope (deps // xfce_self); -deps = rec { # xfce-global dependency overrides should be here +deps = { # xfce-global dependency overrides should be here inherit (pkgs.gnome) libglade libwnck vte gtksourceview; inherit (pkgs.perlPackages) URI; }; -- GitLab From 79c6c27b9b8116eb031c08ff525cbac5fdf69de5 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Mon, 14 Sep 2015 15:06:21 -0500 Subject: [PATCH 044/553] pandas: add libcxx dependency on darwin (close #9862) vcunat changed `optional` arguments from lists to packages. --- pkgs/top-level/python-packages.nix | 155 ++++++++++++++++------------- 1 file changed, 84 insertions(+), 71 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a77df0b5cf..3febb9886e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2633,24 +2633,24 @@ let license = licenses.mit; }; }; - + pytestrunner = buildPythonPackage rec { version = "2.6.2"; name = "pytest-runner-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pytest-runner/${name}.tar.gz"; sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb"; }; - + buildInputs = with self; [setuptools_scm pytest]; - + meta = { description = "Invoke py.test as distutils command with dependency resolution"; homepage = https://bitbucket.org/pytest-dev/pytest-runner; license = licenses.mit; }; - + # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration doCheck = false; }; @@ -7225,19 +7225,19 @@ let homepage = http://pypi.python.org/pypi/IPy; }; }; - + ipykernel = buildPythonPackage rec { version = "4.0.3"; name = "ipykernel-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz"; sha256 = "a4d7d2d35a0af432c8391872cb4dae727d77031212f32ca858b5c84cd0ea821f"; }; - + buildInputs = with self; [] ++ optionals isPy27 [mock]; propagatedBuildInputs = with self; [ipython traitlets jupyter_client pexpect]; - + meta = { description = "IPython Kernel for Jupyter"; homepage = http://ipython.org/; @@ -7245,40 +7245,40 @@ let maintainers = with maintainers; [ fridh ]; }; }; - + ipyparallel = buildPythonPackage rec { version = "4.0.2"; name = "ipyparallel-${version}"; - - src = pkgs.fetchurl { + + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz"; sha256 = "6b9e09ca441a45e055b97cb8e3e1dd30de85b935fae3aa0d97f138352fd3089b"; }; - + propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel]; - + meta = { description = "Interactive Parallel Computing with IPython"; homepage = http://ipython.org/; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; - + }; - + ipython = buildPythonPackage rec { version = "4.0.0"; name = "ipython-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da"; }; - + buildInputs = with self; [nose] ++ optionals isPy27 [mock]; - + propagatedBuildInputs = with self; [decorator pickleshare simplegeneric traitlets requests pexpect sqlite3]; - + meta = { description = "IPython: Productive Interactive Computing"; homepage = http://ipython.org/; @@ -7286,16 +7286,16 @@ let maintainers = with maintainers; [ bjornfor jgeerds fridh ]; }; }; - + ipython_genutils = buildPythonPackage rec { version = "0.1.0"; name = "ipython_genutils-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipython_genutils/${name}.tar.gz"; sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6"; }; - + meta = { description = "Vestigial utilities from IPython"; homepage = http://ipython.org/; @@ -7513,37 +7513,37 @@ let license = licenses.mit; }; }; - + jupyter_client = buildPythonPackage rec { version = "4.0.0"; name = "jupyter_client-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jupyter_client/${name}.tar.gz"; sha256 = "a39a4181ea2021daf6e821acae836999ef6e0fefe603813a7a7d4658d2ffa2ac"; }; - + propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py; - + meta = { description = "Jupyter protocol implementation and client libraries"; homepage = http://jupyter.org/; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; - }; + }; }; - + jupyter_core = buildPythonPackage rec { version = "4.0.4"; name = "jupyter_core-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jupyter_core/${name}.tar.gz"; sha256 = "fcf45478025f34174943993947f51a41ad871ac998a14bf1cb87d8eb61e75c6d"; }; - + propagatedBuildInputs = with self; [traitlets]; - + meta = { description = "Jupyter core package. A base package on which Jupyter projects rely"; homepage = http://jupyter.org/; @@ -8334,18 +8334,18 @@ let maintainers = with maintainers; [ thoughtpolice ]; }; }; - + mistune = buildPythonPackage rec { version = "0.7.1"; name = "mistune-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/mistune/${name}.tar.gz"; sha256 = "6076dedf768348927d991f4371e5a799c6a0158b16091df08ee85ee231d929a7"; }; - + buildInputs = with self; [nose]; - + meta = { decription = "The fastest markdown parser in pure Python"; homepage = https://github.com/lepture/mistune; @@ -8827,39 +8827,39 @@ let license = licenses.lgpl21Plus; }; }; - + nbconvert = buildPythonPackage rec { version = "4.0.0"; name = "nbconvert-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz"; sha256 = "472ad15d1a71f1ef00c4094c11bb93638858fc89fb2c5838b3aa6b67d981b437"; }; - + buildInputs = with self; [nose]; - + propagatedBuildInputs = with self; [mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client]; - + meta = { description = "Converting Jupyter Notebooks"; homepage = http://jupyter.org/; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; - }; + }; }; - + nbformat = buildPythonPackage rec { version = "4.0.0"; name = "nbformat-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nbformat/${name}.tar.gz"; sha256 = "daf9b990e96863d120aff123361156a316757757b81a8070eb6945e4a9774b2d"; }; - + propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core]; - + meta = { description = "The Jupyter Notebook format"; homepage = "http://jupyter.org/"; @@ -9196,20 +9196,20 @@ let buildInputs = with self; [ nose ]; }; - + notebook = buildPythonPackage rec { version = "4.0.4"; name = "notebook-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/notebook/${name}.tar.gz"; sha256 = "a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648"; }; - + buildInputs = with self; [nose] ++ optionals isPy27 [mock]; - + propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests pexpect]; - + meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = http://jupyter.org/; @@ -9731,7 +9731,10 @@ let }; }; - pandas = buildPythonPackage rec { + pandas = let + inherit (pkgs.stdenv.lib) optional optionalString; + inherit (pkgs.stdenv) isDarwin; + in buildPythonPackage rec { name = "pandas-0.16.2"; src = pkgs.fetchurl { @@ -9739,7 +9742,7 @@ let sha256 = "10agmrkps8bi5948vwpipfxds5kj1d076m9i0nhaxwqiw7gm6670"; }; - buildInputs = [ self.nose ]; + buildInputs = [ self.nose ] ++ optional isDarwin pkgs.libcxx; propagatedBuildInputs = with self; [ dateutil numpy @@ -9753,7 +9756,17 @@ let html5lib modules.sqlite3 beautifulsoup4 - ]; + ] ++ optional isDarwin pkgs.darwin.adv_cmds; # provides the locale command + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + patchPhase = optionalString isDarwin '' + cpp_sdk="${pkgs.libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + ''; preCheck = '' # Broken test, probably https://github.com/pydata/pandas/issues/10312: @@ -9957,16 +9970,16 @@ let url = "https://pypi.python.org/packages/source/p/path.py/${name}.tar.gz"; sha256 = "5cdf60f359f1add18f8556c9a1855cbd1d517f0780e3d386c256515f698ba0e0"; }; - + buildInputs = with self; [setuptools_scm pytestrunner pytest]; - + meta = { description = "A module wrapper for os.path"; homepage = http://github.com/jaraco/path.py; license = licenses.mit; platforms = platforms.linux; }; - + # Test fails with python 2.7: TestUnicodePaths.test_walkdirs_with_unicode_name # Also during tests with python 3.4: RuntimeError: dictionary changed size during iteration # Caused by pytestrunner @@ -10220,21 +10233,21 @@ let pickleshare = buildPythonPackage rec { version = "0.5"; name = "pickleshare-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pickleshare/${name}.tar.gz"; sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286"; }; - + propagatedBuildInputs = with self; [pathpy]; - + meta = { description = "Tiny 'shelve'-like database with concurrency support"; homepage = https://github.com/vivainio/pickleshare; license = licenses.mit; }; }; - + pip = buildPythonPackage rec { version = "1.5.6"; name = "pip-${version}"; @@ -12628,19 +12641,19 @@ let license = licenses.bsd3; }; }; - + qtconsole = buildPythonPackage rec { version = "4.0.1"; name = "qtconsole-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/q/qtconsole/${name}.tar.gz"; sha256 = "7d2cf976bb960df11f413709b5b5b809365c48426110e946d0c12117e6ced3a5"; }; - + buildInputs = with self; [] ++ optionals isPy27 [mock]; propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4]; - + meta = { description = "Jupyter Qt console"; homepage = http://jupyter.org/; @@ -13403,16 +13416,16 @@ let license = "unspecified"; # ! }; }; - + simplegeneric = buildPythonPackage rec { version = "0.8.1"; name = "simplegeneric-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/simplegeneric/${name}.zip"; sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; }; - + meta = { description = "Simple generic functions"; homepage = http://cheeseshop.python.org/pypi/simplegeneric; @@ -14666,14 +14679,14 @@ let traitlets = buildPythonPackage rec { version = "4.0.0"; name = "traitlets-${version}"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/traitlets/${name}.tar.gz"; sha256 = "0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b"; }; - + propagatedBuildInputs = with self; [ipython_genutils decorator]; - + meta = { description = "Traitlets Python config system"; homepage = http://ipython.org/; -- GitLab From f5deff5137f8807cd9a0364bf3580c2853951126 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 27 Aug 2015 04:02:09 +0300 Subject: [PATCH 045/553] nix-prefetch-git: pull all tags from remote when checkouting by revision Close #9790. This fixes checkouting for a nasty combination: 1. To be checkouted is a revision which corresponds to tag in a form "^{}". 2. This revision is not fetched by default. --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index ceedf313f28..22d46257075 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -109,7 +109,7 @@ checkout_hash(){ hash=$(hash_from_ref $ref) fi - git fetch ${builder:+--progress} origin || return 1 + git fetch -t ${builder:+--progress} origin || return 1 git checkout -b $branchName $hash || return 1 } -- GitLab From 3ff372b7ac40e26a2dfb17f569ad52001fc4fee7 Mon Sep 17 00:00:00 2001 From: David Kleuker Date: Sun, 20 Sep 2015 17:52:05 +0200 Subject: [PATCH 046/553] pantheon-terminal: 0.3.0.1 -> 0.3.1.3 --- pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index b0958d232fc..7d5447ae52a 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { majorVersion = "0.3"; - minorVersion = "0.1"; + minorVersion = "1.3"; name = "pantheon-terminal-${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; - sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za"; + sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss"; }; preConfigure = '' -- GitLab From dc3ae3beaacdb6c5dd80f5cdcdafe52249e64531 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 19 Sep 2015 10:40:57 -0500 Subject: [PATCH 047/553] nixpkgs: afl 1.93b -> 1.94b Signed-off-by: Austin Seipp --- pkgs/tools/security/afl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 324371a7dce..24a3abd4096 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.93b"; + version = "1.94b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1nin3rxidvfbafc5pm35wcmlx7yq07xwb29s5k1zzqdfflcnpi1m"; + sha256 = "1c36yz3ajd66m3c5aiai3wf59pzxivn80cvlib3dw45d4zqiymqp"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup -- GitLab From eace7b6f9c5e87811d0c96f2a0f0ae7275c03032 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sun, 20 Sep 2015 19:38:03 +0100 Subject: [PATCH 048/553] profanity: 0.4.6 -> 0.4.7 Built and run successfully on local. From the Changelog: ``` - GNU Readline - OpenPGP support - Message Carbons (xep-0280) - Message Delivery Receipts (xep-0184) - MUC Mediated Invitation support - Configurable time formatting - Option to show JIDs in roster - Option to hide empty groups in roster - Generate UUID for unnamed new MUC rooms - Themable UI preference to indicate OTR and PGP messages - Reformatted help - devel: Added functional tests using libexpect and libstabber ``` --- .../networking/instant-messengers/profanity/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 1a9f8f8feab..ac4776c2072 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat -, ncurses, libotr, curl, libstrophe +, ncurses, libotr, curl, libstrophe, readline, libuuid , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null @@ -12,15 +12,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.4.6"; + version = "0.4.7"; src = fetchurl { url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "17ra53c1m0w0lzm5bj63y1ysx8bv119z5h0csisxsn4r85z6cwln"; + sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h"; }; buildInputs = [ - automake autoconf pkgconfig + automake autoconf pkgconfig readline libuuid glib openssl expat ncurses libotr curl libstrophe ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ]; -- GitLab From 170177ad26302f6cf367f7aca9557923fc2a90e7 Mon Sep 17 00:00:00 2001 From: Carter Charbonneau Date: Sat, 29 Aug 2015 17:02:31 -0600 Subject: [PATCH 049/553] retroshare: 0.6-svn-7445 -> 0.6-git-fabc3a3 (close #9542) --- .../networking/p2p/retroshare/0.6.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix index 6ea7089b3fb..855ebdd0593 100644 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchsvn, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher }: +{ stdenv, fetchFromGitHub, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: stdenv.mkDerivation { - name = "retroshare-0.6-svn-7445"; + name = "retroshare-0.6-git-fabc3a3"; - src = fetchsvn { - url = svn://svn.code.sf.net/p/retroshare/code/trunk; - rev = 7445; - sha256 = "1dqh65bn21g7ix752ddrr10kijjdwjgjipgysyxnm90zjmdlx3cc"; + src = fetchFromGitHub { + owner = "RetroShare"; + repo = "RetroShare"; + rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a"; + sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; @@ -29,12 +30,14 @@ stdenv.mkDerivation { # retroshare-nogui/src/retroshare-nogui.pro buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher ]; + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; configurePhase = '' qmake PREFIX=$out DESTDIR=$out RetroShare.pro ''; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/bin mv $out/retroshare-nogui $out/bin -- GitLab From 6fc40fada160c8b92869c155589c224fdec5fdc3 Mon Sep 17 00:00:00 2001 From: David Kleuker Date: Sun, 20 Sep 2015 21:16:22 +0200 Subject: [PATCH 050/553] add myself to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 78de8ca2c44..5e9ab78a955 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -70,6 +70,7 @@ cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; + davidak = "David Kleuker "; davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; -- GitLab From 122d5e497e6df55f4b2e5c353bb2224b79cfd7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 20 Sep 2015 21:35:17 +0200 Subject: [PATCH 051/553] Remove Gitit from the list of evaluated modules --- nixos/doc/manual/release-notes/rl-unstable.xml | 12 ++++++++++++ nixos/modules/module-list.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 2781cee3614..6d9f9412b62 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -23,5 +23,17 @@ wmii-hg package. + + Gitit! Is no longer automatically added to the module list in + NixOS and as such there will not be any manual entries for it. You will need to + add an import statement to your nixos configuration in order to use it. As + an example adding: + ]; + } + ]]> + + Will include the gitit service configuration options.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 214829ded5c..b03f4494522 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -197,7 +197,7 @@ ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix - ./services/misc/gitit.nix + #./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gpsd.nix -- GitLab From aeba3eabcdbfa6308d9af27b2a70e7864ec4d3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 20 Sep 2015 21:36:49 +0200 Subject: [PATCH 052/553] Revert "Don't evaluate haskellPackages when gitit is disabled" This reverts commit 99750d89dd962cc7011b02e487ed1a38c7842524. --- nixos/modules/services/misc/gitit.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 8e9e761b609..befd8c628f1 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -35,6 +35,7 @@ let }; haskellPackages = mkOption { + default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; description = "haskellPackages used to build gitit and plugins."; @@ -137,6 +138,7 @@ let staticDir = mkOption { type = types.path; + default = gititShared + "/data/static"; description = '' Specifies the path of the static directory (containing javascript, css, and images). If it does not exist, gitit will create it and @@ -207,6 +209,7 @@ let templatesDir = mkOption { type = types.path; + default = gititShared + "/data/templates"; description = '' Specifies the path of the directory containing page templates. If it does not exist, gitit will create it with default templates. Users @@ -288,6 +291,7 @@ let plugins = mkOption { type = with types; listOf str; + default = [ (gititShared + "/plugins/Dot.hs") ]; description = '' Specifies a list of plugins to load. Plugins may be specified either by their path or by their module name. If the plugin name starts @@ -641,13 +645,6 @@ in config = mkIf cfg.enable { - services.gitit = { - haskellPackages = mkDefault pkgs.haskellPackages; - staticDir = gititShared + "/data/static"; - templatesDir = gititShared + "/data/templates"; - plugins = [ ]; - }; - users.extraUsers.gitit = { group = config.users.extraGroups.gitit.name; description = "Gitit user"; -- GitLab From 8a1b8a5b0a4bc1bb7995f7f867a66a400259326c Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sun, 20 Sep 2015 13:08:38 -0700 Subject: [PATCH 053/553] alias libtool to darwin.cctools on darwin --- pkgs/os-specific/darwin/cctools/port.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index bfb389ef37c..e7165875aa4 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool +{ stdenv, fetchurl, autoconf, automake, libtool_2 , llvm, libcxx, libcxxabi, clang, openssl, libuuid , libobjc ? null }: @@ -18,7 +18,7 @@ let sha256 = "01f31ijpnplbiyp7ldwzy8vbkn3j3m56n5blsvsav5nlp4lp2g71"; }; - buildInputs = [ autoconf automake libtool openssl libuuid ] ++ + buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++ # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b805dfcd7e4..4de12627c29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2011,13 +2011,9 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-0_12 = callPackage ../development/web/nodejs { - libuv = libuvVersions.v1_6_1; - libtool = darwin.cctools; - }; + nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_6_1; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { - libtool = darwin.cctools; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation; }; @@ -5566,7 +5562,9 @@ let lemon = callPackage ../development/tools/parsing/lemon { }; - libtool = libtool_2; + libtool = if stdenv.isDarwin + then darwin.cctools + else libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; -- GitLab From dfb2f6151983074396b670c4808b88c50a227ed5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sun, 20 Sep 2015 13:32:43 -0700 Subject: [PATCH 054/553] fix autoreconfHook --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4de12627c29..3385c2b166b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -269,7 +269,7 @@ let autonix = import ../build-support/autonix { inherit pkgs; }; autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake libtool gettext; }; } + { substitutions = { inherit autoconf automake gettext; libtool = realLibtool; }; } ../build-support/setup-hooks/autoreconf.sh; buildEnv = callPackage ../build-support/buildenv {}; @@ -5564,7 +5564,9 @@ let libtool = if stdenv.isDarwin then darwin.cctools - else libtool_2; + else realLibtool; + + realLibtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; -- GitLab From 5ba050a1a3971ea3a350238f6b6b15f90e516e6e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 20 Sep 2015 14:08:22 -0700 Subject: [PATCH 055/553] cmake: 3.3.1 -> 3.3.2 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c39fa657f84..5ddbefe0884 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -11,7 +11,7 @@ assert wantPS -> (ps != null); let os = stdenv.lib.optionalString; majorVersion = "3.3"; - minorVersion = "1"; + minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd"; + sha256 = "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7"; }; enableParallelBuilding = true; -- GitLab From 775d1dc4b1f0fc06d12d5f8e51179c39e87859ce Mon Sep 17 00:00:00 2001 From: David Kleuker Date: Sun, 20 Sep 2015 21:46:10 +0200 Subject: [PATCH 056/553] iops: init at 0.1 --- pkgs/tools/system/iops/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/system/iops/default.nix diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix new file mode 100644 index 00000000000..300fe59a97d --- /dev/null +++ b/pkgs/tools/system/iops/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "iops-${version}"; + version = "0.1"; + + src = fetchurl { + url = "http://www.vanheusden.com/iops/${name}.tgz"; + sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; + }; + + installPhase = '' + mkdir -p $out/bin + cp iops $out/bin + ''; + + meta = with stdenv.lib; { + description = "Measure I/O operations per second of a storage device"; + longDescription = '' + Iops lets you measure how many I/O operations per second a storage device can perform. + Usefull for determing e.g. the best RAID-setting of your storage device. + ''; + homepage = http://www.vanheusden.com/iops/; + license = licenses.gpl2; + maintainers = with maintainers; davidak; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30668c593a9..789ab730bb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1877,9 +1877,11 @@ let inetutils = callPackage ../tools/networking/inetutils { }; - innoextract = callPackage ../tools/archivers/innoextract {}; + innoextract = callPackage ../tools/archivers/innoextract { }; - ioping = callPackage ../tools/system/ioping {}; + ioping = callPackage ../tools/system/ioping { }; + + iops = callPackage ../tools/system/iops { }; iodine = callPackage ../tools/networking/iodine { }; -- GitLab From 1bada3e658d529d13d0fc7f4e83f9556ccefd327 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 20 Sep 2015 14:25:46 -0700 Subject: [PATCH 057/553] all-packages: Fix extraneous reference to deleted boost 1.57 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3385c2b166b..a7e485a3468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1702,7 +1702,7 @@ let calamares = callPackage ../tools/misc/calamares rec { python = python3; - boost = callPackage ../development/libraries/boost/1.57.nix { python=python3; }; + boost = pkgs.boost.override { python=python3; }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid; }; -- GitLab From 8bba6d6ebf2f61b1ef47529648f216abd8640bcb Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 21 Sep 2015 00:12:34 +0200 Subject: [PATCH 058/553] perl-File-LibMagic: 1.13 -> 1.15 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d73f8210941..0dee3fe2d8c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4469,10 +4469,10 @@ let self = _self // overrides; _self = with self; { }; FileLibMagic = buildPerlPackage rec { - name = "File-LibMagic-1.13"; + name = "File-LibMagic-1.15"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "61f92c3137a3b86d63e61313b51aa2673991110d655eee792ea11c68bf2c0092"; + sha256 = "2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84"; }; buildInputs = [ TestFatal pkgs.file ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; -- GitLab From f27643febc841a4b96b0bd878e9a721f8b68acaa Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sun, 20 Sep 2015 23:07:46 +1000 Subject: [PATCH 059/553] google-musicmanager: beta_1.0.182.3607-r0 -> beta_1.0.221.5230-r0 The previous version was 404 Also fixes i686 typo --- pkgs/applications/audio/google-musicmanager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 2edc1c00ce6..7c69a25eb04 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac , libvorbis }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; + sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; } else fetchurl { url = archUrl name "i386"; - sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; + sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; }; unpackPhase = '' -- GitLab From 9aff5bb08202c89b74fd6a4f7084aeab3edfae51 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 20 Sep 2015 17:26:46 -0700 Subject: [PATCH 060/553] syncthing: Fix version output --- pkgs/top-level/go-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6264a6fb4fa..2472709e4bd 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2745,8 +2745,9 @@ let sha256 = "1l7nw00pazp317n5nprrxwhcq56kdblc774lsznxmbb30xcp8nmf"; }; - syncthing = buildFromGitHub { - rev = "v0.11.25"; + syncthing = buildFromGitHub rec { + version = "0.11.25"; + rev = "v${version}"; owner = "syncthing"; repo = "syncthing"; sha256 = "17phkj0dxzc1j755ddpf15rq34yp52pw2lx9kpg7gyc9qp0pzacl"; @@ -2755,6 +2756,10 @@ let go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv goleveldb suture qart crypto net text ]; + postPatch = '' + # Mostly a costmetic change + sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go + ''; }; syncthing-lib = buildFromGitHub { -- GitLab From 0e1a15f2da786f3e67e15d272febcf4aa7be3b0b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 19 Sep 2015 20:38:49 +0200 Subject: [PATCH 061/553] stress-ng: 0.04.19 -> 0.04.20 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index a0d99f2b7d7..58f6f81da31 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, attr, keyutils }: let - version = "0.04.19"; + version = "0.04.20"; name = "stress-ng-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { - sha256 = "12qgrr0wd3ppaawn5br0i7q26iy88pxfwg9wiqxf4cav89591syc"; + sha256 = "0zzlnqmld804h08iabhcrj3ggm5wiry9g2jrdr33cqp44lrw402v"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; -- GitLab From 728199b8cffd184d1d2bfc4245d604d976476a44 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Sep 2015 00:17:19 +0200 Subject: [PATCH 062/553] libpsl: 0.9.0 -> 0.10.0 --- pkgs/development/libraries/libpsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index ec2611e2ac9..58de331c0c5 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -13,13 +13,13 @@ let owner = "publicsuffix"; }; - libVersion = "0.9.0"; + libVersion = "0.10.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "01vmlmm75jdpfmd546z1yib92nmdqdlqv19ax379p3ys6kgap1sw"; + sha256 = "0m6jz0cc49cp0zki1qb2b1z7z0djladayfhbxi0i20pad28czsbn"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; -- GitLab From 7bc8b1561e044084a37e844bbb5a1b00902c654a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 20 Sep 2015 18:54:08 -0700 Subject: [PATCH 063/553] bundlerEnv: Use released versions of bundler We were using HEAD for unreleased features. These features are now in release builds so we should go back to using those. This also means we won't have to deal with hash mismatches for all ruby packages. --- .../networking/cluster/panamax/api/default.nix | 6 +++--- .../networking/cluster/panamax/ui/default.nix | 6 +++--- .../interpreters/ruby/bundler-env/default.nix | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index dcfef83f1be..55771876fcd 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD +{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, libxslt, libxml2, sqlite, openssl, docker , dataDir ? "/var/lib/panamax-api" }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { lockfile = ./Gemfile.lock; buildInputs = [ openssl ]; }; - bundler = bundler_HEAD.override { inherit ruby; }; + bundler' = bundler.override { inherit ruby; }; database_yml = builtins.toFile "database.yml" '' production: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; }; - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; + buildInputs = [ makeWrapper sqlite openssl env.ruby bundler' ]; setSourceRoot = '' mkdir -p $out/share diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 3dac1061362..08a433c6bdb 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD +{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}: with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; }; - bundler = bundler_HEAD.override { inherit ruby; }; + bundler' = bundler.override { inherit ruby; }; src = fetchgit { rev = "refs/tags/v${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; }; - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; + buildInputs = [ makeWrapper env.ruby openssl sqlite bundler' ]; setSourceRoot = '' mkdir -p $out/share diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix index b51a6d49bd3..762beffd745 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib -, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD +, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, bundler , git }@defs: @@ -18,7 +18,7 @@ let shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; const = x: y: x; - bundler = bundler_HEAD.override { inherit ruby; }; + bundler' = bundler.override { inherit ruby; }; inherit (builtins) attrValues; gemName = attrs: "${attrs.name}-${attrs.version}.gem"; @@ -252,7 +252,7 @@ let buildInputs = [ ruby - bundler + bundler' git ] ++ args.buildInputs or []; @@ -270,7 +270,7 @@ let cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock export NIX_GEM_SOURCES=${sources} - export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler'}/${ruby.gemPath} export GEM_HOME=$out/${ruby.gemPath} export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME @@ -279,7 +279,7 @@ let ${allBuildFlags} mkdir gems - cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems + cp ${bundler'}/${ruby.gemPath}/cache/bundler-*.gem gems ${copyGems} ${lib.optionalString (!documentation) '' @@ -304,7 +304,7 @@ let passthru = { inherit ruby; - inherit bundler; + bundler = bundler'; env = let irbrc = builtins.toFile "irbrc" '' @@ -320,7 +320,7 @@ let shellHook = '' export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile export GEM_HOME=${derivation}/${ruby.gemPath} - export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler'}/${ruby.gemPath} export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME export OLD_IRBRC="$IRBRC" export IRBRC=${irbrc} -- GitLab From 533a2799bc7df1fed9c3580d3ae65b75a91600d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 21 Sep 2015 05:34:23 +0200 Subject: [PATCH 064/553] release-notes: properly close the item list --- .../doc/manual/release-notes/rl-unstable.xml | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 6d9f9412b62..3132a07e76a 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -22,18 +22,20 @@ the developers upstream. Use wimenu from the wmii-hg package. - - Gitit! Is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. You will need to - add an import statement to your nixos configuration in order to use it. As - an example adding: - ]; - } - ]]> - - Will include the gitit service configuration options. + Gitit! Is no longer automatically added to the module list in + NixOS and as such there will not be any manual entries for it. You will need to + add an import statement to your nixos configuration in order to use it. As + an example adding: + ]; + } + ]]> + + Will include the gitit service configuration options. + + + -- GitLab From 5ff9dc0ffd2d9a128d2733b3e9337448a67232ed Mon Sep 17 00:00:00 2001 From: Robbin C Date: Mon, 21 Sep 2015 11:56:10 +0800 Subject: [PATCH 065/553] ctpp2: init at 2.8.3. This adds ctpp2, a high performance templating engine. --- pkgs/development/libraries/ctpp2/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/ctpp2/default.nix diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix new file mode 100644 index 00000000000..ab5cd2beff3 --- /dev/null +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, gcc48 }: + +stdenv.mkDerivation rec { + name = "ctpp2"; + version = "2.8.3"; + + src = fetchurl { + url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz"; + sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; + }; + + buildInputs = [ cmake gcc48 ]; + + patchPhase = '' + # include to fix undefined getcwd + sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp + ''; + + meta = { + description = "A high performance templating engine"; + homepage = http://ctpp.havoc.ru; + maintiainers = with stdenv.lib.maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a1323ea8d0..af84015626c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6022,6 +6022,8 @@ let ctl = callPackage ../development/libraries/ctl { }; + ctpp2 = callPackage ../development/libraries/ctpp2 { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; cppunit = callPackage ../development/libraries/cppunit { }; -- GitLab From 09895a3f7111affc4d1b9cf2469e8c2fbee96085 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 18 Sep 2015 20:32:34 +0200 Subject: [PATCH 066/553] go-bindata-assetfs: init at d5cac425555ca5cf00694df246e04f05e6a55150 --- pkgs/top-level/go-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 2472709e4bd..51c0a43350d 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -989,6 +989,22 @@ let }; }; + go-bindata-assetfs = buildFromGitHub { + rev = "d5cac425555ca5cf00694df246e04f05e6a55150"; + owner = "elazarl"; + repo = "go-bindata-assetfs"; + sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; + + date = "2015-08-13"; + + meta = { + description = "Serves embedded files from jteeuwen/go-bindata with net/http"; + homepage = "https://github.com/elazarl/go-bindata-assetfs"; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + license = licenses.bsd2; + }; + }; + pmylund.go-cache = buildGoPackage rec { rev = "93d85800f2fa6bd0a739e7bd612bfa3bc008b72d"; name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}"; -- GitLab From 98b3626bf203a6e8867ce498105056722f194ed0 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 18 Sep 2015 20:32:51 +0200 Subject: [PATCH 067/553] manners: init at 0.4.0 --- pkgs/top-level/go-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 51c0a43350d..1369d75cfe1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1692,6 +1692,20 @@ let ''; }; + manners = buildFromGitHub { + rev = "0.4.0"; + owner = "braintree"; + repo = "manners"; + sha256 = "07985pbfhwlhbglr9zwh2wx8kkp0wzqr1lf0xbbxbhga4hn9q3ak"; + + meta = { + description = "A polite Go HTTP server that shuts down gracefully"; + homepage = "https://github.com/braintree/manners"; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + license = licenses.mit; + }; + }; + mapstructure = buildFromGitHub { rev = "281073eb9eb092240d33ef253c404f1cca550309"; owner = "mitchellh"; -- GitLab From 700c3c93fb26a60b3a11082323cb399212076a78 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 18 Sep 2015 20:33:15 +0200 Subject: [PATCH 068/553] gotty: init at 0.0.10 --- pkgs/top-level/go-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1369d75cfe1..3f7258f36a5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -796,6 +796,27 @@ let sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m"; }; + gotty = buildFromGitHub { + rev = "v0.0.10"; + owner = "yudai"; + repo = "gotty"; + sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; + + buildInputs = [ cli-go go manners go-bindata-assetfs go-multierror structs websocket hcl pty ]; + + postInstall = '' + mkdir $out/bin + ln -s go/bin/gotty $out/bin/ + ''; + + meta = { + description = "Share your terminal as a web application"; + homepage = "https://github.com/yudai/gotty"; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + license = licenses.mit; + }; + }; + govers = buildFromGitHub { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; date = "2015-01-09"; -- GitLab From 0a7176c5a12e633650f5b11bdbae79a60ba58715 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 20 Sep 2015 22:05:22 -0700 Subject: [PATCH 069/553] Revert "bundlerEnv: Use released versions of bundler" This reverts commit 7bc8b1561e044084a37e844bbb5a1b00902c654a. This breaks some ruby gems and needs to be reworked again. --- .../networking/cluster/panamax/api/default.nix | 6 +++--- .../networking/cluster/panamax/ui/default.nix | 6 +++--- .../interpreters/ruby/bundler-env/default.nix | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 55771876fcd..dcfef83f1be 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler +{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD , ruby, libxslt, libxml2, sqlite, openssl, docker , dataDir ? "/var/lib/panamax-api" }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { lockfile = ./Gemfile.lock; buildInputs = [ openssl ]; }; - bundler' = bundler.override { inherit ruby; }; + bundler = bundler_HEAD.override { inherit ruby; }; database_yml = builtins.toFile "database.yml" '' production: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; }; - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler' ]; + buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; setSourceRoot = '' mkdir -p $out/share diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 08a433c6bdb..3dac1061362 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler +{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD , ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}: with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; }; - bundler' = bundler.override { inherit ruby; }; + bundler = bundler_HEAD.override { inherit ruby; }; src = fetchgit { rev = "refs/tags/v${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; }; - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler' ]; + buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; setSourceRoot = '' mkdir -p $out/share diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix index 762beffd745..b51a6d49bd3 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib -, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, bundler +, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD , git }@defs: @@ -18,7 +18,7 @@ let shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; const = x: y: x; - bundler' = bundler.override { inherit ruby; }; + bundler = bundler_HEAD.override { inherit ruby; }; inherit (builtins) attrValues; gemName = attrs: "${attrs.name}-${attrs.version}.gem"; @@ -252,7 +252,7 @@ let buildInputs = [ ruby - bundler' + bundler git ] ++ args.buildInputs or []; @@ -270,7 +270,7 @@ let cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock export NIX_GEM_SOURCES=${sources} - export NIX_BUNDLER_GEMPATH=${bundler'}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} export GEM_HOME=$out/${ruby.gemPath} export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME @@ -279,7 +279,7 @@ let ${allBuildFlags} mkdir gems - cp ${bundler'}/${ruby.gemPath}/cache/bundler-*.gem gems + cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems ${copyGems} ${lib.optionalString (!documentation) '' @@ -304,7 +304,7 @@ let passthru = { inherit ruby; - bundler = bundler'; + inherit bundler; env = let irbrc = builtins.toFile "irbrc" '' @@ -320,7 +320,7 @@ let shellHook = '' export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile export GEM_HOME=${derivation}/${ruby.gemPath} - export NIX_BUNDLER_GEMPATH=${bundler'}/${ruby.gemPath} + export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath} export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME export OLD_IRBRC="$IRBRC" export IRBRC=${irbrc} -- GitLab From af9f1a5552af319d84ee3f8d33b8de9a71b0eb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Sep 2015 07:53:07 +0200 Subject: [PATCH 070/553] go-packages: fixup evaluation of meta --- pkgs/top-level/go-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3f7258f36a5..f7769a73f0a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -809,10 +809,10 @@ let ln -s go/bin/gotty $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Share your terminal as a web application"; homepage = "https://github.com/yudai/gotty"; - maintainers = with lib.maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.mit; }; }; @@ -1018,10 +1018,10 @@ let date = "2015-08-13"; - meta = { + meta = with stdenv.lib; { description = "Serves embedded files from jteeuwen/go-bindata with net/http"; homepage = "https://github.com/elazarl/go-bindata-assetfs"; - maintainers = with lib.maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.bsd2; }; }; @@ -1719,10 +1719,10 @@ let repo = "manners"; sha256 = "07985pbfhwlhbglr9zwh2wx8kkp0wzqr1lf0xbbxbhga4hn9q3ak"; - meta = { + meta = with stdenv.lib; { description = "A polite Go HTTP server that shuts down gracefully"; homepage = "https://github.com/braintree/manners"; - maintainers = with lib.maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.mit; }; }; -- GitLab From af011439b78b68eefc95db592100893072de1800 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 21 Sep 2015 10:45:22 +0200 Subject: [PATCH 071/553] urweb: add back openssl configure flags to fix build, cc @aseipp --- pkgs/development/compilers/urweb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 90656b564c7..dc862940edf 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure ''; + configureFlags = "--with-openssl=${openssl}"; + preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; -- GitLab From 9c146220a9b0e9df4b3a89b2b8e046c84e2da915 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Sep 2015 11:02:17 +0200 Subject: [PATCH 072/553] Style / typo fixes --- .../doc/manual/release-notes/rl-unstable.xml | 66 ++++++++++--------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 3132a07e76a..2745fb2cbe4 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -7,35 +7,39 @@ Unstable When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - wmiiSnap has been replaced with - wmii_hg, but - services.xserver.windowManager.wmii.enable - has been updated respectively so this only affects you if you - have explicitly installed wmiiSnap. - - - wmiimenu is removed, as it has been removed by - the developers upstream. Use wimenu from the - wmii-hg package. - - - Gitit! Is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. You will need to - add an import statement to your nixos configuration in order to use it. As - an example adding: - ]; - } - ]]> - - Will include the gitit service configuration options. - - - - +following incompatible changes: + + + + wmiiSnap has been replaced with + wmii_hg, but + services.xserver.windowManager.wmii.enable has + been updated respectively so this only affects you if you have + explicitly installed wmiiSnap. + + + + + wmiimenu is removed, as it has been + removed by the developers upstream. Use wimenu + from the wmii-hg package. + + + + Gitit is no longer automatically added to the module list in + NixOS and as such there will not be any manual entries for it. You + will need to add an import statement to your NixOS configuration + in order to use it, e.g. + + ]; +} +]]> + + will include the Gitit service configuration options. + + + + -- GitLab From ddb39be32497899d29cb2226c78e5518a005c627 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Sep 2015 11:17:04 +0200 Subject: [PATCH 073/553] Update 15.09 release notes --- nixos/doc/manual/release-notes/rl-1509.xml | 127 ++++++++++++--------- 1 file changed, 73 insertions(+), 54 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index d7d3d1a7fb1..098613f9685 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -6,35 +6,48 @@ Release 15.09 (“Dingoâ€, 2015/09/??) -In addition to numerous new and upgraded packages, this release has the following highlights: - - - - - The Haskell packages infrastructure has been re-designed from the ground up. - NixOS now distributes the latest version of every single package registered on - Hackage, i.e. well over - 8000 Haskell packages. Further information and usage instructions for the - improved infrastructure are available at https://nixos.org/wiki/Haskell. - Users migrating from an earlier release will find also find helpful information - below, in the list of backwards-incompatible changes. - - - - - - Users running an SSH server who worry about the quality of their - /etc/ssh/moduli file with respect to the vulnerabilities - discovered in the Diffie-Hellman key exchange can now replace OpenSSH's - default version with one they generated themselves using the new - services.openssh.moduliFile option. - - - +In addition to numerous new and upgraded packages, this release +has the following highlights: - + + + + The Haskell packages infrastructure has been re-designed + from the ground up. NixOS now distributes the latest version of + every single package registered on Hackage, i.e. well + over 8000 Haskell packages. Further information and usage + instructions for the improved infrastructure are available at + https://nixos.org/wiki/Haskell. + Users migrating from an earlier release will also find helpful + information below, in the list of backwards-incompatible changes. + + + + Nix has been updated to version 1.10, which among other + improvements enables cryptographic signatures on binary caches for + improved security. + + + + You can now keep your NixOS system up to date automatically + by setting + + +system.autoUpgrade.enable = true; + + + This will cause the system to periodically check for updates in + your current channel and run nixos-rebuild. + + + + This release is based on Glibc 2.21, GCC 4.9 and Linux + 3.18. + + + When upgrading from a previous release, please be aware of the @@ -50,10 +63,11 @@ and want to continue to use them, please set system.stateVersion = "14.12"; -(The new option ensures that +The new option ensures that certain configuration changes that could break existing systems (such as the sshd host key setting) will maintain -compatibility with the specified NixOS release.) +compatibility with the specified NixOS release. NixOps sets the state +version of existing deployments automatically. cron is no longer enabled by default, unless you have a non-empty @@ -72,9 +86,9 @@ false. and old steam package -- to steamOriginal. -CMPlayer has been renamed to bomi upstream. Package cmplayer -was accordingly renamed to bomi - +CMPlayer has been renamed to bomi upstream. Package +cmplayer was accordingly renamed to +bomi Atom Shell has been renamed to Electron upstream. Package atom-shell was accordingly renamed to electron @@ -84,21 +98,20 @@ was accordingly renamed to electron which contains the latest Elm platform. - - The CUPS printing service has been updated to version 2.0.2. - Furthermore its systemd service has been renamed to cups.service. - - - Local printers are no longer shared or advertised by default. This behavior - can be changed by enabling services.printing.defaultShared - or services.printing.browsing respectively. - + The CUPS printing service has been updated to version + 2.0.2. Furthermore its systemd service has been + renamed to cups.service. + + Local printers are no longer shared or advertised by + default. This behavior can be changed by enabling + services.printing.defaultShared or + services.printing.browsing respectively. - The VirtualBox host and guest options have been moved/renamed more - consistently and less confusing to be now found in + The VirtualBox host and guest options have been named more + consistently. They can now found in virtualisation.virtualbox.host.* instead of services.virtualboxHost.* and virtualisation.virtualbox.guest.* instead of @@ -207,25 +220,31 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install -The following new services were added since the last release: - - -brltty -marathon -tvheadend - - - - Other notable improvements: + The nixos and nixpkgs channels were unified, so one can use nix-env -iA nixos.bash instead of nix-env -iA nixos.pkgs.bash. See the commit for details. + + + + Users running an SSH server who worry about the quality of their + /etc/ssh/moduli file with respect to the + vulnerabilities + discovered in the Diffie-Hellman key exchange can now + replace OpenSSH's default version with one they generated + themselves using the new + services.openssh.moduliFile option. + + + + -- GitLab From 1c1a6b39db8a304a3f195a03b42be4a21965d138 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 18 Sep 2015 16:43:58 +0200 Subject: [PATCH 074/553] deis: init at 1.10.0 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4a8fb9d46c..1336a8e705b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -812,6 +812,8 @@ let ddate = callPackage ../tools/misc/ddate { }; + deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; + dfilemanager = callPackage ../applications/misc/dfilemanager { }; diagrams-builder = callPackage ../tools/graphics/diagrams-builder { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6264a6fb4fa..7c2ea7d966a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -490,6 +490,20 @@ let }; }; + deis = buildFromGitHub { + rev = "v1.10.0"; + owner = "deis"; + repo = "deis"; + sha256 = "0qji0dcfqgvjrfn5fjagjib606n24iy9qank2ckh202s75rxx5w9"; + subPackages = [ "client" ]; + buildInputs = [ docopt-go crypto yaml-v2 ]; + postInstall = '' + if [ -f "$bin/bin/client" ]; then + mv "$bin/bin/client" "$bin/bin/deis" + fi + ''; + }; + dns = buildFromGitHub { rev = "e59f851c912767b1db587dcabee6e6652e495c75"; date = "2015-07-22"; -- GitLab From a40edcb1ba227a1a512955c4ab8924aa47ccbb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Sep 2015 11:27:41 +0200 Subject: [PATCH 075/553] noto-fonts-emoji: fixup chrooted build http://hydra.nixos.org/build/26141137 /cc #9949 and maintainer @mathnerd314. --- pkgs/data/fonts/noto-fonts/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index a231d3b93c1..bb07596ab97 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -96,7 +96,16 @@ rec { sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2"; }; - buildInputs = [ optipng cairo fontforge pythonPackages.nototools pythonPackages.fonttools pkgconfig ]; + buildInputs = with pythonPackages; [ + optipng cairo fontforge python nototools fonttools pkgconfig + ]; + + #FIXME: perhaps use our pngquant instead + preConfigure = '' + for f in ./*.py ./third_party/pngquant/configure; do + patchShebangs "$f" + done + ''; preBuild = '' export PYTHONPATH=$PYTHONPATH:$PWD @@ -116,4 +125,4 @@ rec { maintainers = with maintainers; [ mathnerd314 ]; }; }; -} \ No newline at end of file +} -- GitLab From 6d42b79b29d7ecd98a942d46bcf362692d1e43c6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Sep 2015 16:14:27 +0200 Subject: [PATCH 076/553] m2crypto: Use SWIG 2 Fixes "AttributeError: 'module' object has no attribute 'PKCS5_SALT_LEN'". Fixes #9457. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b08a4f3a6f2..6a71684c06b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7979,7 +7979,7 @@ let md5 = "f93d8462ff7646397a9f77a2fe602d17"; }; - buildInputs = with self; [ pkgs.swig pkgs.openssl ]; + buildInputs = with self; [ pkgs.swig2 pkgs.openssl ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; -- GitLab From ee7df6a5667ee64b1ba68ec8af57d05b85e1bbb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Sep 2015 08:55:32 +0200 Subject: [PATCH 077/553] dub: 0.9.23 -> 0.9.24 Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency (I can find no reference to it in either the source or the resulting binary). --- .../tools/build-managers/dub/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index d92cca88d5f..5394829a830 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, curl, dmd, gcc, unzip }: +{ stdenv, fetchFromGitHub, curl, dmd, gcc }: +let version = "0.9.24"; in stdenv.mkDerivation { - name = "dub-0.9.23"; + name = "dub-${version}"; - src = fetchurl { - url = "https://github.com/D-Programming-Language/dub/archive/v0.9.23.tar.gz"; - sha256 = "7ecbce89c0e48b43705d7c48003394f383556f33562c4b5d884a786cd85814d1"; + src = fetchFromGitHub { + sha256 = "1j2cs2mvaj6bjjicabq6lh97nx0v4b2k6pj4cmywki7hf3i1p8yy"; + rev = "v${version}"; + repo = "dub"; + owner = "D-Programming-Language"; }; - buildInputs = [ unzip curl ]; - + buildInputs = [ curl ]; propagatedBuildInputs = [ gcc dmd ]; buildPhase = '' @@ -26,9 +28,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { + inherit version; description = "Build tool for D projects"; homepage = http://code.dlang.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; platforms = platforms.unix; }; } -- GitLab From 1339183279b880e4b8a170cfa48352c3cedc8ea5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Sep 2015 09:24:32 +0200 Subject: [PATCH 078/553] libchamplain 0.12.10 -> 0.12.11 --- .../development/libraries/libchamplain/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index f0b4a1064fe..c964801f300 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,21 +1,23 @@ { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite , clutter_gtk, libsoup /*, libmemphis */ }: +let version = "0.12.11"; in stdenv.mkDerivation rec { - name = "libchamplain-0.12.10"; + name = "libchamplain-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libchamplain/0.12/${name}.tar.xz"; - sha256 = "019b8scnx7d3wdylmpk9ihzh06w25b63x9cn8nhj6kjx82rcwlxz"; + url = "mirror://gnome/sources/libchamplain/0.12/libchamplain-${version}.tar.xz"; + sha256 = "19aadn4lh6mzpz2qzi5l1qcbi11a57qqv1zxp2n10z4nin4287l5"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; - meta = { + meta = with stdenv.lib; { + inherit version; homepage = http://projects.gnome.org/libchamplain/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; @@ -28,6 +30,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = platforms.gnu; # arbitrary choice }; } -- GitLab From 9cfb5924e821a7d31743555bdbb0f6e56edc62b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Sep 2015 09:26:54 +0200 Subject: [PATCH 079/553] perlPackages.Email-Address: 1.901 -> 1.908 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d73f8210941..40211797571 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3739,10 +3739,10 @@ let self = _self // overrides; _self = with self; { }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.901"; + name = "Email-Address-1.908"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.901.tar.gz; - sha256 = "00svsmv2hk35ybpd7jxcsn7k54i0q9ph5lf8ksv9nkh1abraprkz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz; + sha256 = "0i6ljdvpy279hpbqf6lgv4figr376rb2sh4yphj86xkdzsyn1y75"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; -- GitLab From f6f8b2da89e6ea12b2b47b3ae2f889d713fcda9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Sep 2015 09:29:07 +0200 Subject: [PATCH 080/553] perlPackages.IO-Socket-SSL: 2.016 -> 2.020 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40211797571..fdbe7f3e7bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5621,10 +5621,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage { - name = "IO-Socket-SSL-2.016"; + name = "IO-Socket-SSL-2.020"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.016.tar.gz; - sha256 = "0hgyggdbw16nm85fds48m79lxy5318panqhpkh7r192jq6rnhqlk"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.020.tar.gz; + sha256 = "1nqjwnyd8iy0whisa352a97ihxw2zc78cmbxa0ccs4547bljr3js"; }; propagatedBuildInputs = [ URI NetSSLeay ]; meta = { -- GitLab From 43fba1d1ebc0d8fe3d44c051bba26aa33ebec59e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Sep 2015 19:34:57 +0200 Subject: [PATCH 081/553] Revert "miniupnpc: 1.9.20150703 -> 1.9.20150917" It breaks most of http://hydra.nixos.org/eval/1221398. This reverts commit 71481159a5f1aeddd88fff735d1caf1b6194d0d6. --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 6cc841bc837..8e0890ea471 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.9.20150917"; + name = "miniupnpc-1.9.20150730"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1nhiixfmlagcv9srni19r95n1v069rlq98fn8x4xpsf154lw71rh"; + sha256 = "0156hssql8iaziwba8ag7y39lchrgwcvlhck2d2qak1vznqzlr0x"; name = "${name}.tar.gz"; }; -- GitLab From b038770579fb0d70525d592fcd52533a05bc329e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Sep 2015 11:33:30 -0700 Subject: [PATCH 082/553] btrfsProgs: 4.2.0 -> 4.2.1 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index b217b43524b..d0fac3c93c9 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.2"; in +let version = "4.2.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1glglnglwz1rz6zy54xwdm601n5csbd1g73lx0rz8ay5jhz3q8r5"; + sha256 = "1nzyyfj84q98n7lf798k6695pbsd02hg2ffd1kgn8g3qcbwqhwar"; }; buildInputs = [ -- GitLab From b49e2945f0f78d4d0308f02c6d197dd9d21bcbf9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Sep 2015 11:49:24 -0700 Subject: [PATCH 083/553] libqb: 0.17.1 -> 0.17.2 --- pkgs/development/libraries/libqb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index a0050daec34..809a855835d 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec{ - name = "libqb-0.17.1"; + name = "libqb-0.17.2"; src = fetchurl { url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; - sha256 = "0a9fy4hb6ixs875fbqw77dfj7519ixg27vg4yajyl87y7gw1a8bs"; + sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { homepage = https://github.com/clusterlabs/libqb; -- GitLab From 71d98332e9f17d92b56841ba8f938f77b1c5a3a1 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 21 Sep 2015 12:17:03 -0700 Subject: [PATCH 084/553] make emacs buildable --- pkgs/applications/editors/emacs-24/default.nix | 8 +++++++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 6c52a899108..957ec33a5f4 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm +, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 @@ -49,6 +49,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc + ]; + + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin + "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; + configureFlags = if stdenv.isDarwin then [ "--with-ns" "--disable-ns-self-contained" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44c6b697fbd..8f683d48b3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11006,6 +11006,8 @@ let imagemagick = null; acl = null; gpm = null; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + inherit (darwin) libobjc; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { -- GitLab From 2d464f75ed46869b5942c4b479772a0367b30608 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 21 Sep 2015 12:17:16 -0700 Subject: [PATCH 085/553] give libuv real libtool --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 5ef7b3e6a27..8052f0bc731 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoconf, automake, realLibtool, pkgconfig , ApplicationServices, CoreServices }: @@ -61,7 +61,7 @@ let mkWithAutotools = stability: version: sha256: stdenv.mkDerivation { name = mkName stability version; src = mkSrc version sha256; - buildInputs = [ automake autoconf libtool pkgconfig ] + buildInputs = [ automake autoconf realLibtool pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh -- GitLab From 5493dccfbb28fb78058e821945a683ce8afe37c7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 21 Sep 2015 09:38:38 +0200 Subject: [PATCH 086/553] metis-prover: init at 2.3 --- .../science/logic/metis-prover/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/science/logic/metis-prover/default.nix diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix new file mode 100644 index 00000000000..0aa3d6e51c3 --- /dev/null +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, mlton }: + +stdenv.mkDerivation rec { + name = "metis-prover-${version}"; + version = "2.3"; + + src = fetchurl { + url = "http://www.gilith.com/software/metis/metis.tar.gz"; + sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ mlton ]; + + patchPhase = "patchShebangs scripts/mlpp"; + + buildPhase = "make mlton"; + + installPhase = '' + install -Dm0755 bin/mlton/metis $out/bin/metis + ''; + + meta = with stdenv.lib; { + description = "Automatic theorem prover for first-order logic with equality"; + homepage = http://www.gilith.com/research/metis/; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 918bb4d4c05..fdc8a87e1df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14345,6 +14345,8 @@ let ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre; }); + metis-prover = callPackage ../applications/science/logic/metis-prover { }; + minisat = callPackage ../applications/science/logic/minisat {}; opensmt = callPackage ../applications/science/logic/opensmt { }; -- GitLab From 030fa33958461a153411fc236594201a99df21fd Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 21 Sep 2015 23:01:11 +0300 Subject: [PATCH 087/553] vimPlugins: 2015-09-21 update --- pkgs/misc/vim-plugins/default.nix | 89 +++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e9c27629df7..4d25b5b73b2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -85,7 +85,6 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -164,11 +163,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-09-15"; + name = "Syntastic-2015-09-21"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "8164240f6f0aaed2055dae45fc0e5c6f6ec30b3d"; - sha256 = "51d5d2eb9f1f66784cd85742ebbeb3585835b5c87ddeb64cad21f81d32d262fd"; + rev = "d73d7601ccb79ac94447b3c661ed5de2801d3977"; + sha256 = "64a03f457d008d66ec913296b15bd5590cca9bf339ac149af42318e99157a8d0"; }; dependencies = []; @@ -208,22 +207,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-09-12"; + name = "The_NERD_tree-2015-09-18"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "8c7534bc9e1d0c2f18bf94c1440c4ae6b102b5d6"; - sha256 = "dc71561fed68facebeb4162c909afefbb1f415908e2402f98fa500893b193833"; + rev = "0b44415a3302030b56755cc1135ca9ca57dc1ada"; + sha256 = "7841683821e41b65e4aff9222639a43f05d7b24c874b309f1cc3e6407e09343f"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-09-15"; + name = "UltiSnips-2015-09-20"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "ef2c0d6d80d7903bfed4fa0c3a7fe5af5fd0ce55"; - sha256 = "e6d782830c0465af6f23b96c42c59b0f5eb1bd41376dcae008d0ad54981ce182"; + rev = "e1e005a810edc7b1c13b5095fe3ab7ce2600b0cb"; + sha256 = "de2fd5d654fc48021325f5373ca5be741d105a191ba47ad1c5333046a615b745"; }; dependencies = []; @@ -334,11 +333,11 @@ rec { }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-08-05"; + name = "ghcmod-2015-09-17"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "ff8fe7d64d0db35be9a753e2c2a289760ab02dd5"; - sha256 = "db5a932e4604bed9d4a7d6ff06367f9cae93a87424fc79d2fade7c15061ab563"; + rev = "3e012a5b0b904c5c32eeea39071534d492a64a0f"; + sha256 = "e35c4528d08efb85c68fd4faa19283d67f936d915cae780de0cae0cc53131500"; }; dependencies = []; @@ -366,17 +365,6 @@ rec { }; - lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2013-12-27"; - src = fetchgit { - url = "git://github.com/bitc/lushtags"; - rev = "429fab3b748ae04ee5de0cbf75d947f15441e798"; - sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7"; - }; - dependencies = []; - - }; - vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hdevtools-2012-12-29"; src = fetchgit { @@ -411,11 +399,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-08-28"; + name = "neco-ghc-2015-09-20"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "21ba0eba8f9a9787b69c21c45dd286f927220d71"; - sha256 = "62c17fafd98dd1e6357c5c459a38cec2cb622eaad69ab2e8eb5caf2ea593f37b"; + rev = "c5b47167b29ad5887332567edc655433d32642bd"; + sha256 = "c8e7a746cb4b2faba15dd11a6c9da5c478612cd2ec4af221ea20f37c230884d2"; }; dependencies = []; @@ -601,6 +589,17 @@ rec { buildInputs = [ xkb_switch ]; }; + lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "lushtags-2015-06-06"; + src = fetchgit { + url = "git://github.com/mkasa/lushtags"; + rev = "3d7229b07b47ab2fc188d7db63b33dfcd63a1802"; + sha256 = "f5b6eb7b53a5202d0e55c57d6f4fd7b274dfb4224d8d94c91b708096b4fc07b9"; + }; + dependencies = []; + + }; + vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-stylish-haskell-2015-05-10"; src = fetchgit { @@ -635,11 +634,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-09-14"; + name = "racer-2015-09-18"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "89db6bbca107f8e2cf19d3e5f3fac9cdf48fd7b9"; - sha256 = "db11ea7e9f71bec60f6dba8ca4c460a98c2b9cc6490ac467280bfea493965f4c"; + rev = "b9750c373adf75fc28700bce382761ad85a8a2bd"; + sha256 = "a2f2ca5106a0c30ee8e724291559f0f26729ede545ac7b9be3ee973face24444"; }; dependencies = []; buildPhase = '' @@ -682,22 +681,22 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2015-09-15"; + name = "unite-vim-2015-09-17"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "771f33c201d85602a225045553720d2659bd04e5"; - sha256 = "ccdde79165ff9dd1c1df1a55b2434b8cb59d9b8242c57f0015802c136d5de89b"; + rev = "f24df7733eca3009ee3fac159014aa2001ccadac"; + sha256 = "06f7290cd1e8b1f65f6e6495ac6ac263feed101d804032fd595c0f1b1207ed16"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-09-15"; + name = "vimproc-vim-2015-09-20"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "7190c920c29a3612d9144df4cf9527e016362cef"; - sha256 = "180f6a38959a01014d66470936386c011b0b0cf8e0d84a9d3d2a8362c70454e4"; + rev = "d4939b5bed442e1c30fa9e7f05db0d110b2edce8"; + sha256 = "6e80eae94b3e81951273a44677cfc03bfdeaaefab3ea13e76b1b79eaeb42b03e"; }; dependencies = []; buildInputs = [ which ]; @@ -777,11 +776,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-09-16"; + name = "youcompleteme-2015-09-21"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "61a5a9b84b8c0c993d63c20c8698b42db4365f60"; - sha256 = "1adad2e9e21999b4412e613df4861d757712af8650cbb4110d5d374fe249a60e"; + rev = "2816559ee465860a8a5502b7a1d551bdb46d1b24"; + sha256 = "e7b258efd3fcd93dbfa9e326ace5c1ab01cbe868993e2817ab36eba605595a9d"; }; dependencies = []; buildInputs = [ @@ -961,11 +960,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2014-11-06"; + name = "pathogen-2015-09-20"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; - sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7"; + rev = "b4174e4d1a16e7f0c5c6dfca923269a20a9f50c2"; + sha256 = "703a1d3022cdb03d3d14fbba48be119f4bd7d546ba4bd33185bddaa161bbc63e"; }; dependencies = []; @@ -1027,11 +1026,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2015-07-23"; + name = "snipmate-2015-09-18"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "c86c64508a5b0309040429460c3a13fb90ac708e"; - sha256 = "7cd7dfd4230fd9bb75744a376c0e789c6d734e08158ca055a2ada1298b71360e"; + rev = "e2d294b3962acbe7d8333bade2ebdb0ccde06740"; + sha256 = "856149bc5121845e3f3cd24f74d59e9af722a6ebdc0e050a90639704bfe14ee9"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ae7e86bc749..092c11b405c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -24,7 +24,7 @@ "ghcmod" "github:JagaJaga/vim-addon-vim2nix" "github:ap/vim-css-color" -"github:bitc/lushtags" +"github:mkasa/lushtags" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" "github:eagletmt/neco-ghc" -- GitLab From 9a39c2e9434b848175a8763c9d5a5f544603e16d Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 23:47:33 +0200 Subject: [PATCH 088/553] tests/virtualbox: Add a subtest for host USB. Unfortunately, we can't test whether USB is really working, but we can make sure that VirtualBox has access to the USB devices. This is essentially testing #9736, which I haven't yet been able to reproduce though, but it makes sense to test it so it won't happen in future releases. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 1a5a6f7b5bb..728d46d446e 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -389,6 +389,21 @@ in { destroyVM_simple; + sub removeUUIDs { + return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n"; + } + + subtest "host-usb-permissions", sub { + my $userUSB = removeUUIDs vbm("list usbhost"); + print STDERR $userUSB; + my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost"); + print STDERR $rootUSB; + + die "USB host devices differ for root and normal user" + if $userUSB ne $rootUSB; + die "No USB host devices found" if $userUSB =~ //; + }; + subtest "systemd-detect-virt", sub { createVM_detectvirt; vbm("startvm detectvirt"); -- GitLab From 7ab8dde5113fb25d3bd3da2f8feb71098b1f8b6b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 19 Sep 2015 14:53:09 +0200 Subject: [PATCH 089/553] bs1770gain: init at 0.4.7 I've been trying to package this a while ago but found out that apart from the hand-rolled build system a few sources were missing I didn't continue to work on it. This was the WIP expression: https://gist.github.com/aszlig/c271f294410cc5af0f0a Now, since the latest upstream version, the project uses autoconf and automake, which makes it very much painless for us. So now I can watch demoscene videos without getting hearing loss because of volume differences :-) Also, this might be useful for beets as well, in case they're going to move away from using python-audiotools: https://github.com/sampsyo/beets/issues/1342#issuecomment-86807500 Signed-off-by: aszlig --- .../applications/audio/bs1770gain/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/audio/bs1770gain/default.nix diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix new file mode 100644 index 00000000000..db6843f4535 --- /dev/null +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, ffmpeg, sox }: + +stdenv.mkDerivation rec { + name = "bs1770gain-${version}"; + version = "0.4.7"; + + src = fetchurl { + url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; + sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz"; + }; + + buildInputs = [ ffmpeg sox ]; + + meta = { + description = "A audio/video loudness scanner implementing ITU-R BS.1770"; + license = stdenv.lib.licenses.gpl2Plus; + homepage = "http://bs1770gain.sourceforge.net/"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4891ec8d4ba..3990a1f6326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10745,6 +10745,8 @@ let bristol = callPackage ../applications/audio/bristol { }; + bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bspwm = callPackage ../applications/window-managers/bspwm { }; bvi = callPackage ../applications/editors/bvi { }; -- GitLab From 74209a4ca8baedb7bf1b3e3720a9abf132f8c05e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 20 Aug 2015 00:29:20 +0200 Subject: [PATCH 090/553] virtualbox service: add support for vboxsf guest filesystem Closes #9358 Signed-off-by: Jaka Hudoklin Fix reference to bin/mount.vboxsf. Signed-off-by: aszlig --- nixos/modules/module-list.nix | 1 + nixos/modules/tasks/filesystems/vboxsf.nix | 23 +++++++++++++++++++ .../virtualisation/virtualbox-guest.nix | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/tasks/filesystems/vboxsf.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b03f4494522..1d6ddcbe941 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -472,6 +472,7 @@ ./tasks/filesystems/ntfs.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix + ./tasks/filesystems/vboxsf.nix ./tasks/filesystems/vfat.nix ./tasks/filesystems/xfs.nix ./tasks/filesystems/zfs.nix diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix new file mode 100644 index 00000000000..87f1984f084 --- /dev/null +++ b/nixos/modules/tasks/filesystems/vboxsf.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; + + package = pkgs.runCommand "mount.vboxsf" {} '' + mkdir -p $out/bin + cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin + ''; +in + +{ + config = mkIf (any (fs: fs == "vboxsf") config.boot.supportedFilesystems) { + + system.fsPackages = [ package ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "vboxsf" ]; + + }; +} diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 642ea3154b1..a025aee7cfe 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -32,7 +32,8 @@ in boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; - boot.kernelModules = [ "vboxsf" ]; + boot.supportedFilesystems = [ "vboxsf" ]; + boot.initrd.supportedFilesystems = [ "vboxsf" ]; users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; -- GitLab From cd4caed35ae8caf4473b2ac80d826f06e6a2e9e9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 21 Sep 2015 14:34:29 +0200 Subject: [PATCH 091/553] nixos/filesystems: Improve vboxsf default options. The default options for all file systems currently are "defaults.relatime", which works well on file systems which support the relatime option. Unfortunately, this is not the case for the VirtualBox shared folder filesystem, so until now, you need to set something like: fileSystems."/foo" = { device = "foo"; fsType = "vboxsf"; options = "defaults"; }; Otherwise mounting the file system would fail. Now, we provide only the "defaults" option to the "vboxsf" file system, so something like this is enough: fileSystems."/foo" = { device = "foo"; fsType = "vboxsf"; }; An alternative to that could be to document that you need to set default options, but we really should do what users expect instead of forcing them to look up the documentation as to why this has failed. Signed-off-by: aszlig --- nixos/modules/tasks/filesystems.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ce9e3555b6c..cf6abf52cf6 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -69,6 +69,8 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); + # The vboxsf filesystem doesn't support the relatime option: + options = mkIf (config.fsType == "vboxsf") (mkDefault "defaults"); }; }; -- GitLab From f9766f885d74ed5f54f38acdde590d1ac977e4c5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 21 Sep 2015 14:43:05 +0200 Subject: [PATCH 092/553] nixos/filesystems: Skip check for vboxsf. We don't even have any means to check a VirtualBox shared folder, so let's not even try to. Signed-off-by: aszlig --- nixos/modules/tasks/filesystems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index cf6abf52cf6..4409bd4cc8c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -143,7 +143,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" ]; + fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; in '' # This is a generated file. Do not edit! -- GitLab From 2ed22e3a886b88970ba6812e49aeda5e33b699ed Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 14 Sep 2015 19:39:32 +0100 Subject: [PATCH 093/553] tomahawk: 0.8.3 -> 0.8.4 From the Changelog: * Fixed drag & drop issues on sidebar. * Fixed starting Tomahawk with a filename as parameter. * Update column view when collection changes. * (Linux) Don't crash on environments with invalid locales. Signed-off-by: devhell <"^"@regexmail.net> Closes: #9858 Tested-by: aszlig Tested-by: David Kleuker --- pkgs/applications/audio/tomahawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 6e03bcb27fc..32d5f1aa13e 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -15,11 +15,11 @@ let quazipQt4 = quazip.override { qt = qt4; }; in stdenv.mkDerivation rec { name = "tomahawk-${version}"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { url = "http://download.tomahawk-player.org/${name}.tar.bz2"; - sha256 = "0kjzkq21g3jl1lvadsm7gf0zvpbsv208kqf76wg2hnbm4k1a02wj"; + sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; }; cmakeFlags = [ -- GitLab From ccad6ae08220b9f14f6f3e895a0580e35a4caf60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Sep 2015 10:30:49 +0200 Subject: [PATCH 094/553] This update was generated by hackage2nix v20150903-88-gd09c4dd using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/2201da64fa3fb5b06258f84d8e2dd9ac6fbb3957 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/c7012a704b558556ca067861eb156f9916aa2afb - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/affe30844adaa97901043ccbc2f196122bee8fbb --- .../haskell-modules/configuration-lts-0.0.nix | 2 + .../haskell-modules/configuration-lts-0.1.nix | 2 + .../haskell-modules/configuration-lts-0.2.nix | 2 + .../haskell-modules/configuration-lts-0.3.nix | 2 + .../haskell-modules/configuration-lts-0.4.nix | 2 + .../haskell-modules/configuration-lts-0.5.nix | 2 + .../haskell-modules/configuration-lts-0.6.nix | 2 + .../haskell-modules/configuration-lts-0.7.nix | 2 + .../haskell-modules/configuration-lts-1.0.nix | 2 + .../haskell-modules/configuration-lts-1.1.nix | 2 + .../configuration-lts-1.10.nix | 2 + .../configuration-lts-1.11.nix | 2 + .../configuration-lts-1.12.nix | 2 + .../configuration-lts-1.13.nix | 2 + .../configuration-lts-1.14.nix | 2 + .../configuration-lts-1.15.nix | 2 + .../haskell-modules/configuration-lts-1.2.nix | 2 + .../haskell-modules/configuration-lts-1.4.nix | 2 + .../haskell-modules/configuration-lts-1.5.nix | 2 + .../haskell-modules/configuration-lts-1.7.nix | 2 + .../haskell-modules/configuration-lts-1.8.nix | 2 + .../haskell-modules/configuration-lts-1.9.nix | 2 + .../haskell-modules/configuration-lts-2.0.nix | 2 + .../haskell-modules/configuration-lts-2.1.nix | 2 + .../configuration-lts-2.10.nix | 2 + .../configuration-lts-2.11.nix | 2 + .../configuration-lts-2.12.nix | 2 + .../configuration-lts-2.13.nix | 2 + .../configuration-lts-2.14.nix | 2 + .../configuration-lts-2.15.nix | 2 + .../configuration-lts-2.16.nix | 2 + .../configuration-lts-2.17.nix | 2 + .../configuration-lts-2.18.nix | 2 + .../configuration-lts-2.19.nix | 2 + .../haskell-modules/configuration-lts-2.2.nix | 2 + .../configuration-lts-2.20.nix | 2 + .../configuration-lts-2.21.nix | 2 + .../configuration-lts-2.22.nix | 2 + .../haskell-modules/configuration-lts-2.3.nix | 2 + .../haskell-modules/configuration-lts-2.4.nix | 2 + .../haskell-modules/configuration-lts-2.5.nix | 2 + .../haskell-modules/configuration-lts-2.6.nix | 2 + .../haskell-modules/configuration-lts-2.7.nix | 2 + .../haskell-modules/configuration-lts-2.8.nix | 2 + .../haskell-modules/configuration-lts-2.9.nix | 2 + .../haskell-modules/configuration-lts-3.0.nix | 2 + .../haskell-modules/configuration-lts-3.1.nix | 2 + .../haskell-modules/configuration-lts-3.2.nix | 2 + .../haskell-modules/configuration-lts-3.3.nix | 2 + .../haskell-modules/configuration-lts-3.4.nix | 2 + .../haskell-modules/configuration-lts-3.5.nix | 2 + .../haskell-modules/configuration-lts-3.6.nix | 7499 +++++++++++++++++ .../haskell-modules/hackage-packages.nix | 851 +- 53 files changed, 8336 insertions(+), 116 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.6.nix diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index f423ae84bf0..8b0ceb9717f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -6418,6 +6418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8340,6 +8341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 1f1be15ac17..99879cbd557 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -6417,6 +6417,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8339,6 +8340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 15c9da959f1..3149f9a08ef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -6417,6 +6417,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8339,6 +8340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 10ba28eef40..26571eeadf5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -6417,6 +6417,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8339,6 +8340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 9fffe27fe4c..b62ce01da66 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -6414,6 +6414,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8334,6 +8335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_6_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 83e5cd24db0..caeebcd75f0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -6414,6 +6414,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8333,6 +8334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 3e8c7342f3a..2d17266f60f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -6409,6 +6409,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8325,6 +8326,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 4e96d1faf3c..92ed35fbaf5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -6409,6 +6409,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8325,6 +8326,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 9e1e237c3bf..e1c379f6846 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -6389,6 +6389,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8302,6 +8303,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 513b58ad44b..cc5079dbdf6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -6375,6 +6375,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8282,6 +8283,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_3"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 4ef9bdbbf4f..9ea6b092e5f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -6341,6 +6341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8235,6 +8236,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_10"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 8bb273f88e6..1a2be620a02 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -6336,6 +6336,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8229,6 +8230,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_4"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index a24d72a38e6..504fa4d85c1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -6335,6 +6335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8226,6 +8227,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 13827243cb1..985207bf981 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -6332,6 +6332,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8222,6 +8223,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 977350175cc..dc08f47f1db 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -6324,6 +6324,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8213,6 +8214,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8_3"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 71ed124fe32..aebbecfc99b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -6313,6 +6313,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8198,6 +8199,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 44d33682d2f..f4b0a609e18 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -6370,6 +6370,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8275,6 +8276,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_3"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 4240e9a2697..6deed8d4e6e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -6363,6 +6363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8267,6 +8268,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_4"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index d59d97ff233..fe4cb3bc54d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -6361,6 +6361,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8263,6 +8264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_4"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 02faeb84ae5..b03d4ff5482 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -6354,6 +6354,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8256,6 +8257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_5"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 453fa00c053..059a9271d64 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -6349,6 +6349,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8250,6 +8251,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_6"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 7def4be5548..9c0fdf8b87e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -6345,6 +6345,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8246,6 +8247,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_7"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_8_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index eff80738a2a..5bb19f53750 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -6240,6 +6240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8108,6 +8109,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_6"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 5424c2dae6d..1ab7bcd7883 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -6238,6 +6238,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8105,6 +8106,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_6"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 1e984a2feb8..c83d0971755 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -6180,6 +6180,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8024,6 +8025,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 1acae55174b..f0b252c9c58 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -6171,6 +6171,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8010,6 +8011,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index acf3289d5f5..7254bc9fc22 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -6171,6 +6171,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8009,6 +8010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 967b99e9a24..27a7143b618 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -6168,6 +6168,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8005,6 +8006,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_10"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 993c0b08433..6ec8ae7a2d0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -6163,6 +6163,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7996,6 +7997,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_11"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index c232fc7388b..a22a17aabfe 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -6156,6 +6156,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7988,6 +7989,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_10"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_11"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 3d9f8647754..1afb1a85d25 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -6143,6 +6143,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7973,6 +7974,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_10"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_11"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 42ba9aee048..4866458215e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -6132,6 +6132,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7959,6 +7960,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_11"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 18bb88b135f..4d4f057cd77 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -6121,6 +6121,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7945,6 +7946,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_11"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index d1f8663af2c..b8c71d52fab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -6117,6 +6117,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7938,6 +7939,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_11"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 2c12e7fd327..931739dc069 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -6233,6 +6233,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8099,6 +8100,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 21124a4263a..ccf4fde37e0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -6111,6 +6111,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7930,6 +7931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index b3292b94c1e..b4918d0a2ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -6105,6 +6105,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7920,6 +7921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 7bb840a92d7..160d282b8a4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -6101,6 +6101,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7916,6 +7917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 9e75d1731d4..f5371685344 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -6230,6 +6230,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8095,6 +8096,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 1927ea1d5bb..2ad1eafc03c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -6225,6 +6225,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8088,6 +8089,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 6e825963044..ef87cdc0300 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -6222,6 +6222,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8084,6 +8085,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 03ef3a1c493..0f3b0cd07e8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -6214,6 +6214,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8073,6 +8074,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index d8f8f9e8a6b..7b5f7834a3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -6212,6 +6212,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8071,6 +8072,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 139196542ff..f5b7c75b2e9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -6207,6 +6207,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8061,6 +8062,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 0297a978ceb..c0c1a3bf361 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -6194,6 +6194,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -8043,6 +8044,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_1"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 70a38a23c63..ec4bcc7dd06 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -5818,6 +5818,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -7546,6 +7547,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_2"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index b136a8d3c0e..fc4908636a0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -5807,6 +5807,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -7531,6 +7532,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_3"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_13"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 25d45e618e9..7c6047af510 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -5795,6 +5795,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -7509,6 +7510,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-core" = doDistribute super."yesod-core_1_4_14"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index ca1280d6989..3d5a72cd547 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -5779,6 +5779,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -7481,6 +7482,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 8562b83c1dd..5e50f98075f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -5777,6 +5777,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -7475,6 +7476,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index f615543076e..224ad46f41f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -5754,6 +5754,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -7435,6 +7436,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix new file mode 100644 index 00000000000..82abdcfd64c --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -0,0 +1,7499 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: assert super.ghc.name == "ghc-7.10.2"; { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.6 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "LibZip" = dontDistribute super."LibZip"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-orphans" = dontDistribute super."binary-orphans"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = dontDistribute super."binary-tagged"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-handle" = dontDistribute super."bytestring-handle"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-log" = dontDistribute super."canteven-log"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consumers" = dontDistribute super."consumers"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "envy" = dontDistribute super."envy"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "forth-hll" = dontDistribute super."forth-hll"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friendly-time" = dontDistribute super."friendly-time"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; + "generic-xml" = dontDistribute super."generic-xml"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geocalc" = dontDistribute super."geocalc"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "httpd-shed" = dontDistribute super."httpd-shed"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcpi" = dontDistribute super."mcpi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "number" = dontDistribute super."number"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "open-browser" = dontDistribute super."open-browser"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parseerror-eq" = dontDistribute super."parseerror-eq"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plivo" = dontDistribute super."plivo"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-example" = dontDistribute super."rest-example"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s3-signer" = dontDistribute super."s3-signer"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-prism" = dontDistribute super."stack-prism"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = dontDistribute super."twitter-conduit"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-types" = dontDistribute super."twitter-types"; + "twitter-types-lens" = dontDistribute super."twitter-types-lens"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-aligned" = dontDistribute super."type-aligned"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verilog" = dontDistribute super."verilog"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b77293806ac..ef4755cc206 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11613,8 +11613,8 @@ self: { }: mkDerivation { pname = "MFlow"; - version = "0.4.5.10"; - sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4"; + version = "0.4.6.0"; + sha256 = "4e93f7488152d88359fd100a742c2ea96788284d262f3cd1b50d936f80f1a342"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -11628,31 +11628,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "MFlow_0_4_5_13" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , case-insensitive, clientsession, conduit, conduit-extra - , containers, directory, extensible-exceptions, http-types - , monadloc, mtl, old-time, parsec, pwstore-fast, random - , RefSerialize, resourcet, stm, TCache, text, time, transformers - , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow - }: - mkDerivation { - pname = "MFlow"; - version = "0.4.5.13"; - sha256 = "cd0664d1ca4f447537a4a1f82cc5ab0f5793a8e48c0027e642b48bafa4b77415"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring case-insensitive - clientsession conduit conduit-extra containers directory - extensible-exceptions http-types monadloc mtl old-time parsec - pwstore-fast random RefSerialize resourcet stm TCache text time - transformers utf8-string vector wai wai-extra warp warp-tls - Workflow - ]; - description = "stateful, RESTful web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MHask" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -14123,8 +14098,8 @@ self: { ({ mkDerivation, alsaLib, base }: mkDerivation { pname = "PortMidi"; - version = "0.1.4"; - sha256 = "156183c88fb3c9c6564efac445df51bba2a1d78fa73ed47c530759d510108403"; + version = "0.1.5.1"; + sha256 = "77c49d3084210b0dabdd04b3d3ad9003964a710ba41ac9a9ddf472aa20b80cda"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; homepage = "http://haskell.org/haskellwiki/PortMidi"; @@ -26918,6 +26893,36 @@ self: { license = "GPL"; }) {inherit (pkgs.xlibs) libXScrnSaver;}; + "arbtt_0_9_0_7" = callPackage + ({ mkDerivation, aeson, array, base, binary, bytestring + , bytestring-progress, containers, deepseq, directory, filepath + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 + }: + mkDerivation { + pname = "arbtt"; + version = "0.9.0.7"; + sha256 = "3a588f9228533df6233877a6be2612f4d4cb1adc2e2e190d9fb0cf46772ccba5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bytestring bytestring-progress containers + deepseq directory filepath parsec pcre-light strict + terminal-progress-bar time transformers unix utf8-string X11 + ]; + executableSystemDepends = [ libXScrnSaver ]; + testHaskellDepends = [ + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string + ]; + homepage = "http://arbtt.nomeata.de/"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xlibs) libXScrnSaver;}; + "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty @@ -27702,6 +27707,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asn1-encoding_0_9_3" = callPackage + ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl + , tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "asn1-encoding"; + version = "0.9.3"; + sha256 = "90d7e05806977e683a468a4112270c9745c07f52452915db6a8fb19b752d7106"; + libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; + testHaskellDepends = [ + asn1-types base bytestring hourglass mtl tasty tasty-quickcheck + text + ]; + homepage = "http://github.com/vincenthz/hs-asn1"; + description = "ASN1 data reader and writer in RAW, BER and DER forms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asn1-parse_0_9_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, mtl , text @@ -27734,6 +27758,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asn1-parse_0_9_3" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: + mkDerivation { + pname = "asn1-parse"; + version = "0.9.3"; + sha256 = "b06a3a1d642cb55844841a68a98ffc92dbf94fbc9b126d177725b537bef5dca4"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytestring + ]; + homepage = "https://github.com/vincenthz/hs-asn1"; + description = "Simple monadic parser for ASN1 stream types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asn1-types" = callPackage ({ mkDerivation, base, bytestring, hourglass }: mkDerivation { @@ -27746,6 +27785,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asn1-types_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, hourglass, memory }: + mkDerivation { + pname = "asn1-types"; + version = "0.3.1"; + sha256 = "4ae6d47503a0ebf40584ea9d733eb572ac2dd607556dff1211b25602b34f2ec6"; + libraryHaskellDepends = [ base bytestring hourglass memory ]; + homepage = "http://github.com/vincenthz/hs-asn1-types"; + description = "ASN.1 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asn1dump" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, pem }: @@ -28154,25 +28206,25 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, containers - , data-default, exceptions, hlint, lens, mono-traversable - , network-uri, parsers, quickcheck-instances, resourcet, tasty - , tasty-hunit, tasty-quickcheck, text, time, timerep, xml-conduit - , xml-conduit-parse, xml-types + ({ mkDerivation, base, conduit, conduit-parse, data-default + , exceptions, foldl, hlint, lens, mono-traversable, parsers + , quickcheck-instances, resourcet, tasty, tasty-hunit + , tasty-quickcheck, text, time, timerep, total, uri-bytestring + , xml-conduit, xml-conduit-parse, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.1.0.0"; - sha256 = "53aa8894628f83c3542f7eff4c90abbac82f5fa98151f67e703aa86706380dca"; + version = "0.2.0.0"; + sha256 = "3dc3d6b784ebb2dc6a8cfc901f4c75351de5254efb6d12c6242d2cd5605e780e"; libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions lens - mono-traversable network-uri parsers text time timerep xml-conduit + base conduit conduit-parse exceptions foldl lens mono-traversable + parsers text time timerep total uri-bytestring xml-conduit xml-conduit-parse xml-types ]; testHaskellDepends = [ base conduit conduit-parse data-default exceptions hlint lens - mono-traversable network-uri parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time xml-conduit + mono-traversable parsers quickcheck-instances resourcet tasty + tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-conduit-parse xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; @@ -41301,6 +41353,33 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-ghc_0_5_15" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, directory, filepath, ghc, ghc-typelits-natnormalise + , hashable, haskeline, lens, mtl, process, text, transformers + , unbound-generics, unix, unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.5.15"; + sha256 = "54799a12bd0a01e0a1814caef51504301c843c4f745b7110a3542cc6043215e3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers directory + filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl + process text transformers unbound-generics unix + unordered-containers + ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-lib_0_5_10" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl @@ -41369,6 +41448,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-lib_0_5_13" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.5.13"; + sha256 = "d2440a3f0ff9df8b4b2b374b8c934da1c90cd9e57ed74aea3b682a99c84fd579"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath hashable lens mtl + pretty process template-haskell text time transformers + unbound-generics unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck @@ -41378,6 +41480,8 @@ self: { pname = "clash-prelude"; version = "0.9.2"; sha256 = "11f8997503a00452e543d1bcb3d984bc79332cde5b30f1782bafec8b572d87be"; + revision = "1"; + editedCabalFile = "c2165cbe11e6b0e0acadbe0a6e822c1df9a4b12bf2825831badbc5dae9bba65a"; libraryHaskellDepends = [ array base data-default ghc-prim ghc-typelits-natnormalise integer-gmp lens QuickCheck singletons template-haskell th-lift @@ -41388,6 +41492,26 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-prelude_0_9_3" = callPackage + ({ mkDerivation, array, base, data-default, doctest, ghc-prim + , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck + , singletons, template-haskell, th-lift + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.9.3"; + sha256 = "3cfcc4aa822a251dc2ea2e31e2bf3c15a37fe63ec859ea16aaa0fe3f31913315"; + libraryHaskellDepends = [ + array base data-default ghc-prim ghc-typelits-natnormalise + integer-gmp lens QuickCheck singletons template-haskell th-lift + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -41454,6 +41578,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-systemverilog_0_5_10" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.5.10"; + sha256 = "511310bdf943ecd2b1aeb87e22474e4a1bd9a4c6e881c8ba0733c6a097ae3e35"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-verilog_0_5_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -41507,6 +41649,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-verilog_0_5_10" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.5.10"; + sha256 = "1a6ad070087a464a4eed05f8bc30cd92d000d8c02be33cbef08f973e9624bb03"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-vhdl_0_5_8" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -41560,6 +41720,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-vhdl_0_5_12" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.5.12"; + sha256 = "fe91d7635fb1278ee99c757ac0dc1965b04ec37a91db115d85692cf5a166d511"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classify" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -43157,14 +43335,11 @@ self: { }: mkDerivation { pname = "cndict"; - version = "0.6.1"; - sha256 = "58cf673862f92eebacae959624b2f1b1694e69ae5af076201bde6c0e59b0205e"; - revision = "1"; - editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468"; + version = "0.6.2"; + sha256 = "13a3e38affeb1d86ddec1364e2e88152777946d863b594deb02b2cfd237246c0"; libraryHaskellDepends = [ base binary bytestring cassava containers file-embed text vector ]; - jailbreak = true; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; @@ -47391,6 +47566,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "country-codes_0_1_3" = callPackage + ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup + , text + }: + mkDerivation { + pname = "country-codes"; + version = "0.1.3"; + sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base shakespeare text ]; + executableHaskellDepends = [ base tagsoup text ]; + testHaskellDepends = [ aeson base HTF HUnit ]; + homepage = "https://github.com/prowdsponsor/country-codes"; + description = "ISO 3166 country codes and i18n names"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "courier_0_1_0_15" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , directory, hslogger, HUnit, network, stm, test-framework @@ -56511,8 +56705,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.7.0.1"; - sha256 = "aa5e39896fe48ba067ad5c02213ada4dfbb5f089bb4d2338b58da4b95a56458b"; + version = "0.7.0.3"; + sha256 = "a9d977cfd093038d6df942df959e7f913298a8f18068ebf88380f4d8c6a9163b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56522,9 +56716,8 @@ self: { executableHaskellDepends = [ base containers fasta optparse-applicative pipes ]; - jailbreak = true; homepage = "https://github.com/GregorySchwartz/diversity"; - description = "Return the diversity at each position for all sequences in a fasta file"; + description = "Return the diversity at each position by default for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -58504,8 +58697,8 @@ self: { }: mkDerivation { pname = "ebnf-bff"; - version = "0.1.0.0"; - sha256 = "1711696ee6ffd8edbb96aff5fef08c5edcfea7fb13260dbcb2b0ced4b93fe218"; + version = "0.1.1.0"; + sha256 = "683ce685b605b83feb795ec3a832e4e83c284ad7daa0bb8cb2a7d9c96bd27d80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base parsec text ]; @@ -62115,8 +62308,8 @@ self: { ({ mkDerivation, base, constraints, singletons }: mkDerivation { pname = "exinst"; - version = "0.1"; - sha256 = "73e32a3d91a7b3d8a9d6b28d560059ab2a5ba49d79dfa0730155b9c0eaf414bf"; + version = "0.1.1"; + sha256 = "ed8e30b2671102878767f275304e10d584b6e6e2e42fb179b5514b54dfc67147"; libraryHaskellDepends = [ base constraints singletons ]; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for your existential types"; @@ -62127,8 +62320,8 @@ self: { ({ mkDerivation, aeson, base, constraints, exinst, singletons }: mkDerivation { pname = "exinst-aeson"; - version = "0.1"; - sha256 = "deb23a10a7f22fe743fb9bb90451e80dcb8d1b365f7a85498e56ef2c31a3a5bf"; + version = "0.1.0.1"; + sha256 = "bc916d6b4c3e6617b1b82e895b8a373f9ee1f2bf7c9b22efb43e8fb616995162"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -62141,8 +62334,8 @@ self: { ({ mkDerivation, base, bytes, constraints, exinst, singletons }: mkDerivation { pname = "exinst-bytes"; - version = "0.1"; - sha256 = "f30b5732cb926726e6d92d0888cbb0dca4f99059b9b321fb5198a0337b106189"; + version = "0.1.0.1"; + sha256 = "5dc66779093560fce4d5c4722615dab2d330d5c29bca4937981b009a391a8e67"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -62167,8 +62360,8 @@ self: { ({ mkDerivation, base, constraints, exinst, hashable, singletons }: mkDerivation { pname = "exinst-hashable"; - version = "0.1"; - sha256 = "c6ac56bd83b3fc47b38114019e0be79784f60ab068f77ead8e70d7308e9c297c"; + version = "0.1.0.1"; + sha256 = "7e76bd3604659dcb861a269362e1311bfe26ac92d5b88d6d6aa8253136c9ba68"; libraryHaskellDepends = [ base constraints exinst hashable singletons ]; @@ -63801,6 +63994,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fb_1_0_12" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, bytestring, cereal, conduit, conduit-extra + , containers, crypto-api, cryptohash, cryptohash-cryptoapi + , data-default, hspec, http-conduit, http-types, HUnit, lifted-base + , monad-control, monad-logger, old-locale, QuickCheck, resourcet + , text, time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "fb"; + version = "1.0.12"; + sha256 = "e59f512c9fed9aa7f8aa0a891ffc06d82141a40a9f47cb5c57caec1d051fc4f6"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + bytestring cereal conduit conduit-extra crypto-api cryptohash + cryptohash-cryptoapi data-default http-conduit http-types + lifted-base monad-control monad-logger old-locale resourcet text + time transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers data-default hspec + http-conduit HUnit lifted-base monad-control QuickCheck resourcet + text time transformers + ]; + jailbreak = true; + homepage = "https://github.com/prowdsponsor/fb"; + description = "Bindings to Facebook's API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fb-persistent_0_3_4" = callPackage ({ mkDerivation, base, cereal, fb, persistent, text, time }: mkDerivation { @@ -66464,6 +66688,7 @@ self: { ]; description = "Attoparsec and foldl-transduce integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds" = callPackage @@ -69752,13 +69977,13 @@ self: { }) {}; "geom2d" = callPackage - ({ mkDerivation, base, ieee754, QuickCheck }: + ({ mkDerivation, base, ieee754, linear, QuickCheck }: mkDerivation { pname = "geom2d"; - version = "0.1.3.1"; - sha256 = "05eeecd84e0440daede4b71addce096addf4b867fb6cfcb708e408e67a63e0cf"; - libraryHaskellDepends = [ base ieee754 QuickCheck ]; - testHaskellDepends = [ base ieee754 QuickCheck ]; + version = "0.2.1"; + sha256 = "c644a0adb3bf02c5ce6681f3002019665fb8c652e61a901c5d03bae72057caca"; + libraryHaskellDepends = [ base ieee754 linear QuickCheck ]; + testHaskellDepends = [ base ieee754 linear QuickCheck ]; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -71039,6 +71264,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gipeda_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , directory, extra, filepath, gitlib, gitlib-libgit2, scientific + , shake, split, tagged, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "gipeda"; + version = "0.2"; + sha256 = "ed227acff488ef7778ee9cc78fa3ec5e10edae19ea8ade79440033e29e83f82e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cassava containers directory extra filepath + gitlib gitlib-libgit2 scientific shake split tagged text + unordered-containers vector yaml + ]; + homepage = "https://github.com/nomeata/gipeda"; + description = "Git Performance Dashboard"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gist" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, http-conduit , text @@ -82631,6 +82878,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-postgres_0_10_6" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , directory, doctest, either, filepath, free, hashable, hashtables + , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude + , old-locale, placeholders, postgresql-binary, postgresql-libpq + , QuickCheck, quickcheck-instances, scientific, template-haskell + , text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql-postgres"; + version = "0.10.6"; + sha256 = "068c8de6696ae07a490e14fe83367fc383f2a6a41b9e64c688938f64bc04ec48"; + libraryHaskellDepends = [ + aeson attoparsec base-prelude bytestring either free hashable + hashtables hasql-backend list-t loch-th mmorph placeholders + postgresql-binary postgresql-libpq scientific template-haskell text + time transformers uuid vector + ]; + testHaskellDepends = [ + aeson base base-prelude bytestring directory doctest either + filepath hashable hasql hasql-backend hspec list-t mtl-prelude + old-locale postgresql-binary QuickCheck quickcheck-instances + scientific text time vector + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-postgres"; + description = "A \"PostgreSQL\" backend for the \"hasql\" library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres-options" = callPackage ({ mkDerivation, base-prelude, hasql-postgres, optparse-applicative }: @@ -83067,6 +83345,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haxr_3000_11_1_2" = callPackage + ({ mkDerivation, array, base, base-compat, base64-bytestring + , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams + , http-types, io-streams, mtl, mtl-compat, network, network-uri + , old-locale, old-time, template-haskell, time, utf8-string + }: + mkDerivation { + pname = "haxr"; + version = "3000.11.1.2"; + sha256 = "a8a63a7d7df20472fa8fd2cdc089155292c16e4da34616180dbb33ba3ca0e436"; + libraryHaskellDepends = [ + array base base-compat base64-bytestring blaze-builder bytestring + HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat + network network-uri old-locale old-time template-haskell time + utf8-string + ]; + homepage = "http://www.haskell.org/haskellwiki/HaXR"; + description = "XML-RPC client and server library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haxr-th" = callPackage ({ mkDerivation, base, haxr, template-haskell }: mkDerivation { @@ -91382,6 +91682,7 @@ self: { tasty-quickcheck ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage @@ -92588,8 +92889,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.0.5"; - sha256 = "8078722fbe719c485cbd2502b83f5eb5ca3b12ae5a0b651a3130a36cc10d1d19"; + version = "0.6.0.6"; + sha256 = "19e0a298d799c72b4bff13a0c08620cd4d49fe47dc4a06b07d8fa2ce310b01d6"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -115632,6 +115933,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mandrill_0_4_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, containers, email-validate, http-client + , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck + , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "mandrill"; + version = "0.4.1.0"; + sha256 = "677f358e4ff991a41baff9e105a96d90849778dfa1ed12b316866e2df4cdb7e6"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring containers + email-validate http-client http-client-tls http-types lens mtl + old-locale QuickCheck text time + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Library for interfacing with the Mandrill JSON API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mandulia" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, GLUT, hslua, time @@ -115691,6 +116016,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mangopay_1_11_5" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, connection, country-codes, data-default + , HTF, http-conduit, http-types, HUnit, lifted-base, monad-control + , monad-logger, resourcet, template-haskell, text, time, tls + , transformers, transformers-base, unordered-containers + , utf8-string, vector, wai, warp, x509-system + }: + mkDerivation { + pname = "mangopay"; + version = "1.11.5"; + sha256 = "514d49768921da81657adbe8b790df25cb2d655c674a09606fa9c91047d4c1ac"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base base16-bytestring base64-bytestring + blaze-builder bytestring case-insensitive conduit conduit-extra + connection country-codes data-default http-conduit http-types HUnit + lifted-base monad-control monad-logger resourcet template-haskell + text time tls transformers transformers-base unordered-containers + utf8-string vector wai warp x509-system + ]; + executableHaskellDepends = [ + aeson base bytestring http-conduit monad-logger text transformers + ]; + testHaskellDepends = [ + aeson async attoparsec base base16-bytestring base64-bytestring + blaze-builder bytestring case-insensitive conduit conduit-extra + connection country-codes data-default HTF http-conduit http-types + HUnit lifted-base monad-control monad-logger resourcet + template-haskell text time tls transformers transformers-base + unordered-containers utf8-string vector wai warp x509-system + ]; + homepage = "https://github.com/prowdsponsor/mangopay"; + description = "Bindings to the MangoPay API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers , deepseq, hmatrix, MemoTrie, semigroups, tagged, transformers @@ -118834,6 +119199,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "moesocks_1_0_0_20" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "moesocks"; + version = "1.0.0.20"; + sha256 = "2f8a388696fb49168f23437a1a3187334ae260e42e235245cdb20afa8efb3ef1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base binary bytestring containers cryptohash + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers + unordered-containers + ]; + homepage = "https://github.com/nfjinjing/moesocks"; + description = "A functional firewall killer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, filepath, html, HTTP, network @@ -123681,27 +124070,43 @@ self: { }) {}; "nested-routes" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , clay, composition, constraints, containers, hspec, hspec-wai - , http-media, http-types, lucid, mtl, poly-arity, pred-trie - , regex-compat, semigroups, shakespeare, text, transformers, wai - , wai-extra, wai-util, warp, witherable + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, blaze-builder, blaze-html, bytestring, clay + , composition, composition-extra, constraints, containers, cookie + , cryptonite, data-default, errors, hspec, hspec-wai, http-media + , http-types, iso8601-time, lucid, memory, mtl, poly-arity + , pred-trie, regex-compat, semigroups, sets, shakespeare, stm, text + , time, transformers, tries, utf8-string, wai, wai-extra + , wai-session, wai-util, warp, witherable }: mkDerivation { pname = "nested-routes"; - version = "3.2.0"; - sha256 = "af87fbccaca05f257e357904645f1f25d1ab2fe2bda00414f7099e741429b20a"; + version = "4.0.0"; + sha256 = "e290b051d0863afd960b9daffc64fdf68696a7aa10013998ec764dd2a70c26fb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring clay composition - constraints containers http-media http-types lucid mtl poly-arity - pred-trie regex-compat semigroups shakespeare text transformers wai - wai-extra wai-util witherable + aeson attoparsec base bifunctors blaze-html bytestring clay + composition composition-extra constraints containers errors + http-media http-types lucid mtl poly-arity pred-trie regex-compat + semigroups sets shakespeare text transformers tries wai wai-extra + wai-util witherable + ]; + executableHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder blaze-html + bytestring clay composition composition-extra constraints + containers cookie cryptonite data-default errors http-media + http-types iso8601-time lucid memory mtl poly-arity pred-trie + regex-compat semigroups sets shakespeare stm text time transformers + tries utf8-string wai wai-extra wai-session wai-util warp + witherable ]; testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring composition constraints - containers hspec hspec-wai http-media http-types lucid mtl - poly-arity pred-trie regex-compat semigroups shakespeare text - transformers wai wai-util warp witherable + aeson attoparsec base blaze-html bytestring composition + composition-extra constraints containers errors hspec hspec-wai + http-media http-types lucid mtl poly-arity pred-trie regex-compat + semigroups sets shakespeare text transformers wai wai-util warp + witherable ]; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; @@ -127301,6 +127706,8 @@ self: { pname = "opaleye"; version = "0.4.1.0"; sha256 = "eca2210c89f76ddcc01c927d317fe58b212a446bffd3d61264a52056edcb91eb"; + revision = "1"; + editedCabalFile = "8d7f434cceda05cb188865f4a2dbca5f7de41fe1ec51f6bceae208d50d2a61a3"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -129543,6 +129950,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_12_4_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , deepseq-generics, ghc-prim, syb + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.12.4.6"; + sha256 = "fbb67e345f17dd706f4500d600a8ec75fbce57b14276eb9b2483585fd3cfacea"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq-generics ghc-prim syb + ]; + homepage = "http://johnmacfarlane.net/pandoc"; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -134032,22 +134456,21 @@ self: { "pipes-csv" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cassava, HUnit - , pipes, pipes-bytestring, test-framework, test-framework-hunit - , unordered-containers, vector + , MissingH, pipes, pipes-bytestring, test-framework + , test-framework-hunit, unordered-containers, vector }: mkDerivation { pname = "pipes-csv"; - version = "1.4.1"; - sha256 = "9a18f4c24281e87136ea17bc73a37199333da25532a5ffed8d268eb080f5d9c4"; + version = "1.4.2"; + sha256 = "eacd20547f7d9d7efc8424cebeae424d7abe2c851ae192a21d6c99516ff787ce"; libraryHaskellDepends = [ base blaze-builder bytestring cassava pipes unordered-containers vector ]; testHaskellDepends = [ - base bytestring cassava HUnit pipes pipes-bytestring test-framework - test-framework-hunit vector + base bytestring cassava HUnit MissingH pipes pipes-bytestring + test-framework test-framework-hunit vector ]; - jailbreak = true; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jb55 ]; @@ -137376,6 +137799,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_6_1_0" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6.1.0"; + sha256 = "93731fa72eaf74e8e83453f080828e18cec9fbc82bee91b49ba8b61c043d38c8"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -141315,16 +141752,15 @@ self: { "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit - , network, old-locale, random, text, time, unordered-containers - , uuid + , network, random, text, time, unordered-containers, uuid }: mkDerivation { pname = "raven-haskell"; - version = "0.1.0.0"; - sha256 = "bd8e2c14b84651142622b44e159e2a32475e2e7f6c3232260ebbf79bde00ea1a"; + version = "0.1.0.1"; + sha256 = "ef1eeb5734d94b9ace31ce41e6afc79cb1a9a60d5944c6abfee54c4d064ac77b"; libraryHaskellDepends = [ - aeson base bytestring http-conduit network old-locale random text - time unordered-containers uuid + aeson base bytestring http-conduit network random text time + unordered-containers uuid ]; testHaskellDepends = [ aeson base bytestring hspec unordered-containers @@ -142192,6 +142628,17 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "redis-job-queue" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedis }: + mkDerivation { + pname = "redis-job-queue"; + version = "0.1.0"; + sha256 = "5ee207f8ca3031e2b8662018ad7a4a9c820741c87e3d57336f4a2848ebabd2fe"; + libraryHaskellDepends = [ aeson base bytestring hedis ]; + description = "Simple priority job queue backed by Redis"; + license = stdenv.lib.licenses.mit; + }) {}; + "redis-resp" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, containers, dlist, double-conversion @@ -143645,6 +144092,7 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -144486,8 +144934,8 @@ self: { }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.1.1"; - sha256 = "4f50a77d04eb304da3c7f93368c4dc5f9e65e705895fa58c018fa0b8f9d79452"; + version = "0.3.1.2"; + sha256 = "067c40b2d83a5804285065443659606a1188542d80615c009dc228d68a55dee1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151962,19 +152410,19 @@ self: { "shadowsocks" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , conduit-combinators, conduit-extra, containers, cryptohash - , HsOpenSSL, HUnit, iproute, optparse-applicative, process - , unordered-containers + , HsOpenSSL, HUnit, iproute, network, optparse-applicative, process + , streaming-commons, unordered-containers }: mkDerivation { pname = "shadowsocks"; - version = "1.20150811"; - sha256 = "1021016861c01a63f4a30825431b22e74e5011984f9406fc6642f5070e201382"; + version = "1.20150921"; + sha256 = "24873dbf0ccb94fe711a6f551b63889e49da89382ee431f78eafab796a4d9638"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base binary bytestring conduit-combinators - conduit-extra containers cryptohash HsOpenSSL iproute - optparse-applicative unordered-containers + conduit-extra containers cryptohash HsOpenSSL iproute network + optparse-applicative streaming-commons unordered-containers ]; testHaskellDepends = [ base binary bytestring containers cryptohash HUnit process @@ -154329,8 +154777,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.3.0.1"; - sha256 = "b5e3b6f415c62e4e7f900c407ffb377d8dc6c56fa0e8ec601d786dfaf5ddf9fd"; + version = "0.3.1.0"; + sha256 = "f73eb73b439e419e58c3705fa021339178efa00e2cef90e7ca5a6a4bc97472f8"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -154423,16 +154871,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_0" = callPackage + "singletons_2_0_0_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, th-desugar }: mkDerivation { pname = "singletons"; - version = "2.0"; - sha256 = "d4caa9f3e819eaa960751ec65e9a2b7656ee91385ea8d2f24dc9c4843678acca"; - revision = "1"; - editedCabalFile = "998190e96130bd256c33650f93dc36c44995fee7dc40fe6b59455b3791f18178"; + version = "2.0.0.1"; + sha256 = "ff21d7c55dcb6b92bddc67bcfbae23cb50f1dfb492c8ba9808f30c36ab65e447"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-desugar ]; @@ -155265,6 +155711,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smoothie_0_4_2_1" = callPackage + ({ mkDerivation, aeson, base, linear, text, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.4.2.1"; + sha256 = "9b3dcba5880be61a4ebbd895ec711a9d137e6a246f55ee1575170c4e413ebade"; + libraryHaskellDepends = [ aeson base linear text vector ]; + homepage = "https://github.com/phaazon/smoothie"; + description = "Smooth curves via several interpolation modes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smsaero" = callPackage ({ mkDerivation, aeson, base, either, lens, servant, servant-client , servant-docs, text, time @@ -157962,6 +158421,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spdx_0_2_1_0" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: + mkDerivation { + pname = "spdx"; + version = "0.2.1.0"; + sha256 = "a7f0d6098e201f5d7b14c13387fe699b9830c95c0192bbd8ceda446a30c980f2"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/phadej/spdx"; + description = "SPDX license expression language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "spe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -161554,6 +162027,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-commons_0_1_14" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.14"; + sha256 = "4472cb5847daea6b3341ddf33785bfc03d9e480f7cf67a5bc752198f1c6f39f2"; + libraryHaskellDepends = [ + array base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-histogram" = callPackage ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit , tasty-quickcheck @@ -171457,6 +171953,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tttool_1_4_0_5" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, executable-path, filepath, hashable, haskeline + , JuicyPixels, mtl, parsec, process, random, template-haskell, time + , vector, yaml + }: + mkDerivation { + pname = "tttool"; + version = "1.4.0.5"; + sha256 = "7adde3a207387ae2cb1d44f30344a0b053703a204c2fdea670ab7409e5ad3764"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base binary bytestring containers directory executable-path + filepath hashable haskeline JuicyPixels mtl parsec process random + template-haskell time vector yaml + ]; + homepage = "https://github.com/entropia/tip-toi-reveng"; + description = "Working with files for the Tiptoi® pen"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tubes" = callPackage ({ mkDerivation, base, comonad, free, mtl, transformers }: mkDerivation { @@ -175068,6 +175587,7 @@ self: { testHaskellDepends = [ base hspec monad-logger persistent-sqlite temporary text users-test ]; + doCheck = false; homepage = "https://github.com/agrafix/users"; description = "A persistent backend for the users package"; license = stdenv.lib.licenses.mit; @@ -177319,6 +177839,7 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vk-aws-route53" = callPackage @@ -183289,6 +183810,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509_1_6_2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "x509"; + version = "1.6.2"; + sha256 = "06e1675ffe9c49055f1419f37adce8fa8692bdda463cd863587ca579305b2f3f"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory mtl pem + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + jailbreak = true; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X509 reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-store_1_5_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, crypto-pubkey-types, directory, filepath, mtl, pem @@ -183401,20 +183946,20 @@ self: { "x509-util" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , crypto-pubkey, crypto-pubkey-types, cryptohash, directory, pem - , x509, x509-store, x509-system, x509-validation + , cryptonite, directory, pem, x509, x509-store, x509-system + , x509-validation }: mkDerivation { pname = "x509-util"; - version = "1.5.2"; - sha256 = "3e0249fc7cbc1d801ba8763d32cd8f46086b903551195424cdaa644c43ecd08a"; + version = "1.6.0"; + sha256 = "823ed93ad997c5084bc9610814e7da28414e6aed80b0d37ba1218face3a10c82"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - asn1-encoding asn1-types base bytestring crypto-pubkey - crypto-pubkey-types cryptohash directory pem x509 x509-store - x509-system x509-validation + asn1-encoding asn1-types base bytestring cryptonite directory pem + x509 x509-store x509-system x509-validation ]; + jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; @@ -183507,6 +184052,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-validation_1_6_3" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, byteable + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, x509, x509-store + }: + mkDerivation { + pname = "x509-validation"; + version = "1.6.3"; + sha256 = "80b7d3beef9dda913c7cc7c890ab703d6030574df2a62df1939036184cd921e3"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base byteable bytestring containers + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 Certificate and CRL validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xattr" = callPackage ({ mkDerivation, attr, base, bytestring, containers, directory , filepath, HUnit, test-framework, test-framework-hunit, unix @@ -186874,6 +187439,7 @@ self: { homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-basic" = callPackage @@ -188287,6 +188853,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-content-pdf" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, directory + , network-uri, process, temporary, yesod-core + }: + mkDerivation { + pname = "yesod-content-pdf"; + version = "0.1.0.1"; + sha256 = "b97f088141602f0598df0bd00e3f12be23396fa6395c4b6e6a1e21c47d86091b"; + libraryHaskellDepends = [ + base blaze-html bytestring directory network-uri process temporary + yesod-core + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/alexkyllo/yesod-content-pdf#readme"; + description = "PDF Content Type for Yesod"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-continuations" = callPackage ({ mkDerivation, base, datetime, hashable, hashmap, stm , system-uuid, template-haskell, yesod @@ -189485,6 +190069,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-mangopay_1_11_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , containers, country-codes, data-default, directory, fast-logger + , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay + , monad-control, monad-logger, persistent, persistent-postgresql + , persistent-template, resourcet, shakespeare, template-haskell + , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod + , yesod-auth, yesod-core, yesod-form, yesod-persistent + , yesod-static + }: + mkDerivation { + pname = "yesod-mangopay"; + version = "1.11.5"; + sha256 = "7a02a34fc1e8e3ae320f1f07f66ac672c0c240b1eb39fabfb0befa8e893282c8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers http-conduit http-types lifted-base mangopay + persistent-template text time yesod yesod-core + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra containers + country-codes data-default directory fast-logger hamlet hjsmin + http-conduit lifted-base mangopay monad-control monad-logger + persistent persistent-postgresql persistent-template resourcet + shakespeare template-haskell text time wai wai-extra wai-logger + warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent + yesod-static + ]; + homepage = "https://github.com/prowdsponsor/mangopay"; + description = "Yesod library for MangoPay API access"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-markdown" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, texmath, text -- GitLab From 4a205c8941d651a3d74a2c1973974a956d2da0e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Sep 2015 20:33:31 +0200 Subject: [PATCH 095/553] Add LTS Haskell version 3.6. --- pkgs/top-level/haskell-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6140137accb..f84cccb898c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -311,5 +311,9 @@ rec { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.5.nix { }; }; + lts-3_6 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.6.nix { }; + }; + }; } -- GitLab From 066481cb13d6919fb178cc085529f996f0318a58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Sep 2015 20:42:04 +0200 Subject: [PATCH 096/553] configuration-hackage2nix.yaml: update list of broken packages --- .../haskell-modules/configuration-hackage2nix.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1c9ec499717..4fe1e013aec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -30,6 +30,8 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: + # Add overrides in this section only for packages that are *not* part of + # Stackage to make sure we're conforming to their preferred version list. extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 @@ -1056,6 +1058,7 @@ dont-distribute-packages: FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-transduce-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] folds: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1754,6 +1757,7 @@ dont-distribute-packages: hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] hsndfile-storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2771,6 +2775,7 @@ dont-distribute-packages: reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] rei: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] remote: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3395,6 +3400,7 @@ dont-distribute-packages: vision: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] + vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3560,6 +3566,7 @@ dont-distribute-packages: yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] -- GitLab From 9f191abad14fb10d3ef843e98ab055894248ca2d Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 21 Sep 2015 21:17:38 +0000 Subject: [PATCH 097/553] syncthing: update systemd service config according to upstream example The example service config were taken from the syncthing repo: https://github.com/syncthing/syncthing/blob/master/etc/linux-systemd/system/syncthing@.service --- nixos/modules/services/networking/syncthing.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d5accfef1cb..4eb32b1cf30 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -54,12 +54,15 @@ in description = "Syncthing service"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.STNORESTART = "placeholder"; # do not self-restart + environment.STNORESTART = "yes"; # do not self-restart + environment.STNOUPGRADE = "yes"; serviceConfig = { User = "${cfg.user}"; PermissionsStartOnly = true; - Restart = "always"; + Restart = "on-failure"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}"; + SuccessExitStatus = "2 3 4"; + RestartForceExitStatus="3 4"; }; }; -- GitLab From 7040350f34c5088789194ba3a7dda96b8ca01fbe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Sep 2015 12:15:01 -0700 Subject: [PATCH 098/553] swig: 3.0.6 -> 3.0.7 --- pkgs/development/tools/misc/swig/3.x.nix | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 389e473240b..0221b30d21e 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "swig-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1y8rlrkqs9h5cyp75s1i9rvrj35kkcwjjw65dyv3xy1skgfxb6w8"; + sha256 = "18zp9546d5xfq88nyykk5v3hh0iyp8r59i2ridbavxn3z914mhyv"; }; nativeBuildInputs = [ autoconf automake libtool bison ]; @@ -23,26 +23,12 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - - longDescription = '' - SWIG is an interface compiler that connects programs written in C and - C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It - works by taking the declarations found in C/C++ header files and using - them to generate the wrapper code that scripting languages need to - access the underlying C/C++ code. In addition, SWIG provides a variety - of customization features that let you tailor the wrapping process to - suit your application. - ''; - homepage = http://swig.org/; - # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - - platforms = stdenv.lib.platforms.unix; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; + platforms = platforms.unix; + maintainers = with maintainers; [ urkud wkennington ]; }; } -- GitLab From 9fbbbd5b68394e57d077b1e726b09e91a2585de3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Sep 2015 12:42:00 -0700 Subject: [PATCH 099/553] linux-testing: Update to 4.3.0-rc2 --- pkgs/os-specific/linux/kernel/common-config.nix | 5 ++++- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 7b8a1861365..ef35757fdb2 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -140,7 +140,9 @@ with stdenv.lib; # Video configuration. # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y + ${optionalString (versionOlder version "4.3") '' + DRM_I915_KMS y + ''} # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE y ${optionalString (versionOlder version "3.9") '' @@ -327,6 +329,7 @@ with stdenv.lib; SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y + HWMON y THERMAL_HWMON y # Hardware monitoring support ${optionalString (versionAtLeast version "3.15") '' UEVENT_HELPER n diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 63ea8ee64ba..d13357825a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.2-rc5"; - modDirVersion = "4.2.0-rc5"; - extraMeta.branch = "4.2"; + version = "4.3-rc2"; + modDirVersion = "4.3.0-rc2"; + extraMeta.branch = "4.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1ir3g5in53qq50ygnwgkzjkl1pzb12ar8k1zvfzcxapddvnhayr0"; + sha256 = "1mgm3r0vz0jbfbqxcjfw0wv5ix6qhwymjz1chh543lvb0729ayb4"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index a14088c81ef..49880e0ecdd 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile, ubootChooser }: +{ stdenv, runCommand, nettools, bc, perl, kmod, openssl, writeTextFile, ubootChooser }: let readConfig = configfile: import (runCommand "config.nix" {} '' @@ -221,7 +221,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools ] ++ optional (stdenv.platform.uboot != null) + nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); makeFlags = commonMakeFlags ++ [ -- GitLab From 2a0c18835a8fad893af52dcec54eb65f3bd1a1b3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Sep 2015 14:38:30 -0700 Subject: [PATCH 100/553] llvm: Install utilities for use with rustc --- pkgs/development/compilers/llvm/3.7/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index eb1f6f668b1..4ff61b27878 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" -- GitLab From 0d32d4cd8475461978b9a985a8449d74044d43fe Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 22 Sep 2015 00:27:40 +0200 Subject: [PATCH 101/553] kibana: 4.2.0 -> 4.1.2 Kibana needs to be downgraded, so it works with current stable elasticsearch --- pkgs/development/tools/misc/kibana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index e1479819c2f..48b543bcdf1 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.2.0"; + version = "4.1.2"; src = fetchurl { url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz"; - sha256 = "01v35iwy8y6gpbl0v9gikvbx3zdxkrm60sxann76mkaq2al3pv0i"; + sha256 = "1sa92laawxc05abiysvp12v5nzrqggmls592mkprwnbkkkbwsm5x"; }; buildInputs = [ makeWrapper ]; -- GitLab From 60aeb9230bbccf7d8832bc18897a228beabd0327 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:49:21 +0200 Subject: [PATCH 102/553] ncmpcpp: 0.6.5 -> 0.6.7 --- pkgs/applications/audio/ncmpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index afd411089cd..e316df4a8c1 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.5"; + version = "0.6.7"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji"; + sha256 = "0yr1ib14qkgbsv839anpzkfbwkm6gg8wv4bf98ar7q5l2p2pv008"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] -- GitLab From 49b49a0172c00310ff7ef7673d48482da059c454 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:49:38 +0200 Subject: [PATCH 103/553] arandr: 0.1.7.1 -> 0.1.8 --- pkgs/tools/X11/arandr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 8c3886cebff..556de1bd8e8 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, xrandr, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "arandr-0.1.7.1"; + name = "arandr-0.1.8"; src = fetchurl { url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; - sha256 = "1nj84ww1kf024n5xgxwqmzscv8i1gixx7nmg05dbjj2xs28alwxb"; + sha256 = "0d574mbmhaqmh7kivaryj2hpghz6xkvic9ah43s1hf385y7c33kd"; }; buildPhase = '' -- GitLab From a273f1fde41020154f35942f4175ffce2ebaf940 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:54:04 +0200 Subject: [PATCH 104/553] khard: 0.5.0 -> 0.6.0 --- pkgs/applications/misc/khard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index e626f3998f9..f1e2467362c 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0k3pix4zdr5jc323w63kwrfhkvmn5ijnznzfhf6rvqp05lrkyh9x"; + sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb"; }; propagatedBuildInputs = with pythonPackages; [ -- GitLab From 5dcb0c944f58e628fcee667403eee21af633ee8e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:57:11 +0200 Subject: [PATCH 105/553] slop: 4.1.15 -> 4.1.16 --- pkgs/tools/misc/slop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 62ec5ab2d63..800fad3b564 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "slop-${version}"; - version = "4.1.15"; + version = "4.1.16"; src = fetchurl { url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz"; - sha256 = "e20fd47de898abcb537c8100faed859eef4955d7784dbc52470570dae403f02e"; + sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2"; }; buildInputs = [ cmake gengetopt libX11 libXext ] -- GitLab From 2a633c8c5c595f2312229e1174fcd11993f9acea Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:57:35 +0200 Subject: [PATCH 106/553] rofi: 0.15.7 -> 0.15.8 --- pkgs/applications/misc/rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 88512deb982..454bc48afe9 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.7"; + version = "0.15.8"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "0alygwc82shkg9lmy8r5vmgd84imx1f9pndrisjpisl8h28dw5dq"; + sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6"; }; buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango -- GitLab From 8bb71e992c07136d0ee5ba9f8f5296aa3916150d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:57:58 +0200 Subject: [PATCH 107/553] maim: 3.3.41 -> 3.4.46 --- pkgs/tools/graphics/maim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 425fa5fb6cd..fe812eac7d4 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "3.3.41"; + version = "3.4.46"; src = fetchurl { url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz"; - sha256 = "12p9zd4skxds26hicy6hrxkxnhbqv1c5ys1h6jchaypvwdggcgnc"; + sha256 = "04gb858g0rrvdiva2dxwsfd7dmq62r67irnc8cpd0r02hr92dr6n"; }; buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ] -- GitLab From 0c45f5400db628f2f43fcd222b31c9222417b9ed Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 22 Sep 2015 01:58:19 +0200 Subject: [PATCH 108/553] yajl: 2.0.4 -> 2.1.0 --- pkgs/development/libraries/yajl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 079b457ab1f..c6ab03df10a 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation rec { - name = "yajl-2.0.4"; + name = "yajl-2.1.0"; src = fetchurl { - url = http://github.com/lloyd/yajl/tarball/2.0.4; + url = http://github.com/lloyd/yajl/tarball/2.1.0; name = "${name}.tar.gz"; - sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; + sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; }; buildInputs = [ cmake ruby ]; -- GitLab From 19dd43ba32e21c6d307d22fddaf5d08c7eb4eec6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 22 Sep 2015 03:44:22 +0200 Subject: [PATCH 109/553] simple-scan: 3.17.92 -> 3.18.0 --- pkgs/applications/graphics/simple-scan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index ba95445a50a..c5d1b936233 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: -let version = "3.17.92"; in +let version = "3.18.0"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0ax4rqqpwcz65nvw8l89npjc5v0g1ik1mb5w3025xlipm7djgybp"; - url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; + sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl"; + url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz"; }; buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit -- GitLab From ceb94adffeed36708990bfd13a7ef16410881704 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 22 Sep 2015 03:47:07 +0200 Subject: [PATCH 110/553] geolite-legacy: update 2015-09-14 -> 2015-09-22 --- pkgs/data/misc/geolite-legacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index db1f8806891..b56b7a32d49 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-09-14"; + version = "2015-09-22"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "1f3jrvh2ivwgvx52r2n62dhyr0gb418q3gzra2108ygdxcm0105h"; + "02vd80bg1hz458i7zfhvr50za1m97l6cqnwsabbby4v09pnlh50v"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "16kvbv63l7cn7032b3gvpzjcb5w9fliyrwirn8sxyad8gywkxznw"; + "1gs79avdx30is31mki82nz66l553ksaiwqcdbrd770ayy85v9pnj"; meta = with stdenv.lib; { inherit version; -- GitLab From 942d2798c595f4979b67bbbcc6a005c7735c9419 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Tue, 22 Sep 2015 13:08:42 +0800 Subject: [PATCH 111/553] nginx: bump lua module to fix build error (https://github.com/openresty/lua-nginx-module/pull/500) --- pkgs/servers/http/nginx/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e988e8192fc..580f12b3004 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -61,8 +61,8 @@ let lua-ext = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.12"; - sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4"; + rev = "v0.9.16"; + sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp"; }; in -- GitLab From 4ac4f2dcd95eface526b89cdfb9d26de424bff6b Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Tue, 22 Sep 2015 13:09:11 +0800 Subject: [PATCH 112/553] nginx: add an option to build the stream module --- pkgs/servers/http/nginx/unstable.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 580f12b3004..e71adba3e57 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -5,7 +5,8 @@ , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false }: +, ngx_lua ? false +, withStream ? false }: with stdenv.lib; @@ -109,6 +110,7 @@ stdenv.mkDerivation rec { ++ optional moreheaders "--add-module=${moreheaders-ext}" ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" + ++ optional withStream "--with-stream" ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; -- GitLab From 295439bb0a6dd644bff830a7af6cb56f40b8f072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Sep 2015 07:58:28 +0200 Subject: [PATCH 113/553] kdevplatform: fix #9981 - build after svn update Also enableParallelBuilding. --- .../libraries/kdevplatform/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 8b7d73462c2..f2b7da798fc 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon, +{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon, gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { @@ -9,14 +9,22 @@ stdenv.mkDerivation rec { sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; }; + patches = [(fetchpatch { + name = "svn-1.9.patch"; + url = "https://git.reviewboard.kde.org/r/124783/diff/raw/"; + sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0"; + })]; + propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ]; - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; + platforms = platforms.linux; description = "KDE libraries for IDE-like programs"; longDescription = '' A free, opensource set of libraries that can be used as a foundation for -- GitLab From e48c2d520ec27eea32a89464cc66e92f7e381235 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 12 Sep 2015 21:23:30 +0900 Subject: [PATCH 114/553] sox: enable libsndfile, amr-nb, amr-wb (close #9824) --- pkgs/applications/misc/audio/sox/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9a30e4669ee..b4f01bc642b 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,6 +6,9 @@ , enableLibogg ? true, libogg ? null, libvorbis ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null +, enableLibsndfile ? true, libsndfile ? null +# amrnb and amrwb are unfree, disabled by default +, enableAMR ? false, amrnb ? null, amrwb ? null }: with stdenv.lib; @@ -25,13 +28,15 @@ stdenv.mkDerivation rec { optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ optional enableFLAC flac ++ - optional enablePNG libpng; + optional enablePNG libpng ++ + optional enableLibsndfile libsndfile ++ + optionals enableAMR [ amrnb amrwb ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://sox.sourceforge.net/; maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2Plus; + license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } -- GitLab From 0be672ced1e0e2af6ec14a0755ba6de3d19d7e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Sep 2015 08:42:40 +0200 Subject: [PATCH 115/553] kdevplatform: maintained by @ambrop72, /cc #9981. --- lib/maintainers.nix | 1 + pkgs/development/libraries/kdevplatform/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5e9ab78a955..121fca95164 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -19,6 +19,7 @@ akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; + ambrop72 = "Ambroz Bizjak "; amiddelk = "Arie Middelkoop "; amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index f2b7da798fc..8398f2d7db4 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - maintainers = [ maintainers.urkud ]; + maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; description = "KDE libraries for IDE-like programs"; longDescription = '' -- GitLab From 70fd4b4b025a5f5aa5d0a0f565aa73e1c684a025 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 21 Sep 2015 20:02:27 +0100 Subject: [PATCH 116/553] encrypted-devices service: Fix keyed mount, clarify descriptions. Not enough arguments were supplied to cryptsetup when a key-file was specified. Also don't try to unlock keyedEncDevs with a password. --- nixos/modules/tasks/encrypted-devices.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 8b5dd22fd38..331531cee15 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -6,6 +6,7 @@ let fileSystems = attrValues config.fileSystems ++ config.swapDevices; encDevs = filter (dev: dev.encrypted.enable) fileSystems; keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; + keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; isIn = needle: haystack: filter (p: p == needle) haystack != []; anyEncrypted = fold (j: v: v || j.encrypted.enable) false encDevs; @@ -29,15 +30,15 @@ let label = mkOption { default = null; example = "rootfs"; - type = types.nullOr types.str; - description = "Label of the backing encrypted device."; + type = types.uniq (types.nullOr types.str); + description = "Label of the unlocked encrypted device. Set fileSystems.<name?>.device to /dev/mapper/<label> to mount the unlocked device."; }; keyFile = mkOption { default = null; example = "/root/.swapkey"; type = types.nullOr types.str; - description = "File system location of keyfile."; + description = "File system location of keyfile. This unlocks the drive after the root has been mounted to /mnt-root."; }; }; }; @@ -58,11 +59,11 @@ in boot.initrd = { luks = { devices = - map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) encDevs; + map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; }; postMountCommands = - concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.label};\n") keyedEncDevs; + concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n") keyedEncDevs; }; }; } -- GitLab From b860b106c548e0bcbf5475afe9e47e1d39b1c0e7 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 18 Sep 2015 15:56:05 +0200 Subject: [PATCH 117/553] sage: 6.1.1 -> 6.8 --- .../science/math/sage/default.nix | 21 ++++++++------ .../science/math/sage/spkg-git.patch | 11 ++++++++ .../science/math/sage/spkg-python.patch | 11 ++++++++ .../science/math/sage/spkg-singular.patch | 28 +++++++++++++++++++ 4 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/science/math/sage/spkg-git.patch create mode 100644 pkgs/applications/science/math/sage/spkg-python.patch create mode 100644 pkgs/applications/science/math/sage/spkg-singular.patch diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index a27a93dd2c6..a19a4977440 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,27 +1,32 @@ { stdenv, fetchurl, m4, perl, gfortran, texLive, ffmpeg, tk -, imagemagick, liblapack +, imagemagick, liblapack, python, openssl, libpng +, which }: stdenv.mkDerivation rec { - name = "sage-6.1.1"; + name = "sage-6.8"; src = fetchurl { url = "mirror://sagemath/${name}.tar.gz"; - sha256 = "0kbzs0l9q7y34jv3f8rd1c2mrjsjkdgaw6mfdwjlpg9g4gghmq5y"; + sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9"; }; - buildInputs = [ m4 perl gfortran texLive ffmpeg tk imagemagick liblapack ]; + buildInputs = [ m4 perl gfortran texLive ffmpeg tk imagemagick liblapack + python openssl libpng which]; + + patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ]; enableParallelBuilding = true; preConfigure = '' export SAGE_NUM_THREADS=$NIX_BUILD_CORES - sed -i 's/if ! [ -d "$HOME" ]/if [ -d "$HOME" ]/' src/bin/sage-env - '' + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i "s/ld_version = try_run('ld -v')/ld_version = 'Apple'/" \ - build/pkgs/atlas/configuration.py + export SAGE_ATLAS_ARCH=fast + mkdir -p $out/sageHome + export HOME=$out/sageHome ''; + installPhase = ''DESTDIR=$out make install''; + meta = { homepage = "http://www.sagemath.org"; description = "A free open source mathematics software system"; diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch new file mode 100644 index 00000000000..a3e768a7c24 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -0,0 +1,11 @@ +--- old/build/pkgs/git/spkg-install 2015-07-26 15:34:43.000000000 +0200 ++++ new/build/pkgs/git/spkg-install 2015-09-17 08:28:03.586657451 +0200 +@@ -45,6 +45,8 @@ + fi + done + ++find . -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' ++ + # We don't want to think about Fink or Macports + export NO_FINK=1 + export NO_DARWIN_PORTS=1 diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch new file mode 100644 index 00000000000..4db9427e3e0 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python.patch @@ -0,0 +1,11 @@ +--- old/build/pkgs/python2/spkg-install 2015-07-26 15:34:43.000000000 +0200 ++++ new/build/pkgs/python2/spkg-install 2015-09-16 20:48:51.904555797 +0200 +@@ -32,7 +32,7 @@ + done + + # We are setting LDFLAGS so that we pick up Sage's readline +-LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS" ++LDFLAGS="-L$SAGE_LOCAL/lib -lcrypt $LDFLAGS" + export LDFLAGS + + if [ "$SAGE_DEBUG" = "yes" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch new file mode 100644 index 00000000000..a4c29825a4c --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -0,0 +1,28 @@ +--- old/build/pkgs/singular/spkg-install 2015-07-26 15:34:43.000000000 +0200 ++++ new/build/pkgs/singular/spkg-install 2015-09-15 20:42:51.716505855 +0200 +@@ -115,6 +115,11 @@ + done + } + ++nix_nuke_bin_rm() ++{ ++ find . -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' ++} ++ + remove_old_version() + { + rm -f "$SAGE_LOCAL"/bin/Singular* +@@ -306,11 +311,11 @@ + + + # Actually run all the functions defined above +-for i in choose_patches apply_patches remove_old_version config \ ++for i in choose_patches apply_patches nix_nuke_bin_rm remove_old_version config \ + build_singular build_libsingular build_factory build_libfac \ + create_singular_script install_docs ; do + echo "### Singular spkg-install: $i ###" +- cd "$SRC" && $i ++ cd "$SRC" && pwd && $i + if [ $? -ne 0 ]; then + echo >&2 "Error building Singular (error in $i)." + exit 1 -- GitLab From fbaaa9cccc868bd9cb33b97c08997ca37e9a66b8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2015 11:59:39 +0200 Subject: [PATCH 118/553] swig2: Enable on Darwin --- pkgs/development/tools/misc/swig/2.x.nix | 6 +++--- pkgs/development/tools/misc/swig/3.x.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 5cfc39a5254..48ba12ccd9c 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ urkud ]; + maintainers = [ lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 0221b30d21e..f93f7d6511d 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with stdenv.lib; { + meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = http://swig.org/; # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = platforms.unix; - maintainers = with maintainers; [ urkud wkennington ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.urkud lib.maintainers.wkennington ]; }; } -- GitLab From 452ebd19879e626dc95329d5f1bee56b9154950e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 22 Sep 2015 16:20:20 +0200 Subject: [PATCH 119/553] gitinspector: init at 0.4.1 --- .../gitinspector/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/version-management/gitinspector/default.nix diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix new file mode 100644 index 00000000000..43df0e5b885 --- /dev/null +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, buildPythonPackage }: + +buildPythonPackage rec { + name = "gitinspector-${version}"; + version = "0.4.1"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; + sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp"; + name = name + "-src"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/ejwa/gitinspector; + description = "Statistical analysis tool for git repositories"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3990a1f6326..93004d8949b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1587,6 +1587,8 @@ let gitfs = callPackage ../tools/filesystems/gitfs { }; + gitinspector = callPackage ../applications/version-management/gitinspector { }; + gitlab = callPackage ../applications/version-management/gitlab { ruby = ruby_2_1_3; }; -- GitLab From a48cb8d7c8c81dbf0d3a0b1f01d69caf24e2b9eb Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 22 Sep 2015 15:25:01 +0000 Subject: [PATCH 120/553] pythonPackages.numpydoc: init at 0.5 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a71684c06b..4782ced4db3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9397,6 +9397,24 @@ let }; }); + numpydoc = buildPythonPackage rec { + name = "numpydoc-${version}"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/numpydoc/${name}.tar.gz"; + sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k"; + }; + + buildInputs = [ self.nose ]; + propagatedBuildInputs = [ self.sphinx self.matplotlib ]; + + meta = { + description = "Sphinx extension to support docstrings in Numpy format"; + homepage = "https://github.com/numpy/numpydoc"; + license = licenses.free; + }; + }; nwdiag = buildPythonPackage rec { name = "nwdiag-1.0.3"; -- GitLab From 449b6028a64fae427fdce4abf126825bd8aaf260 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 22 Sep 2015 18:45:45 +0200 Subject: [PATCH 121/553] qt5.multimedia: fix gstreamer support. --- pkgs/development/libraries/qt-5/5.4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 5862fb6708d..136c352d1aa 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -152,7 +152,7 @@ let multimedia = callPackage ( - { qtSubmodule, base, declarative + { qtSubmodule, base, declarative, pkgconfig , alsaLib, gstreamer, gst_plugins_base, libpulseaudio }: @@ -160,7 +160,7 @@ let name = "qtmultimedia"; qtInputs = [ base declarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base libpulseaudio + pkgconfig alsaLib gstreamer gst_plugins_base libpulseaudio ]; } ) -- GitLab From a921167e37c19082f7cee1d20bd258fb7bc9d97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Sep 2015 18:44:16 +0200 Subject: [PATCH 122/553] pixman: bugfix update 0.32.6 -> 0.32.8, refactor It's claimed to be important on i686. http://cgit.freedesktop.org/pixman/commit/?id=8b49d4b6b460d0c92 --- pkgs/development/libraries/pixman/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index ce027a0a269..30cceb59c00 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,26 +1,28 @@ -{ fetchurl, stdenv, pkgconfig, perl, libpng, glib /*just passthru*/ }: +{ fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.32.6"; + name = "pixman-0.32.8"; src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "0129g4zdrw5hif5783li7rzcr4vpbc2cfia91azxmsk0h0xx3zix"; + url = "mirror://xorg/individual/lib/${name}.tar.bz2"; + sha1 = "5c57045622265b877c9bf02d531973eadf942140"; }; - nativeBuildInputs = [ pkgconfig perl ]; + patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch; - buildInputs = [ libpng ]; # NOT in closure anyway + nativeBuildInputs = [ pkgconfig ]; + buildInputs = stdenv.lib.optional doCheck libpng; - postInstall = glib.flattenInclude; + configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; - patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch; + doCheck = true; - configureFlags = if stdenv.isArm then ["--disable-arm-iwmmxt"] else null; + postInstall = glib.flattenInclude; - meta = { + meta = with stdenv.lib; { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.all; }; } -- GitLab From c33641b8d4ddc3b7ae96cd9f57e2be77f2075886 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 22 Sep 2015 19:33:52 +0200 Subject: [PATCH 123/553] qutebrowser: set gstreamer and qt plugin paths. --- .../networking/browsers/qutebrowser/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c90c13b190d..7f2190ab82c 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }: +{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2, + gst_plugins_base, gst_plugins_good, gst_ffmpeg }: let version = "0.4.0"; in @@ -19,6 +20,12 @@ buildPythonPackage { python pyyaml pyqt5 jinja2 pygments pypeg2 ]; + makeWrapperArgs = '' + --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10" + [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}" + --prefix QT_PLUGIN_PATH : "${qt5.multimedia}/lib/qt5/plugins" + ''; + meta = { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; -- GitLab From f9d1c58f209fec8dd8b5afc6b531c64cb1a9270f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 10:57:03 -0700 Subject: [PATCH 124/553] pysvn: 1.7.8 -> 1.8.0 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a71684c06b..2f31639c11e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12251,12 +12251,12 @@ let }); - pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.8"; + pysvn = pkgs.stdenv.mkDerivation rec { + name = "pysvn-1.8.0"; src = pkgs.fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz"; - sha256 = "1qk7af0laby1f79bd07l9p0dxn5xmcmfwlcb9l1hk29zwwq6x4v0"; + url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz"; + sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r"; }; buildInputs = with self; [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] -- GitLab From 2a28bc669124190e28f7d62663eee9ce31759bc8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2015 20:21:10 +0200 Subject: [PATCH 125/553] separateDebugInfo: Assert Linux Also remove some unintended setting of separateDebugInfo. --- pkgs/applications/misc/hello/ex-2/default.nix | 2 -- pkgs/build-support/setup-hooks/separate-debug-info.sh | 1 - pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index bb91c90e2fc..bf63df4d154 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { doCheck = false; - separateDebugInfo = true; - meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 63691899209..317f13beffd 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -18,7 +18,6 @@ _separateDebugInfo() { # Skip non-ELF files. exec 10< "$i" read -n 4 -u 10 magic - if [[ "$magic" =~ ELF ]]; then echo FOO; fi exec 10<&- # Extract the Build ID. FIXME: there's probably a cleaner way. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 778b3365b47..246ca3696d5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -138,7 +138,7 @@ let outputs' = outputs ++ - (if separateDebugInfo then [ "debug" ] else []); + (if separateDebugInfo then assert result.isLinux; [ "debug" ] else []); buildInputs' = buildInputs ++ (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8a301f912b8..71c47c97d60 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -43,8 +43,6 @@ let doInstallCheck = false; - separateDebugInfo = true; - crossAttrs = { postUnpack = '' export CPATH="${bzip2.crossDrv}/include" -- GitLab From 645441c2075e9e449996e7368a918477c6da414e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2015 20:23:23 +0200 Subject: [PATCH 126/553] hello/ex-2 -> hello --- doc/meta.xml | 2 +- doc/quick-start.xml | 2 +- pkgs/applications/misc/hello/{ex-2 => }/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/misc/hello/{ex-2 => }/default.nix (100%) diff --git a/doc/meta.xml b/doc/meta.xml index b36f3915ec1..98031612523 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -61,7 +61,7 @@ $ nix-env -qa hello --meta --json "i686-openbsd", "x86_64-openbsd" ], - "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/ex-2/default.nix:14" + "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" }, "name": "hello-2.9", "system": "x86_64-linux" diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 8d51f4c30e6..5ed959abace 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -56,7 +56,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix">pkgs/applications/misc/hello/default.nix. Trivial package, which specifies some meta attributes which is good practice. diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/default.nix similarity index 100% rename from pkgs/applications/misc/hello/ex-2/default.nix rename to pkgs/applications/misc/hello/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93004d8949b..aed68689f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11585,7 +11585,7 @@ let inherit (gnome) gnome_python; }; - hello = callPackage ../applications/misc/hello/ex-2 { }; + hello = callPackage ../applications/misc/hello { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; -- GitLab From 4bcbfb33f815069700658957f1233546df32a195 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2015 18:08:36 +0200 Subject: [PATCH 127/553] firefox-esr: Update to 38.3.0esr --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 12d581b1566..6c8baad7621 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -143,8 +143,8 @@ in { firefox-esr = common { pname = "firefox-esr"; - version = "38.2.1esr"; - sha1 = "c596174e7273be5079bf55aecde33ec191d99538"; + version = "38.3.0esr"; + sha1 = "57d2c255348ac13b6ffbb952c5e0d57757aa0290"; }; } -- GitLab From f46fe7b909a4385c576e1ac612b5b8e076a3b338 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2015 20:03:52 +0200 Subject: [PATCH 128/553] firefox: Update to 41.0 --- .../applications/networking/browsers/firefox/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 6c8baad7621..ea9d03f321e 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -22,7 +22,9 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + url = + let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2"; + in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}"; inherit sha1; }; @@ -77,6 +79,7 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { "--disable-installer" "--disable-updater" "--enable-jemalloc" + "--disable-gconf" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] @@ -137,8 +140,8 @@ in { firefox = common { pname = "firefox"; - version = "40.0.3"; - sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; + version = "41.0"; + sha1 = "0ce7a5ccdf671a6c98eaac07d06d49a895a99449"; }; firefox-esr = common { -- GitLab From 346c744530cc6362a9093421466064eebee30965 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sun, 13 Sep 2015 14:48:16 +0200 Subject: [PATCH 129/553] xtreemfs: repackage and update --- pkgs/tools/filesystems/xtreemfs/default.nix | 127 +++++++++----------- 1 file changed, 56 insertions(+), 71 deletions(-) diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 81be62b5159..8f090c29781 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,80 +1,65 @@ -x@{builderDefsPackage - , boost, fuse, openssl, cmake, attr, jdk, ant, which, python, file - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="XtreemFS"; - version="1.4"; - name="${baseName}-${version}"; - url="http://xtreemfs.googlecode.com/files/${name}.tar.gz"; - hash="1hzd6anplxdcl4cg6xwriqk9b34541r7ah1ab2xavv149a2ll25s"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python +, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }: + +stdenv.mkDerivation rec { + src = fetchFromGitHub { + # using unstable release because stable (v1.5.1) has broken repl java plugin + rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3"; + owner = "xtreemfs"; + repo = "xtreemfs"; + sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + name = "XtreemFS-${version}"; + version = "1.5.1.81"; + + buildInputs = [ which attr makeWrapper python ]; + + preConfigure = '' + export JAVA_HOME=${jdk} + export ANT_HOME=${ant} + + export BOOST_INCLUDEDIR=${boost.dev}/include + export BOOST_LIBRARYDIR=${boost.lib}/lib + export OPENSSL_ROOT_DIR=${openssl} + + substituteInPlace cpp/cmake/FindValgrind.cmake \ + --replace "/usr/local" "${valgrind}" + + substituteInPlace cpp/CMakeLists.txt \ + --replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"' + + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include" + export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib" + + export DESTDIR=$out - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "fixMakefile" "doMakeInstall" "fixInterpreterBin" - "fixInterpreterEtc" - "usrIsOut"]; + substituteInPlace Makefile \ + --replace "/usr/share/" "/share/" \ + --replace 'BIN_DIR=$(DESTDIR)/usr/bin' "BIN_DIR=$out/bin" - setVars = a.noDepEntry '' - export JAVA_HOME="${jdk}" - export ANT_HOME="${ant}" - export CMAKE_HOME=${cmake} + substituteInPlace etc/init.d/generate_initd_scripts.sh \ + --replace "/bin/bash" "${stdenv.shell}" + + # do not put cmake into buildInputs + export PATH="$PATH:${cmake}/bin" + ''; + + preBuild = '' + substituteInPlace configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; + + doCheck = false; + + postInstall = '' + rm -r $out/sbin ''; - fixMakefile = a.fullDepEntry '' - sed -e 's@DESTDIR)/usr@DESTDIR)@g' -i Makefile - - sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/configure - sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/gtest/configure - sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/gtest-*/configure - '' ["doUnpack" "minInit"]; - - fixInterpreterBin = a.doPatchShebangs "$out/bin"; - fixInterpreterEtc = a.doPatchShebangs "$out/etc/xos/xtreemfs"; - - usrIsOut = a.fullDepEntry '' - sed -e "s@/usr/@$out/@g" -i \ - "$out"/{bin/xtfs_*,etc/xos/xtreemfs/*.*,etc/xos/xtreemfs/*/*,etc/init.d/*} - sed -e "s@JAVA_HOME=/usr@JAVA_HOME=${jdk}@g" -i \ - "$out"/{bin/xtfs_*,etc/init.d/*} - '' ["minInit"]; - - makeFlags = [ - ''DESTDIR="$out"'' - ''SHELL="${a.stdenv.shell}"'' - ]; - meta = { description = "A distributed filesystem"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.bsd3; - broken = true; + maintainers = with lib.maintainers; [ raskin matejc ]; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; - passthru = { - updateInfo = { - downloadPage = "http://xtreemfs.org/download_sources.php"; - }; - }; -}) x - +} -- GitLab From d31cc0d19ae058b15095296d435a722d6afd87fa Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sun, 13 Sep 2015 14:49:19 +0200 Subject: [PATCH 130/553] xtreemfs: add nixos module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/network-filesystems/xtreemfs.nix | 481 ++++++++++++++++++ 3 files changed, 484 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/xtreemfs.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b0e9ceea10b..0d2700a126f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -233,6 +233,7 @@ dnschain = 209; #lxd = 210; # unused kibana = 211; + xtreemfs = 212; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -444,6 +445,7 @@ #dnschain = 209; #unused lxd = 210; # unused #kibana = 211; + xtreemfs = 212; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1d6ddcbe941..c890eac4991 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -257,6 +257,7 @@ ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix + ./services/network-filesystems/xtreemfs.nix ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/asterisk.nix diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix new file mode 100644 index 00000000000..215b76bb470 --- /dev/null +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -0,0 +1,481 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xtreemfs; + + xtreemfs = pkgs.xtreemfs; + + home = cfg.homeDir; + + startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" '' + #! ${pkgs.stdenv.shell} + JAVA_HOME="${pkgs.jdk}" + JAVADIR="${xtreemfs}/share/java" + JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar" + $JAVA_CALL ${class} ${configPath} + ''; + + dirReplicationConfig = pkgs.writeText "xtreemfs-dir-replication-plugin.properties" '' + babudb.repl.backupDir = ${home}/server-repl-dir + plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar + babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar + + ${cfg.dir.replication.extraConfig} + ''; + + dirConfig = pkgs.writeText "xtreemfs-dir-config.properties" '' + uuid = ${cfg.dir.uuid} + listen.port = ${toString cfg.dir.port} + ${optionalString (cfg.dir.address != "") "listen.address = ${cfg.dir.address}"} + http_port = ${toString cfg.dir.httpPort} + babudb.baseDir = ${home}/dir/database + babudb.logDir = ${home}/dir/db-log + babudb.sync = ${if cfg.dir.replication.enable then "FDATASYNC" else cfg.dir.syncMode} + + ${optionalString cfg.dir.replication.enable "babudb.plugin.0 = ${dirReplicationConfig}"} + + ${cfg.dir.extraConfig} + ''; + + mrcReplicationConfig = pkgs.writeText "xtreemfs-mrc-replication-plugin.properties" '' + babudb.repl.backupDir = ${home}/server-repl-mrc + plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar + babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar + + ${cfg.mrc.replication.extraConfig} + ''; + + mrcConfig = pkgs.writeText "xtreemfs-mrc-config.properties" '' + uuid = ${cfg.mrc.uuid} + listen.port = ${toString cfg.mrc.port} + ${optionalString (cfg.mrc.address != "") "listen.address = ${cfg.mrc.address}"} + http_port = ${toString cfg.mrc.httpPort} + babudb.baseDir = ${home}/mrc/database + babudb.logDir = ${home}/mrc/db-log + babudb.sync = ${if cfg.mrc.replication.enable then "FDATASYNC" else cfg.mrc.syncMode} + + ${optionalString cfg.mrc.replication.enable "babudb.plugin.0 = ${mrcReplicationConfig}"} + + ${cfg.mrc.extraConfig} + ''; + + osdConfig = pkgs.writeText "xtreemfs-osd-config.properties" '' + uuid = ${cfg.osd.uuid} + listen.port = ${toString cfg.osd.port} + ${optionalString (cfg.osd.address != "") "listen.address = ${cfg.osd.address}"} + http_port = ${toString cfg.osd.httpPort} + object_dir = ${home}/osd/ + + ${cfg.osd.extraConfig} + ''; + +in + +{ + + ###### interface + + options = { + + services.xtreemfs = { + + enable = mkOption { + default = false; + description = '' + Whether to enable XtreemFS. + ''; + }; + + homeDir = mkOption { + default = "/var/lib/xtreemfs"; + description = '' + XtreemFS home dir for the xtreemfs user. + ''; + }; + + dir = { + enable = mkOption { + default = true; + description = '' + Whether to enable XtreemFS DIR service. + ''; + }; + uuid = mkOption { + example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `utillinux` package. + ''; + }; + port = mkOption { + default = 32638; + description = '' + The port to listen on for incoming connections (TCP). + ''; + }; + address = mkOption { + example = "127.0.0.1"; + default = ""; + description = '' + If specified, it defines the interface to listen on. If not + specified, the service will listen on all interfaces (any). + ''; + }; + httpPort = mkOption { + default = 30638; + description = '' + Specifies the listen port for the HTTP service that returns the + status page. + ''; + }; + syncMode = mkOption { + default = "FSYNC"; + example = "FDATASYNC"; + description = '' + The sync mode influences how operations are committed to the disk + log before the operation is acknowledged to the caller. + + -ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure. + -SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model. + -SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode. + -FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk. + -FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk. + + For best throughput use ASYNC, for maximum data safety use FSYNC. + + (If xtreemfs.dir.replication.enable is true then FDATASYNC is forced) + ''; + }; + extraConfig = mkOption { + default = ""; + example = '' + # specify whether SSL is required + ssl.enabled = true + ssl.service_creds.pw = passphrase + ssl.service_creds.container = pkcs12 + ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/dir.p12 + ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + ssl.trusted_certs.pw = jks_passphrase + ssl.trusted_certs.container = jks + ''; + description = '' + Configuration of XtreemFS DIR service. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + replication = { + enable = mkOption { + default = false; + description = '' + Whether to enable XtreemFS DIR replication plugin. + ''; + }; + extraConfig = mkOption { + example = '' + # participants of the replication including this replica + babudb.repl.participant.0 = 192.168.0.10 + babudb.repl.participant.0.port = 35676 + babudb.repl.participant.1 = 192.168.0.11 + babudb.repl.participant.1.port = 35676 + babudb.repl.participant.2 = 192.168.0.12 + babudb.repl.participant.2.port = 35676 + + # number of servers that at least have to be up to date + # To have a fault-tolerant system, this value has to be set to the + # majority of nodes i.e., if you have three replicas, set this to 2 + # Please note that a setup with two nodes provides no fault-tolerance. + babudb.repl.sync.n = 2 + + # specify whether SSL is required + babudb.ssl.enabled = true + + babudb.ssl.protocol = tlsv12 + + # server credentials for SSL handshakes + babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12 + babudb.ssl.service_creds.pw = passphrase + babudb.ssl.service_creds.container = pkcs12 + + # trusted certificates for SSL handshakes + babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + babudb.ssl.trusted_certs.pw = jks_passphrase + babudb.ssl.trusted_certs.container = jks + + babudb.ssl.authenticationWithoutEncryption = false + ''; + description = '' + Configuration of XtreemFS DIR replication plugin. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + }; + }; + + mrc = { + enable = mkOption { + default = true; + description = '' + Whether to enable XtreemFS MRC service. + ''; + }; + uuid = mkOption { + example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `utillinux` package. + ''; + }; + port = mkOption { + default = 32636; + description = '' + The port to listen on for incoming connections (TCP). + ''; + }; + address = mkOption { + example = "127.0.0.1"; + default = ""; + description = '' + If specified, it defines the interface to listen on. If not + specified, the service will listen on all interfaces (any). + ''; + }; + httpPort = mkOption { + default = 30636; + description = '' + Specifies the listen port for the HTTP service that returns the + status page. + ''; + }; + syncMode = mkOption { + default = "FSYNC"; + example = "FDATASYNC"; + description = '' + The sync mode influences how operations are committed to the disk + log before the operation is acknowledged to the caller. + + -ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure. + -SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model. + -SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode. + -FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk. + -FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk. + + For best throughput use ASYNC, for maximum data safety use FSYNC. + + (If xtreemfs.mrc.replication.enable is true then FDATASYNC is forced) + ''; + }; + extraConfig = mkOption { + example = '' + osd_check_interval = 300 + no_atime = true + local_clock_renewal = 0 + remote_time_sync = 30000 + authentication_provider = org.xtreemfs.common.auth.NullAuthProvider + + # shared secret between the MRC and all OSDs + capability_secret = iNG8UuQJrJ6XVDTe + + dir_service.host = 192.168.0.10 + dir_service.port = 32638 + + # if replication is enabled + dir_service.1.host = 192.168.0.11 + dir_service.1.port = 32638 + dir_service.2.host = 192.168.0.12 + dir_service.2.port = 32638 + + # specify whether SSL is required + ssl.enabled = true + ssl.protocol = tlsv12 + ssl.service_creds.pw = passphrase + ssl.service_creds.container = pkcs12 + ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/mrc.p12 + ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + ssl.trusted_certs.pw = jks_passphrase + ssl.trusted_certs.container = jks + ''; + description = '' + Configuration of XtreemFS MRC service. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + replication = { + enable = mkOption { + default = false; + description = '' + Whether to enable XtreemFS MRC replication plugin. + ''; + }; + extraConfig = mkOption { + example = '' + # participants of the replication including this replica + babudb.repl.participant.0 = 192.168.0.10 + babudb.repl.participant.0.port = 35678 + babudb.repl.participant.1 = 192.168.0.11 + babudb.repl.participant.1.port = 35678 + babudb.repl.participant.2 = 192.168.0.12 + babudb.repl.participant.2.port = 35678 + + # number of servers that at least have to be up to date + # To have a fault-tolerant system, this value has to be set to the + # majority of nodes i.e., if you have three replicas, set this to 2 + # Please note that a setup with two nodes provides no fault-tolerance. + babudb.repl.sync.n = 2 + + # specify whether SSL is required + babudb.ssl.enabled = true + + babudb.ssl.protocol = tlsv12 + + # server credentials for SSL handshakes + babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12 + babudb.ssl.service_creds.pw = passphrase + babudb.ssl.service_creds.container = pkcs12 + + # trusted certificates for SSL handshakes + babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + babudb.ssl.trusted_certs.pw = jks_passphrase + babudb.ssl.trusted_certs.container = jks + + babudb.ssl.authenticationWithoutEncryption = false + ''; + description = '' + Configuration of XtreemFS MRC replication plugin. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + }; + }; + + osd = { + enable = mkOption { + default = true; + description = '' + Whether to enable XtreemFS OSD service. + ''; + }; + uuid = mkOption { + example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `utillinux` package. + ''; + }; + port = mkOption { + default = 32640; + description = '' + The port to listen on for incoming connections (TCP and UDP). + ''; + }; + address = mkOption { + example = "127.0.0.1"; + default = ""; + description = '' + If specified, it defines the interface to listen on. If not + specified, the service will listen on all interfaces (any). + ''; + }; + httpPort = mkOption { + default = 30640; + description = '' + Specifies the listen port for the HTTP service that returns the + status page. + ''; + }; + extraConfig = mkOption { + example = '' + local_clock_renewal = 0 + remote_time_sync = 30000 + report_free_space = true + capability_secret = iNG8UuQJrJ6XVDTe + + dir_service.host = 192.168.0.10 + dir_service.port = 32638 + + # if replication is used + dir_service.1.host = 192.168.0.11 + dir_service.1.port = 32638 + dir_service.2.host = 192.168.0.12 + dir_service.2.port = 32638 + + # specify whether SSL is required + ssl.enabled = true + ssl.service_creds.pw = passphrase + ssl.service_creds.container = pkcs12 + ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12 + ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + ssl.trusted_certs.pw = jks_passphrase + ssl.trusted_certs.container = jks + ''; + description = '' + Configuration of XtreemFS OSD service. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + }; + }; + + }; + + + ###### implementation + + config = lib.mkIf cfg.enable { + + environment.systemPackages = [ xtreemfs ]; + + users.extraUsers.xtreemfs = + { uid = config.ids.uids.xtreemfs; + description = "XtreemFS user"; + createHome = true; + home = home; + }; + + users.extraGroups.xtreemfs = + { gid = config.ids.gids.xtreemfs; + }; + + systemd.services.xtreemfs-dir = mkIf cfg.dir.enable { + description = "XtreemFS-DIR Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "xtreemfs"; + ExecStart = "${startupScript "org.xtreemfs.dir.DIR" dirConfig}"; + }; + }; + + systemd.services.xtreemfs-mrc = mkIf cfg.mrc.enable { + description = "XtreemFS-MRC Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "xtreemfs"; + ExecStart = "${startupScript "org.xtreemfs.mrc.MRC" mrcConfig}"; + }; + }; + + systemd.services.xtreemfs-osd = mkIf cfg.osd.enable { + description = "XtreemFS-OSD Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "xtreemfs"; + ExecStart = "${startupScript "org.xtreemfs.osd.OSD" osdConfig}"; + }; + }; + + }; + +} -- GitLab From a35cebb3b1789797e4e0102bc8da9d694b55abef Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Mon, 14 Sep 2015 02:21:10 +0200 Subject: [PATCH 131/553] xtreemfs: use mkEnableOption instead of mkOption --- .../services/network-filesystems/xtreemfs.nix | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 215b76bb470..2d57464ce04 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -82,12 +82,7 @@ in services.xtreemfs = { - enable = mkOption { - default = false; - description = '' - Whether to enable XtreemFS. - ''; - }; + enable = mkEnableOption "XtreemFS"; homeDir = mkOption { default = "/var/lib/xtreemfs"; @@ -169,12 +164,7 @@ in ''; }; replication = { - enable = mkOption { - default = false; - description = '' - Whether to enable XtreemFS DIR replication plugin. - ''; - }; + enable = mkEnableOption "XtreemFS DIR replication plugin"; extraConfig = mkOption { example = '' # participants of the replication including this replica @@ -308,12 +298,7 @@ in ''; }; replication = { - enable = mkOption { - default = false; - description = '' - Whether to enable XtreemFS MRC replication plugin. - ''; - }; + enable = mkEnableOption "XtreemFS MRC replication plugin"; extraConfig = mkOption { example = '' # participants of the replication including this replica -- GitLab From c666955b7599c0db6d856c2f11f76c28299313cb Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Tue, 22 Sep 2015 21:10:36 +0200 Subject: [PATCH 132/553] xtreemfs: set mrc and osd as dir dependencies --- .../services/network-filesystems/xtreemfs.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 2d57464ce04..b051214e1d0 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -72,6 +72,13 @@ let ${cfg.osd.extraConfig} ''; + optionalDir = optionals cfg.dir.enable ["xtreemfs-dir.service"]; + + systemdOptionalDependencies = { + after = [ "network.target" ] ++ optionalDir; + wantedBy = [ "multi-user.target" ] ++ optionalDir; + }; + in { @@ -441,25 +448,21 @@ in }; }; - systemd.services.xtreemfs-mrc = mkIf cfg.mrc.enable { + systemd.services.xtreemfs-mrc = mkIf cfg.mrc.enable ({ description = "XtreemFS-MRC Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "xtreemfs"; ExecStart = "${startupScript "org.xtreemfs.mrc.MRC" mrcConfig}"; }; - }; + } // systemdOptionalDependencies); - systemd.services.xtreemfs-osd = mkIf cfg.osd.enable { + systemd.services.xtreemfs-osd = mkIf cfg.osd.enable ({ description = "XtreemFS-OSD Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "xtreemfs"; ExecStart = "${startupScript "org.xtreemfs.osd.OSD" osdConfig}"; }; - }; + } // systemdOptionalDependencies); }; -- GitLab From b3658bc01bec22a5c3c70e818918c12d2bc0baf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Sep 2015 21:33:48 +0200 Subject: [PATCH 133/553] separateDebugInfo: compress it by default Using zlib should be cheap enough and save lots of HDD space. Case study (glib): 11 MB -> 4 MB. --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 317f13beffd..1f27cb0ffd6 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -30,7 +30,14 @@ _separateDebugInfo() { # Extract the debug info. header "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" - objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" + objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" --compress-debug-sections strip --strip-debug "$i" done } + +# - We might prefer to compress the debug info during link-time already, +# but our ld doesn't support --compress-debug-sections=zlib (yet). +# - Debug info may cause due to excessive memory usage during linking. +# Using -Wa,--compress-debug-sections should help with that; +# further interesting information: https://gcc.gnu.org/wiki/DebugFission + -- GitLab From 22521f3b9083968e1f55164b34d2f21b4734cafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Sep 2015 22:07:58 +0200 Subject: [PATCH 134/553] separateDebugInfo: fix typo in comment --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 1f27cb0ffd6..a2b2693ea47 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -37,7 +37,7 @@ _separateDebugInfo() { # - We might prefer to compress the debug info during link-time already, # but our ld doesn't support --compress-debug-sections=zlib (yet). -# - Debug info may cause due to excessive memory usage during linking. +# - Debug info may cause problems due to excessive memory usage during linking. # Using -Wa,--compress-debug-sections should help with that; # further interesting information: https://gcc.gnu.org/wiki/DebugFission -- GitLab From 283dd9fe49e754dd3c1562e3e1233d3616710bac Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 14:29:36 -0700 Subject: [PATCH 135/553] wayland: 1.8.1 -> 1.9.0 --- pkgs/development/libraries/wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 9736d651404..0510fde811c 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,11 +8,11 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1j3gfzn8i0xhk3j34mwb2srrscjxfyi279jhyq80mz943j6r6z7i"; + sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; configureFlags = "--with-scanner --disable-documentation"; -- GitLab From bd0120202ec76fecc193cfeb4e5432725d1d16c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 14:29:47 -0700 Subject: [PATCH 136/553] file: 5.24 -> 5.25 --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 7d991a41556..749bf59fde9 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "file-5.24"; + name = "file-5.25"; buildInputs = [ zlib ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "http://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "1kjhqwmi1sjw8jcf6li725c59wm00zajrdfwgkwqxs295vgb6b40"; + sha256 = "1jhfi5mivdnqvry5la5q919l503ahwdwbf3hjhiv97znccakhd9p"; }; meta = { -- GitLab From fdf2c3d1306deddcdf44516ffad52366f22e28f3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 14:30:05 -0700 Subject: [PATCH 137/553] weston: 1.8.0 -> 1.9.0 --- pkgs/applications/window-managers/weston/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index d270d3a2b1d..114b665225f 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -7,17 +7,17 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "04nkbbdglh0pqznxkdqvak3pc53jmz24d0658bn5r0cf6agycqw9"; + sha256 = "1ks8mja6glzy2dkayi535hd6w5c5h021bqk7vzgv182g33rh66ww"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm - mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva - libwebp + wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm mtdev + libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp ]; configureFlags = [ -- GitLab From df665ded7e9a5980c6ae51a9df8203706c1150c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Sep 2015 00:03:13 +0200 Subject: [PATCH 138/553] ec2-data.nix: Support ed25519 host keys --- nixos/modules/virtualisation/ec2-data.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 44a582ba766..0b0fdda4988 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -9,7 +9,7 @@ with lib; { config = { - systemd.services."fetch-ec2-data" = + systemd.services.fetch-ec2-data = { description = "Fetch EC2 Data"; wantedBy = [ "multi-user.target" "sshd.service" ]; @@ -48,13 +48,22 @@ with lib; # the supplied user data, if available. Otherwise sshd will # generate one normally. $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true + + mkdir -m 0755 -p /etc/ssh + key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then - mkdir -m 0755 -p /etc/ssh (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key) echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub fi + + key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' /root/user-data)" + key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' /root/user-data)" + if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then + (umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key) + echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub + fi ''; serviceConfig.Type = "oneshot"; @@ -72,6 +81,7 @@ with lib; # ec2-get-console-output. echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console + ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_ed25519_key.pub > /dev/console echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console ''; serviceConfig.Type = "oneshot"; -- GitLab From 17c468c9c7117e663b184641389c5f21858d4298 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 23 Sep 2015 01:13:41 +0200 Subject: [PATCH 139/553] eclipse-plugin-scala: 4.1.1 -> 4.1.1.20150911 No URL change since the update, unfortunately, happens in-place. --- pkgs/applications/editors/eclipse/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 9d85c05206a..b80d63f69d3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -317,11 +317,11 @@ rec { scala = buildEclipseUpdateSite rec { name = "scala-${version}"; - version = "4.1.1"; + version = "4.1.1.20150911"; src = fetchzip { url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; - sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8"; + sha256 = "03g24sjivm7kzy64wwjs4ihf9vrb6703lb7bx3jafxzcwqm0pj1i"; }; meta = with stdenv.lib; { -- GitLab From 724e243159e4e0059699eb21f6761a760b9a2f49 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 21 Sep 2015 15:48:22 -0700 Subject: [PATCH 140/553] pop --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ pkgs/stdenv/default.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f7a18fa2da..1324b8b979b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,6 +57,15 @@ self: super: { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + WordNet = pkgs.stdenv.lib.overrideDerivation super.WordNet (drv: { + src = ~/.dev/Haskell/WordNet-1.1.0; + postPatch = (drv.postPatch or "") + '' + substituteInPlace NLP/WordNet/Consts.hs \ + --replace /usr/local/WordNet-2.0 ${pkgs.wordnet} \ + --replace 'defined (MAC)' 0 + ''; + }); + # This package needs a little help compiling properly on Darwin. Furthermore, # Stackage compiles git-annex without the Assistant, supposedly because not # all required dependencies are part of Stackage. To comply with Stackage, we diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 71bdc3e8f82..da93229ce94 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -54,7 +54,7 @@ rec { if system == "armv7l-linux" then stdenvLinux else if system == "mips64el-linux" then stdenvLinux else if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if system == "x86_64-darwin" then stdenvDarwin else + if system == "x86_64-darwin" then stdenvDarwinPure else if system == "x86_64-solaris" then stdenvNix else if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else -- GitLab From 76a65398292d925e64a784ff1ebc441804dea9a8 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 22 Sep 2015 16:26:48 -0700 Subject: [PATCH 141/553] work on making xquartz buildable in a pure environment --- pkgs/servers/x11/quartz-wm/default.nix | 8 +++++++- pkgs/servers/x11/xorg/overrides.nix | 6 +++++- pkgs/servers/x11/xquartz/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 9 +++++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 8f5885a4856..ff125067305 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig }: +{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, Foundation, libobjc, Xplugin, CF }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,7 +19,13 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig + CF + Foundation + libobjc + Xplugin ]; + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin + "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a7e5b43689a..f5d5bf679ec 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -324,7 +324,11 @@ in ''; passthru.version = version; # needed by virtualbox guest additions } else { - buildInputs = commonBuildInputs ++ [ args.bootstrap_cmds args.automake args.autoconf ]; + buildInputs = commonBuildInputs ++ [ + args.bootstrap_cmds args.automake args.autoconf + args.CF args.apple_sdk.libs.Xplugin args.apple_sdk.frameworks.Foundation + args.libobjc args.apple_sdk.frameworks.Cocoa + ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto ]; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 3e9e7cb779e..8b5b3155a17 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -109,8 +109,7 @@ in stdenv.mkDerivation { cp ${installer} $out/bin/xquartz-install - rm -r $out/LaunchAgents - rm -r $out/LaunchDaemons + rm -rf $out/LaunchAgents $out/LaunchDaemons fontsConfPath=$out/etc/X11/fonts.conf cp ${fontsConf} $fontsConfPath diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f683d48b3e..3099a146a80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9246,14 +9246,19 @@ let zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; xquartz = callPackage ../servers/x11/xquartz { }; - quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; + quartz-wm = callPackage ../servers/x11/quartz-wm { + stdenv = clangStdenv; + inherit (darwin.apple_sdk.frameworks) Foundation; + inherit (darwin.apple_sdk.libs) Xplugin; + inherit (darwin) libobjc CF; + }; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; - inherit (darwin) apple_sdk; + inherit (darwin) apple_sdk libobjc CF; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; -- GitLab From 6af1afa8e395188dd7130db3db18889ceb69f4f5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 22 Sep 2015 16:27:11 -0700 Subject: [PATCH 142/553] provide realLibtool to some packages needing it --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3099a146a80..417011e156f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4853,7 +4853,9 @@ let guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - guile_2_0 = callPackage ../development/interpreters/guile { }; + guile_2_0 = callPackage ../development/interpreters/guile { + libtool = realLibtool; + }; guile = guile_2_0; @@ -6051,7 +6053,9 @@ let db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; - dbus = callPackage ../development/libraries/dbus { }; + dbus = callPackage ../development/libraries/dbus { + libtool = realLibtool; + }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; -- GitLab From f1eef5c69be0bf105d5da72b6f6830de037773dd Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 22 Sep 2015 16:27:44 -0700 Subject: [PATCH 143/553] add missing closing tags in rl-unstable.xml --- .../doc/manual/release-notes/rl-unstable.xml | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 6d9f9412b62..c5e341d2e3f 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -22,18 +22,19 @@ the developers upstream. Use wimenu from the wmii-hg package. - - Gitit! Is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. You will need to - add an import statement to your nixos configuration in order to use it. As - an example adding: - ]; - } - ]]> - - Will include the gitit service configuration options. + Gitit! Is no longer automatically added to the module list in + NixOS and as such there will not be any manual entries for it. You will need to + add an import statement to your nixos configuration in order to use it. As + an example adding: + ]; + } + ]]> + + Will include the gitit service configuration options. + + -- GitLab From 63d1ce6d38c47a8ae9b31c0fcaca79c295f52136 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Tue, 22 Sep 2015 21:03:25 -0400 Subject: [PATCH 144/553] postfix service: fix recipientDelimiter not to be dependent on sslCert --- nixos/modules/services/mail/postfix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 29e0cf7a882..e8beba4b358 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -77,7 +77,8 @@ let smtpd_tls_key_file = ${cfg.sslKey} smtpd_use_tls = yes - + '' + + optionalString (cfg.recipientDelimiter != "") '' recipient_delimiter = ${cfg.recipientDelimiter} '' + optionalString (cfg.virtual != "") '' -- GitLab From 50355a22a4bc906d249d3812b6b9c32feb70ba6d Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 23 Sep 2015 10:08:00 +0900 Subject: [PATCH 145/553] firefox-bin: 40.0.3 -> 41.0 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index b29cdec27e9..3dcf855d062 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "40.0.3"; + version = "41.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } - { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } - { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } - { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } - { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } - { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } - { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } - { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } - { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } - { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } - { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } - { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } - { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } - { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } - { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } - { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } - { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } - { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } - { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } - { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } - { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "f5170ec868dd1aee22e42ce5df62714cd5bd0272"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "45cc71012e2c9423f53a9ba501087dc8d47e6b8a"; } + { locale = "af"; arch = "linux-i686"; sha1 = "d9677f0ad122cc64a99638397d52177d6df20128"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "7516c969fe2d572d1f9ef9d4de523e3d6caa88e1"; } + { locale = "an"; arch = "linux-i686"; sha1 = "d4ad4e5f5f7469b0fea1650b4104bf888cb5c15b"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "70bbff8841cc16f77c5095bd5b1069cb00c5f1cc"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "efa4ed982bf62ffdfc665bb87d658936d8db5776"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9f7ade25f478081ba4c727aecd9984aee4df70"; } + { locale = "as"; arch = "linux-i686"; sha1 = "eb2367bf83ac5dbd2ee8878321b52db10d3639ad"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "e08846464bc3ff55d6964d19d737d0039322100f"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "86304c1e29b9c5231767bd401273ec68046c76b2"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "920f441939469910ddc938036cde2ab509cb2343"; } + { locale = "az"; arch = "linux-i686"; sha1 = "1f8520b21a3addb7f75068cc10a7b8e33b8ca518"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "177e632d49f6c1d97e5f1597e23ce11dca07e0e5"; } + { locale = "be"; arch = "linux-i686"; sha1 = "142285626aa67c743c5713b6a65e153fe0a641e0"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "7d49ab01ed0c42bca581bf86b3e8e1ad5bbf7bf1"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "ab1b18aa69960298dfabd161f45d0a27795f0a1a"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "0993c19e4345d993bb94c2dd2b5e4a80c95c4a43"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a23f101ec5f80a88720615daa367cf0c019da41c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "5a192b64a22e21cc4e35342c06f90529e0677703"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "0c316e902d44dea1a0c6bdb021ac189207aa791a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fc72cd6c2fa14120b78f19e75271a3ab61795889"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5c159e461a8bf96f2189a843786451c62e842a2b"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "236b0c31e5f0ebd147bab0b0b03be356316242db"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "515501f46ba1b02b076204a88954a31b2b2e7914"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "5c7a4a0a260b5b16dc972cc2e4acaf001b3cdd41"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "aa7ea9c8ec0c71445d89bf43031ac87951ea192f"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "b6d9e57dc189c5178bbb585091d133fc8c04e718"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "20fe53563a9c8c21a1e1c4095ac42ed0254bfbdd"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "eb763eefb704c57ac367b4d242695c28eed640b4"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "41c8826a12e642d0a4d073628a02ce3ef1ebd5fe"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "057359932d6526eaa463907513814e2767a21f7d"; } + { locale = "da"; arch = "linux-i686"; sha1 = "b347c71204d4257b0a4ac710644fa0dab1aa8325"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "c0e54aa74ae60b241435a80450f75a8246a472cd"; } + { locale = "de"; arch = "linux-i686"; sha1 = "1eb209d6512043b1a51c805fef9056d377fd23bb"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "de9ba01f5f29a704ee4e9ddd05d0072d340c40f3"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "17c154b2f579ee94efc222dc0ba790e8bd93f324"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6f14ca2d875559e8459967b103fde124ab2827b"; } + { locale = "el"; arch = "linux-i686"; sha1 = "6cece97d1faca809bb44cccf1b46c83ec9391ef7"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "a47eecbd48135bb114fcd7160d7368074501a260"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "e7a85809117d0092cc6532c781bfab915b3f16f6"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "62823bc5fed9ed5b86566e2f4ddfb9764d3c3b83"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "5d5fa02110c31f1b1cca53f23f00119bf404a06d"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "41909356a1f661a64cef3c3ae696b356084be5a7"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "077a01cd8a9205c025693eb0cb3055e997a1b40e"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51c13e2eddbabd12d7d35bb7465003768991806e"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "a3851ca2e53b4fb2be4b2bb05e5551037d11184d"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "103d1300b9fa071ae3c793874846c3cdff2c90c4"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "275d3c72a0b8e6905c97bc58ad7e51811e6e37d7"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "027749dee7e3541b0c29e4c8d1b27e7caa21044e"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "a1c918e6e4460b49e8efdb4e5999ef1e28db9a5c"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "6ebbb610c3614e308b5ee47a9b034292674b76ca"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "21d50757c31db0a1a608aff651971670b8f10ab2"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f3549981b618fe6de379c1806ae8e5b4c088788e"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "8918a3ae0b1327a100bea927aaad7a6c0fdf35ed"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e40461a28eb7c1dfa0c9e3bbfd76fbf9f532ca9f"; } + { locale = "et"; arch = "linux-i686"; sha1 = "779f1a8399d47a9515e79028e3a0f12a9e9e791a"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "5c1c8be5bc86d386a938d6ad1080d0fd8a763c0d"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "5b8c59f4cf19d66bca5c34d51727717e0626ffd6"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "0e2ba0116a0976059b224321747eb34b91d229dd"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "3f1a0cab5c292d5319b852d4a974b17489b5516d"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "199a7f70e3fa43e910da21b5680368a8b0805fe5"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "7f54aa948b7b030e40019612ad5420d913d636d7"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "38aaae5894f1c9a9aec27a8be3d93239d754178e"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "338d3556673f77ee63f21cfaf5f58eaee4442181"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "f8bd7b421699d499aed052396b2bbaf98c050728"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "e2c58911aa0ff3b5bd98e83c758947c97d955503"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "9b50488ae97c01f2848e827cd842e17abd8b5d21"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "cceb0a3752bd584cd02b3f84f8c07bc27ec38eef"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c6c0d21b8230fdd2b35b8da591b027a594ef60d0"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c662e5b2b59ce620754a845111bc58eab8e8a0ef"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "17e5c0a48e998c9e6f703033b386533ebd8354c0"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "9a4569025d500290a4e1db03bca59d5731ba1e85"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "3ca3494e510159ef1bb8e5c323a1b7c5b8faf235"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "0b331461d902100249ef67d9038023ed8001d513"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b11c8dfe0bdd4de77e03148fb1fe3ecbfb20677"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "03c09178f69f4040fe3817ba6d2fd40e98392aef"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "b0e6de684fcb7a47f7616f3071d09d89afbbcb80"; } + { locale = "he"; arch = "linux-i686"; sha1 = "e3d8f15caf7fa19df43e676a5cf93ca5e09ee27b"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "18441b8f340c0afe14f3869cc37ed041b911fb26"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "fb3627d0f89553741a8fbc3b7671309928832076"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3da130031d183f003aa7c0fa3509f8982a4e70e1"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "e6e4909d66672c665cf86db494351354720d5682"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "027575c413be191f23b22f87a3db0ecdcb48b13c"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "24f5f3027708320a01d884ba7a91feac98c11f98"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ede78b5b3ac15fec01de936dc722f25239dac5fb"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "816f5e910aea73d6e36470d3169f900cda2004e2"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "f5248943de5e8af2ed3e15fb85aa4429a7b97787"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ae4e11326f3ad491ec2f823267be4c54a55f93cc"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0ad1dce94bdc81f534399b00a09c004bac3c69c9"; } + { locale = "id"; arch = "linux-i686"; sha1 = "6568d4e201def196d457eaf13b6e4486ff70d336"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "45b74a17607f5d93d0062bb09c372afec0eedce6"; } + { locale = "is"; arch = "linux-i686"; sha1 = "d550eefe14d84cf91b3265675298f6c58cfbfe5c"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "0ddf532263b7f987867e640b278a9f2554e792cb"; } + { locale = "it"; arch = "linux-i686"; sha1 = "6cb353c7fbd9fc67571c5ba00b92d4760e33efaa"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "353d8e6e83f709d5ba5d26b1a42bc3cfca9997bf"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "e03b1ad563f75cfdec52b392a888c60d2f1438f0"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "5fad4f77e055e827ae948e9119d6c30e40ecd831"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "68b9b9d57b6a28000abfcb6363273888f6f4814a"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "09f3e62b0e084c26beabdb175232c3a46b8deba9"; } + { locale = "km"; arch = "linux-i686"; sha1 = "7bb71271eae1fecc328abd3a22f97eb8218f2ef4"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "c328d9f0ae6805aa5d1d4747c375a1f049e77252"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "51d910f52c22180e2a92be77c846303ed037a437"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "71411c26ed9c3a899c0e059301050acbcb96a751"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "74f5c7e44dfd537857b29297f27037a6a741cbdd"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "dcecd4c55763ec7441c37e048439dc1cb6ea480f"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "df8d745849099c514ad7b6c40b89e2a6f1333a54"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "d449eab057742d8798f2d255b4c3134f820e4379"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "9186dab13998c5d01e508fca536f36c1a4fc7dfb"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "11e28641755c2ee9648d46181f2861ef67937f53"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "552bd1ef40500c9a5e68b122c8b3525077ce5f6e"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "6a6403dd89318608b1436b7d42700054f9a6945a"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "ec3d4b155e58cfec6496fbd824a15dba9377e6ae"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "15c2e13971e05b8023826e96ad9d326dd254bbdc"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "7fb2263b3376b8f05ccf12672994919b6a0bdeee"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "67b91736a82ab8ce2c523ea084e9be2587d6ee9a"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "9558d57c27f08cf87e35d827bffdc1161505bdf8"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "07dd0613207de1b32d7ea7d057154a25f162c240"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "1f1138e747e86fd2408ae827f7785af9a46e49ec"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "6b9d24d1f1956fbe375d4850d977c8794b2094ce"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "d8c35c7542ad0c30ac06ba8c6670396eb4cba115"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "b885a83d29c8b7670bba999df6bcb67f6c9a13de"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "3fbd8181255cca312da88cadd088b6fe5edabaad"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "969f2d6715824ca22cb19a5c7c338d9b4e9cbc87"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "e8f99b167cc4d9101168c5d054e439fa00b53d66"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "121c2c1839fb65c242e719c05c2794fb80d3df29"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "b77b21a3d8fc78df630f9b412aad94e6bbf6045d"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bece8813404652dc07b4223d93cf925085a8c2d7"; } + { locale = "or"; arch = "linux-i686"; sha1 = "5c79f1aa2a5a4b9d173f8705000cb950764d308e"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "edb4f388e48f6a5e63e285f4fca64fd7053ea291"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "618063149909ead3828d509b3f4bdebe98f562c5"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50d2f536cbf118ab1480d716f7729627c57e05c"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "e94e2d515b8aed6c24a5239f852b971eb7001202"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "58e2208b25a70586ae6aff1b58e9c25948622be0"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "732f7e366000509958fdd8065f67138ea38a55a6"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2a6e341c14b8bc060e93e9fdbe20f6c7f14ffaeb"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5f54ba5748c637d3a94558bc10e6fab3db1518ec"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "72e93c7a33b799c7067163cb7834ab2f93f851f5"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "8c47019cc0cb465431d207e1f8e499d00a7fe8d0"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "29bea7462e7b3295e1964ff472a295906e297925"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "2822d04eef821bbd35448b69f27f8e933def6f4e"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "9a31c8ce51c31d118de81ef9c7afbd2a0536a9e4"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "04a8a632f3cb50445091baa52aced77cfb00f4e2"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "1de49f0817c3a7c6cf4f58f72c10203a8b5a59ba"; } + { locale = "si"; arch = "linux-i686"; sha1 = "f7983c4ce6a6d8b30ae0f55228cc9e3a25ae3971"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "f5cd2cc05d03d34d6284468c08ba76f7ac95b6ef"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "dbe36a51050b2efb613318d81da0df2e32a7361c"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "77dcba31255d019e19c01dc1131b4a2364817e6b"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "42976aa670cf12730ac548603f6a84fde0dd4152"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "7f3d486be4782a5a9a85fbbcccb30cd7f020b0a6"; } + { locale = "son"; arch = "linux-i686"; sha1 = "5becaf85ea5b992798e1bf2561f3771d23676d9d"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "56f32e6524b0d16ba7e3aeb1fde7d9d56fae67e6"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "654860607a653d13895c188d6d7acba8a3cd3342"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "859f9e3fda8e9952dd33e67f619124af6a8f3147"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "e5b06f11813d3e7e1bce62a20c85a3e860828e0a"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "fa2167558158241844e2061cb28c7890bef939ac"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "71c099a731af87a46dfb153b7ba3ea9a5d188fb4"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "f1a151abc610c75ce54fddfc0649e1e361469d01"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "feff271a83d4ed97c754c7502033d5d5d7af8082"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "1976cdbf1153579bc97e00595ce60f93732ee85c"; } + { locale = "te"; arch = "linux-i686"; sha1 = "063c1c55aad4f055cba90292dd231ef037b6add1"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "d04d784383d0bf4a6cf10750c1e2d2dce280e8ad"; } + { locale = "th"; arch = "linux-i686"; sha1 = "4b453bd313d45386d5d99b935e24289bd4c51f25"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "784c38a90182d136407a056892349607b414bdd3"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "bcbc685a2122c23460d8d2ac4e807fdccd75b8e9"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "167ffbf3547713c6f236f9c661de8b239699070d"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "ebd2e78cd94454a58757ff093b3ee84faf08e7b8"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "6b8f59fefb8d37750a311614f8403f5be989917f"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "5a799fd0f5cdcab2580f14dc107a43160e065092"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c28fe123246a378035ee6ceee3e2d33d0412e874"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "2cdc27ce098519017e006e2cdfb4b4d883264050"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "b5891e4e1284ea3e1a2ee7dc60a60ad5460b65e5"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "ce010fe5110e0dd6b3763d23c460d74ec7bfcaad"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "231a10effa87e4a5d8848a175a4016e104c1cbaf"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "d40f8e841323cd2cb99392514e6e5daae7ab9246"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5bf94401578d12e01a0f4a4911472efbae95f5c9"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e96feab226294cb6170bd4c707d97c6298db91e"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c7a7698cec959f3592c9cf2e7f3f425016281c04"; } ]; } -- GitLab From 22e57d6f2620e652e4cc181993179ea24956995c Mon Sep 17 00:00:00 2001 From: Allan Espinosa Date: Wed, 23 Sep 2015 13:25:53 +0900 Subject: [PATCH 146/553] oathToolkit: Support darwin --- pkgs/development/libraries/xmlsec/default.nix | 2 +- pkgs/tools/security/oath-toolkit/default.nix | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 3fba451c711..85e2f08b31d 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.aleksey.com/xmlsec; description = "XML Security Library in C based on libxml2"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 8f96a5067d1..216ce3d2336 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchurl, pam }: +{ stdenv, fetchurl, pam, xmlsec }: +let + securityDependency = + if stdenv.isDarwin then xmlsec + else pam; +in stdenv.mkDerivation rec { name = "oath-toolkit-2.4.1"; @@ -8,11 +13,12 @@ stdenv.mkDerivation rec { sha256 = "094vbq66sn5f2dsy14hajpsfdnaivjxf70xzs91nrsq0q75l5ylv"; }; - buildInputs = [ pam ]; + + buildInputs = [ securityDependency ]; meta = { homepage = http://www.nongnu.org/oath-toolkit/; description = "Components for building one-time password authentication systems"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } -- GitLab From 5afaef6213be67e144f7520528e364b939ca7a3a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 23:25:45 -0700 Subject: [PATCH 147/553] libu2f-server: 0.0.0 -> 1.0.1 --- pkgs/development/libraries/libu2f-server/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 6ac4eb29d13..2649cb3660d 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, json_c, hidapi, openssl, check }: +{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }: stdenv.mkDerivation rec { - name = "libu2f-server-0.0.0"; + name = "libu2f-server-1.0.1"; src = fetchurl { - url = "https://developers.yubico.com/libu2f-server/Releases/libu2f-server-0.0.0.tar.xz"; - sha256 = "1vdl3qavzfpi6p6h48zw17md9wykfzpay5c4l1c08id46m560wp0"; + url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz"; + sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656"; }; - buildInputs = [ pkgconfig json_c hidapi openssl check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ json_c openssl check ]; meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-server/; -- GitLab From b3075b30871e4d5af36047c726d624d5791cdc84 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 23:25:55 -0700 Subject: [PATCH 148/553] pam_u2f: 0.0.1 -> 1.0.1 --- pkgs/os-specific/linux/pam_u2f/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 458d171ec68..ecffa7bec59 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,16 +1,23 @@ -{ pkgs, fetchurl, stdenv }: +{ stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }: + stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "0.0.1"; + version = "1.0.1"; + src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0p1wia4nfw5h0pmy1lcgwsbrlm7z39v1n37692lgqfzyg1kmpv7l"; + sha256 = "08lmc2il877k7djkjmza3k0n6ij8b4hx4x9dl6wwfdjqsr8d2zfp"; }; - buildInputs = with pkgs; [ asciidoc autoconf automake docbook_xml_dtd_45 libtool libu2f-host libu2f-server libxml2 libxslt pkgconfig pam ]; - installFlags = [ - "PAMDIR=$(out)/lib/security" - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libu2f-host libu2f-server pam ]; + + # Fix the broken include in 1.0.1 + CFLAGS = "-I${libu2f-host}/include/u2f-host"; + + preConfigure = '' + configureFlagsArray+=("--with-pam-dir=$out/lib/security") + ''; meta = with stdenv.lib; { homepage = https://developers.yubico.com/pam-u2f/; -- GitLab From 6b0add86b99f7d03f6bc80c1742f79e80b9ae413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Sep 2015 22:33:18 +0200 Subject: [PATCH 149/553] separateDebugInfo: one more comment --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index a2b2693ea47..dc6de05bb69 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -40,4 +40,5 @@ _separateDebugInfo() { # - Debug info may cause problems due to excessive memory usage during linking. # Using -Wa,--compress-debug-sections should help with that; # further interesting information: https://gcc.gnu.org/wiki/DebugFission +# - Another related tool: https://fedoraproject.org/wiki/Features/DwarfCompressor -- GitLab From 1caa62ae42fb0de74dbef5ff31e5d08d1b4b1d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 10:44:22 +0200 Subject: [PATCH 150/553] all-packages: fix ordering I forgot to stage this during merge. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e97335f20e8..a79f417b382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15064,9 +15064,9 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 - xlibs = xorg; # added 2015-09 - xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 x11 = xlibsWrapper; # added 2015-09 + xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 + xlibs = xorg; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 -- GitLab From c10f7050c56ddbfb500ef5a73367f810438a8416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 11:51:08 +0200 Subject: [PATCH 151/553] all-packages: don't recurse into aliased sets So far nix-env -qP would prefer e.g. `xlibs.*` to `xorg.*`, so we just disallow recursing into aliased sets while keeping them available for explicit usage. Consequently, `xlibs` references should get killed on the next regeneration. --- pkgs/top-level/all-packages.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a79f417b382..dff3d73ce2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15035,8 +15035,12 @@ let mg = callPackage ../applications/editors/mg { }; +}; # self_ = - # Attributes for backward compatibility. + + ### Deprecated aliases - for backward compatibility + +aliases = with self; rec { adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 @@ -15069,5 +15073,12 @@ let xlibs = xorg; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 +}; + +tweakAlias = _n: alias: with lib; + if !isDerivation alias && isAttrs alias then + removeAttrs alias ["recurseForDerivations"] + else alias; + +in lib.mapAttrs tweakAlias aliases // self; in pkgs -}; in self; in pkgs -- GitLab From a2159d168c7ab4e4543b94043bbb24aca198d3c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 23 Sep 2015 12:05:31 +0200 Subject: [PATCH 152/553] miniupnpc: further downgrade to 1.9.20150430 20150730 still breaks bitcoin: https://github.com/NixOS/nixpkgs/commit/43fba1d1ebc0d8fe3d44c051bba26aa33ebec59e#commitcomment-13386751 --- pkgs/tools/networking/miniupnpc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 8e0890ea471..a0ae90da446 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: +let version = "1.9.20150430"; in stdenv.mkDerivation rec { - name = "miniupnpc-1.9.20150730"; + name = "miniupnpc-${version}"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0156hssql8iaziwba8ag7y39lchrgwcvlhck2d2qak1vznqzlr0x"; + sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; name = "${name}.tar.gz"; }; @@ -14,6 +15,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; meta = { + inherit version; homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = stdenv.lib.platforms.linux; -- GitLab From 8ea4686c187278f92f4a3192e683bb882bcbf904 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 23 Sep 2015 11:58:14 +0200 Subject: [PATCH 153/553] pythonPackages.PyXAPI: init at 0.1 --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acd77926336..9407cd136ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12411,6 +12411,43 @@ let }; }); + PyXAPI = stdenv.mkDerivation rec { + name = "PyXAPI-0.1"; + + src = pkgs.fetchurl { + url = "http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/${name}.tar.gz"; + sha256 = "19lblwfq24bgsgfy7hhqkxdf4bxl40chcxdlpma7a0wfa0ngbn26"; + }; + + buildInputs = [ self.python ]; + + installPhase = '' + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "Python socket module extension & RFC3542 IPv6 Advanced Sockets API"; + longDescription = '' + PyXAPI consists of two modules: `socket_ext' and `rfc3542'. + `socket_ext' extends the Python module `socket'. `socket' objects have + two new methods: `recvmsg' and `sendmsg'. It defines `ancillary data' + objects and some functions related to. `socket_ext' module also provides + functions to manage interfaces indexes defined in RFC3494 and not + available from standard Python module `socket'. + `rfc3542' is a full implementation of RFC3542 (Advanced Sockets + Application Program Interface (API) for IPv6). + ''; + homepage = http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nckx ]; + }; + }; pyxattr = buildPythonPackage (rec { name = "pyxattr-0.5.1"; -- GitLab From ffe94847a350d15ee72eb95bbe1777e6cc6815ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 23 Sep 2015 12:19:24 +0200 Subject: [PATCH 154/553] sshuttle: 0.61 -> 0.71 Account for a zany new build system & add myself as a maintainer. Tested by connecting to a remote system and browsing the web & LAN, both as root and a regular (sudo) user. Cool tool. CC @iElectric --- pkgs/tools/security/sshuttle/default.nix | 46 +++++++++++++++--------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 61ba63862af..18997abb678 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,34 +1,46 @@ -{ stdenv, fetchurl, iptables, python, pythonPackages }: +{ stdenv, fetchFromGitHub, makeWrapper, pandoc +, coreutils, iptables, nettools, openssh, procps, python }: +let version = "0.71"; in stdenv.mkDerivation rec { name = "sshuttle-${version}"; - version = "0.61"; - src = fetchurl { - url = "https://github.com/apenwarr/sshuttle/archive/sshuttle-0.61.tar.gz"; - sha256 = "1v2v1kbwnmx6ygzhbgqcmyafx914s2p7vjp7l0pf52sa7qkliy9b"; + src = fetchFromGitHub { + sha256 = "0yr8nih97jg6azfj3k7064lfbh3g36l6vwyjlngl4ph6mgcki1cm"; + rev = name; + repo = "sshuttle"; + owner = "sshuttle"; }; - preBuild = '' - substituteInPlace Documentation/all.do --replace "/bin/ls" "$(type -tP ls)"; - substituteInPlace Documentation/md2man.py --replace "/usr/bin/env python" "${python}/bin/python" - ''; + nativeBuildInputs = [ makeWrapper pandoc ]; + buildInputs = [ coreutils iptables nettools openssh procps python ]; - phases = "unpackPhase installPhase"; + preConfigure = '' + cd src + ''; installPhase = '' + mkdir -p $out/share/sshuttle + cp -R sshuttle *.py compat $out/share/sshuttle + mkdir -p $out/bin - cp -R . $out - ln -s $out/sshuttle $out/bin/sshuttle + ln -s $out/share/sshuttle/sshuttle $out/bin + wrapProgram $out/bin/sshuttle --prefix PATH : \ + "${stdenv.lib.concatStringsSep ":" (map (x: "${x}/bin") buildInputs)}" + + install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8 ''; - - buildInputs = [ iptables python pythonPackages.markdown pythonPackages.beautifulsoup ]; - meta = with stdenv.lib; { - homepage = https://github.com/apenwarr/sshuttle; + inherit version; + inherit (src.meta) homepage; description = "Transparent proxy server that works as a poor man's VPN"; - maintainers = with maintainers; [ iElectric ]; + longDescription = '' + Forward connections over SSH, without requiring administrator access to the + target network (though it does require Python 2 at both ends). + Works with Linux and Mac OS and supports DNS tunneling. + ''; + maintainers = with maintainers; [ iElectric nckx ]; platforms = platforms.unix; }; } -- GitLab From 63f3fef08e6d098056f4cd0e6f94694c53e875e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 12:37:47 +0200 Subject: [PATCH 155/553] tweakAlias: simplify, thanks to @edolstra --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dff3d73ce2c..0e53c988f88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15076,7 +15076,7 @@ aliases = with self; rec { }; tweakAlias = _n: alias: with lib; - if !isDerivation alias && isAttrs alias then + if alias.recurseForDerivations or false then removeAttrs alias ["recurseForDerivations"] else alias; -- GitLab From 0a836bb5c0993044764fa8096fb7c60b4576c060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 13:36:23 +0200 Subject: [PATCH 156/553] jitsi: rename xlibs -> xorg --- .../networking/instant-messengers/jitsi/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 494f40f804e..2c502a594f1 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xlibs +, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg }: assert stdenv.isLinux; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { gtk2 libpulseaudio openssl - ] ++ lib.optionals (xlibs != null) [ - xlibs.libX11 - xlibs.libXext - xlibs.libXScrnSaver - xlibs.libXv + ] ++ lib.optionals (xorg != null) [ + xorg.libX11 + xorg.libXext + xorg.libXScrnSaver + xorg.libXv ]); buildInputs = [unzip ant jdk]; -- GitLab From 68bd8e4a9dc247726ae89cc8739574261718e328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 13:42:14 +0200 Subject: [PATCH 157/553] jitsi: fix meta.license and refactor meta /cc maintainer @khumba. --- .../networking/instant-messengers/jitsi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 2c502a594f1..d7b98d535af 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -66,12 +66,12 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = https://jitsi.org/; description = "Open Source Video Calls and Chat"; - license = stdenv.lib.licenses.lgpl21Plus.shortName; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.khumba ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.khumba ]; }; } -- GitLab From 23f75e9bb05454d0af44fc823a19c57eafd967e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 12:15:05 +0200 Subject: [PATCH 158/553] gdk-pixbuf: maintenance update 2.31.7 -> 2.32.0 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 754fddd101a..0971df78e66 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -2,15 +2,15 @@ , jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: let - ver_maj = "2.31"; - ver_min = "7"; + ver_maj = "2.32"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "046n9wz16kh3rpzxaiiwphf5bihxgj4g14cjn65wwmw82q4y0dj7"; + sha256 = "0rqvj5gcs2zfyyg9llm289b0xkj4mrhzxfjpjja0wx1m6vn5axjk"; }; setupHook = ./setup-hook.sh; -- GitLab From 9de8f95d4bb8f0fb2bed0461a77d414857e610b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 12:20:33 +0200 Subject: [PATCH 159/553] libjpeg(-turbo): maintenance update 1.4.1 -> 1.4.2 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 158b8825db4..3660a652e79 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-1.4.1"; + name = "libjpeg-turbo-1.4.2"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "027vz97064bjmwj7gdw2p47y1437w08j54frpgzmnql5rvabmxab"; + sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj"; }; buildInputs = [ nasm ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 417011e156f..72e95ee9d97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7081,7 +7081,7 @@ let libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; -- GitLab From cd7c494bb29d171b4d05d81484ca6d63375bfd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 12:23:45 +0200 Subject: [PATCH 160/553] pango: feature update 1.36.8 -> 1.38.0 Tested rebuilding the most important pango users, without any problems. --- pkgs/development/libraries/pango/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a92..6944b55a721 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -3,26 +3,26 @@ }: let - ver_maj = "1.36"; - ver_min = "8"; + ver_maj = "1.38"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"; + sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx"; }; buildInputs = with stdenv.lib; [ gobjectIntrospection ] - ++ optionals stdenv.isDarwin [ fontconfig ]; + ++ optional stdenv.isDarwin fontconfig; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; - doCheck = false; # test-layout fails on 1.36.8 + doCheck = false; # test-layout fails on 1.38.0 # jww (2014-05-05): The tests currently fail on Darwin: # # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; - meta = { + meta = with stdenv.lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; longDescription = '' @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.pango.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with maintainers; [ raskin urkud ]; + platforms = with platforms; linux ++ darwin; }; } -- GitLab From ff9a70266b7f778eba504ae68928e7fd92bd0705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 12:33:46 +0200 Subject: [PATCH 161/553] at-spi2-*: small updates 2.16.0 -> 2.18.0 --- pkgs/development/libraries/at-spi2-atk/default.nix | 4 ++-- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 940fc2bb6cc..84c0b5f56aa 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.16"; + versionMajor = "2.18"; versionMinor = "0"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"; + sha256 = "0xgkrnx04vaklbkzc7bzym9s0qhj8aiz4knqlxgx3vxnacsb6vaa"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 0fc28185501..b49d1ddb804 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -2,14 +2,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { - versionMajor = "2.16"; + versionMajor = "2.18"; versionMinor = "0"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"; + sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs"; }; outputs = [ "out" "doc" ]; -- GitLab From e425766b5ddd5b3118adc35dc9483b2c89be1585 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Sep 2015 23:31:20 +0200 Subject: [PATCH 162/553] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-4-g3df9130 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/5eb46915ca840f5a6e90124a13279a2aa78a2369 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/238be6f44331777aaf0cf6b4c86fd415d7beb915 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/c7012a704b558556ca067861eb156f9916aa2afb - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a46ea057c995297b0058419aa54c1cbcaca28a31 --- .../haskell-modules/configuration-lts-0.0.nix | 13 + .../haskell-modules/configuration-lts-0.1.nix | 13 + .../haskell-modules/configuration-lts-0.2.nix | 13 + .../haskell-modules/configuration-lts-0.3.nix | 13 + .../haskell-modules/configuration-lts-0.4.nix | 13 + .../haskell-modules/configuration-lts-0.5.nix | 13 + .../haskell-modules/configuration-lts-0.6.nix | 13 + .../haskell-modules/configuration-lts-0.7.nix | 13 + .../haskell-modules/configuration-lts-1.0.nix | 13 + .../haskell-modules/configuration-lts-1.1.nix | 13 + .../configuration-lts-1.10.nix | 13 + .../configuration-lts-1.11.nix | 13 + .../configuration-lts-1.12.nix | 13 + .../configuration-lts-1.13.nix | 13 + .../configuration-lts-1.14.nix | 13 + .../configuration-lts-1.15.nix | 13 + .../haskell-modules/configuration-lts-1.2.nix | 13 + .../haskell-modules/configuration-lts-1.4.nix | 13 + .../haskell-modules/configuration-lts-1.5.nix | 13 + .../haskell-modules/configuration-lts-1.7.nix | 13 + .../haskell-modules/configuration-lts-1.8.nix | 13 + .../haskell-modules/configuration-lts-1.9.nix | 13 + .../haskell-modules/configuration-lts-2.0.nix | 14 + .../haskell-modules/configuration-lts-2.1.nix | 14 + .../configuration-lts-2.10.nix | 14 + .../configuration-lts-2.11.nix | 14 + .../configuration-lts-2.12.nix | 14 + .../configuration-lts-2.13.nix | 14 + .../configuration-lts-2.14.nix | 15 + .../configuration-lts-2.15.nix | 15 + .../configuration-lts-2.16.nix | 16 + .../configuration-lts-2.17.nix | 16 + .../configuration-lts-2.18.nix | 16 + .../configuration-lts-2.19.nix | 17 + .../haskell-modules/configuration-lts-2.2.nix | 14 + .../configuration-lts-2.20.nix | 17 + .../configuration-lts-2.21.nix | 17 + .../configuration-lts-2.22.nix | 17 + .../haskell-modules/configuration-lts-2.3.nix | 14 + .../haskell-modules/configuration-lts-2.4.nix | 14 + .../haskell-modules/configuration-lts-2.5.nix | 14 + .../haskell-modules/configuration-lts-2.6.nix | 14 + .../haskell-modules/configuration-lts-2.7.nix | 14 + .../haskell-modules/configuration-lts-2.8.nix | 14 + .../haskell-modules/configuration-lts-2.9.nix | 14 + .../haskell-modules/configuration-lts-3.0.nix | 27 + .../haskell-modules/configuration-lts-3.1.nix | 28 + .../haskell-modules/configuration-lts-3.2.nix | 28 + .../haskell-modules/configuration-lts-3.3.nix | 29 + .../haskell-modules/configuration-lts-3.4.nix | 29 + .../haskell-modules/configuration-lts-3.5.nix | 33 + .../haskell-modules/configuration-lts-3.6.nix | 39 + .../haskell-modules/hackage-packages.nix | 1316 +++++++++++++---- 53 files changed, 1840 insertions(+), 317 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 8b0ceb9717f..d921561a796 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5141,6 +5148,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7920,6 +7929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_5"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8043,6 +8053,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8056,6 +8067,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8070,6 +8082,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 99879cbd557..ab29b6397d7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5140,6 +5147,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7919,6 +7928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_5"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8042,6 +8052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8055,6 +8066,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8069,6 +8081,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 3149f9a08ef..392daa1edf4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5140,6 +5147,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7919,6 +7928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_5"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8042,6 +8052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8055,6 +8066,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8069,6 +8081,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 26571eeadf5..9c990e43430 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5140,6 +5147,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7919,6 +7928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_6"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8042,6 +8052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8055,6 +8066,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8069,6 +8081,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index b62ce01da66..9f7d29835d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5137,6 +5144,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7914,6 +7923,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_6"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8037,6 +8047,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8050,6 +8061,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8064,6 +8076,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index caeebcd75f0..6aaccab73b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5137,6 +5144,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7914,6 +7923,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_7"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8036,6 +8046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8049,6 +8060,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8063,6 +8075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 2d17266f60f..c19a016642c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -687,6 +690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -826,6 +830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1357,6 +1362,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1418,6 +1424,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5133,6 +5140,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7908,6 +7917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8029,6 +8039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8042,6 +8053,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8056,6 +8068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 92ed35fbaf5..88d241d3341 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -687,6 +690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -826,6 +830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1357,6 +1362,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1418,6 +1424,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5133,6 +5140,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7908,6 +7917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8029,6 +8039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8042,6 +8053,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8056,6 +8068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index e1c379f6846..34b00b03846 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -519,6 +521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -684,6 +687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -822,6 +826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1353,6 +1358,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1414,6 +1420,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5115,6 +5122,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7885,6 +7894,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8006,6 +8016,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8019,6 +8030,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8033,6 +8045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index cc5079dbdf6..db60388b0e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -519,6 +521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -684,6 +687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -822,6 +826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1352,6 +1357,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1413,6 +1419,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5102,6 +5109,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7865,6 +7874,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7986,6 +7996,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7999,6 +8010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8013,6 +8025,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 9ea6b092e5f..ec11903b6da 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5076,6 +5083,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7821,6 +7830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7941,6 +7951,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7954,6 +7965,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7968,6 +7980,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 1a2be620a02..963aec2889b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5072,6 +5079,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7815,6 +7824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7935,6 +7945,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7948,6 +7959,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7962,6 +7974,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 504fa4d85c1..49882800183 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5071,6 +5078,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7812,6 +7821,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7932,6 +7942,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7945,6 +7956,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7959,6 +7971,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 985207bf981..549ca45a4c6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5068,6 +5075,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7808,6 +7817,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7928,6 +7938,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7941,6 +7952,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7955,6 +7967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index dc08f47f1db..9247ad53615 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -345,6 +346,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -517,6 +519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -682,6 +685,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -820,6 +824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1350,6 +1355,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1411,6 +1417,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5063,6 +5070,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7799,6 +7808,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7919,6 +7929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7932,6 +7943,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7946,6 +7958,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index aebbecfc99b..ea209b42326 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -345,6 +346,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -516,6 +518,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -681,6 +684,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -819,6 +823,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1348,6 +1353,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1409,6 +1415,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5056,6 +5063,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7786,6 +7795,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_9"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_0"; "uulib" = dontDistribute super."uulib"; @@ -7905,6 +7915,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7918,6 +7929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7932,6 +7944,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index f4b0a609e18..0a55c99859e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -519,6 +521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -684,6 +687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -822,6 +826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1352,6 +1357,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1413,6 +1419,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5099,6 +5106,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7859,6 +7868,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7979,6 +7989,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7992,6 +8003,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8006,6 +8018,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 6deed8d4e6e..e11a53d66a4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5094,6 +5101,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7851,6 +7860,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7971,6 +7981,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7984,6 +7995,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7998,6 +8010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index fe4cb3bc54d..d287859de56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5092,6 +5099,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7847,6 +7856,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7967,6 +7977,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7980,6 +7991,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7994,6 +8006,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index b03d4ff5482..95d66b44ba5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5085,6 +5092,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7840,6 +7849,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7960,6 +7970,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7973,6 +7984,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7987,6 +7999,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_4"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 059a9271d64..547ba511273 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5080,6 +5087,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7834,6 +7843,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7954,6 +7964,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7967,6 +7978,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7981,6 +7993,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_4"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 9c0fdf8b87e..d76e4898be9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5078,6 +5085,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -7830,6 +7839,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7950,6 +7960,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7963,6 +7974,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7977,6 +7989,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_4"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 5bb19f53750..7ae2e87b2de 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -810,6 +814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1336,6 +1341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1397,6 +1403,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5004,6 +5011,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6003,6 +6012,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7702,6 +7712,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_9"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_0"; "uulib" = dontDistribute super."uulib"; @@ -7819,6 +7830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7832,6 +7844,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7846,6 +7859,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 1ab7bcd7883..f2d467b09b7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -810,6 +814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1336,6 +1341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1397,6 +1403,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5002,6 +5009,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6001,6 +6010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7700,6 +7710,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_9"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_0"; "uulib" = dontDistribute super."uulib"; @@ -7816,6 +7827,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7829,6 +7841,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7843,6 +7856,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index c83d0971755..7e571832448 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1329,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1388,6 +1394,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4958,6 +4965,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5944,6 +5953,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7622,6 +7632,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7738,6 +7749,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7751,6 +7763,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7765,6 +7778,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index f0b252c9c58..ee4d3dff5a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1328,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1387,6 +1393,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4951,6 +4958,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5935,6 +5944,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7609,6 +7619,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7725,6 +7736,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7738,6 +7750,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7752,6 +7765,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 7254bc9fc22..6164b7f58a5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1328,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1387,6 +1393,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4951,6 +4958,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5935,6 +5944,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7608,6 +7618,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7724,6 +7735,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7737,6 +7749,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7751,6 +7764,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 27a7143b618..0fbe54367a2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1328,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1387,6 +1393,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4949,6 +4956,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5932,6 +5941,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7604,6 +7614,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7720,6 +7731,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7733,6 +7745,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7747,6 +7760,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 6ec8ae7a2d0..1085c9d1353 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1327,6 +1332,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1386,6 +1392,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2845,6 +2852,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fb-persistent" = doDistribute super."fb-persistent_0_3_4"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; @@ -4945,6 +4953,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5928,6 +5938,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7598,6 +7609,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7713,6 +7725,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7726,6 +7739,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7740,6 +7754,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index a22a17aabfe..4a83050a9d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1327,6 +1332,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1386,6 +1392,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2842,6 +2849,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fb-persistent" = doDistribute super."fb-persistent_0_3_4"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; @@ -4942,6 +4950,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5921,6 +5931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7590,6 +7601,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7705,6 +7717,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7718,6 +7731,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7732,6 +7746,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 1afb1a85d25..a7d090ec36a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -507,6 +510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -668,6 +672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -803,6 +808,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1324,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1383,6 +1390,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2835,6 +2843,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4930,6 +4939,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5908,6 +5919,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7575,6 +7587,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7690,6 +7703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7703,6 +7717,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7717,6 +7732,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 4866458215e..631cf76ca52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -507,6 +510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -668,6 +672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -803,6 +808,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1323,6 +1329,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1381,6 +1388,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2831,6 +2839,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4922,6 +4931,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5898,6 +5909,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7563,6 +7575,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7677,6 +7690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7690,6 +7704,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7704,6 +7719,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 4d4f057cd77..86cf33685bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2825,6 +2833,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4914,6 +4923,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5887,6 +5898,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7551,6 +7563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7664,6 +7677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7677,6 +7691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7691,6 +7706,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index b8c71d52fab..71e429d0749 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2825,6 +2833,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4913,6 +4922,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5569,6 +5580,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5883,6 +5895,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7545,6 +7558,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7658,6 +7672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7671,6 +7686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7685,6 +7701,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 931739dc069..516d30ac378 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4998,6 +5005,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5996,6 +6005,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7695,6 +7705,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7811,6 +7822,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7824,6 +7836,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7838,6 +7851,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index ccf4fde37e0..c2b00edaebb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2821,6 +2829,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4908,6 +4917,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5564,6 +5575,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5877,6 +5889,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7538,6 +7551,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7650,6 +7664,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7663,6 +7678,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7677,6 +7693,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index b4918d0a2ab..71bf24dcb03 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2820,6 +2828,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4905,6 +4914,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5561,6 +5572,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5871,6 +5883,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7530,6 +7543,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7641,6 +7655,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7654,6 +7669,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7668,6 +7684,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 160d282b8a4..73f903022f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1320,6 +1326,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1378,6 +1385,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2819,6 +2827,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4902,6 +4911,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5557,6 +5568,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5867,6 +5879,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7526,6 +7539,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7637,6 +7651,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7650,6 +7665,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7664,6 +7680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index f5371685344..5660aee1eed 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4995,6 +5002,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5993,6 +6002,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7691,6 +7701,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7807,6 +7818,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7820,6 +7832,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7834,6 +7847,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 2ad1eafc03c..2dde8fb4a0e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4993,6 +5000,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5988,6 +5997,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7684,6 +7694,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7800,6 +7811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7813,6 +7825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7827,6 +7840,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index ef87cdc0300..1302aaeebee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4990,6 +4997,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5985,6 +5994,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7680,6 +7690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7796,6 +7807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7809,6 +7821,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7823,6 +7836,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 0f3b0cd07e8..cb01a3ab274 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1332,6 +1337,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1393,6 +1399,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4983,6 +4990,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5977,6 +5986,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7670,6 +7680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7786,6 +7797,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7799,6 +7811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7813,6 +7826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 7b5f7834a3a..44648738255 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -672,6 +675,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -807,6 +811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1330,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1391,6 +1397,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4981,6 +4988,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5975,6 +5984,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7668,6 +7678,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7784,6 +7795,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7797,6 +7809,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7811,6 +7824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index f5b7c75b2e9..1c0294f8e04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1329,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1390,6 +1396,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4976,6 +4983,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5970,6 +5979,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7658,6 +7668,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7774,6 +7785,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7787,6 +7799,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7801,6 +7814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index c0c1a3bf361..72761449f4c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1329,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1388,6 +1394,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4967,6 +4974,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5957,6 +5966,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -7641,6 +7651,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7757,6 +7768,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7770,6 +7782,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7784,6 +7797,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index ec4bcc7dd06..a4a309a141e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -190,6 +190,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -202,6 +203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -326,6 +328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -491,6 +494,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -651,6 +655,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -781,6 +786,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1275,6 +1281,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1331,6 +1338,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1830,6 +1838,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2049,6 +2058,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "courier" = doDistribute super."courier_0_1_0_15"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; @@ -2699,6 +2709,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -3013,6 +3024,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3457,6 +3469,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3472,6 +3485,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4289,6 +4303,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4455,6 +4470,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4676,6 +4692,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4730,6 +4748,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5298,6 +5317,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5592,6 +5612,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6440,6 +6461,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -7177,6 +7199,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7284,6 +7307,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7295,6 +7319,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_1"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7306,6 +7331,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7560,6 +7586,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index fc4908636a0..f4705ae236b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -190,6 +190,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -202,6 +203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -326,6 +328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -491,6 +494,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -651,6 +655,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -781,6 +786,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1273,6 +1279,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1329,6 +1336,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1827,6 +1835,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2046,6 +2055,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "courier" = doDistribute super."courier_0_1_0_15"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; @@ -2694,6 +2704,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -3007,6 +3018,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3451,6 +3463,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3466,6 +3479,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4282,6 +4296,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4448,6 +4463,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4669,6 +4685,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4722,6 +4740,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5284,10 +5303,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5581,6 +5602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6428,6 +6450,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -7165,6 +7188,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7271,6 +7295,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7282,6 +7307,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_1"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7293,6 +7319,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7545,6 +7572,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 7c6047af510..a6b4ffa8b86 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -648,6 +652,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -778,6 +783,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1269,6 +1275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1325,6 +1332,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1823,6 +1831,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2042,6 +2051,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "courier" = doDistribute super."courier_0_1_0_15"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; @@ -2689,6 +2699,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -3001,6 +3012,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3444,6 +3456,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3459,6 +3472,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4274,6 +4288,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4439,6 +4454,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4659,6 +4675,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4712,6 +4730,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5274,10 +5293,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5570,6 +5591,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6411,6 +6433,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -7146,6 +7169,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7252,6 +7276,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7262,6 +7287,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7273,6 +7299,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7523,6 +7550,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 3d5a72cd547..dac1d68ca46 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -777,6 +782,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1267,6 +1273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1323,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1820,6 +1828,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2035,6 +2044,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2680,6 +2690,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2991,6 +3002,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3434,6 +3446,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3449,6 +3462,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4262,6 +4276,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4427,6 +4442,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4647,6 +4663,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4700,6 +4718,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5259,10 +5278,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5555,6 +5576,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6388,6 +6410,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6913,6 +6936,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -7119,6 +7143,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7225,6 +7250,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7235,6 +7261,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7246,6 +7273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7494,6 +7522,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 5e50f98075f..624c48a0542 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -777,6 +782,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1267,6 +1273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1323,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1819,6 +1827,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2034,6 +2043,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2679,6 +2689,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2990,6 +3001,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3433,6 +3445,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3448,6 +3461,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4261,6 +4275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4426,6 +4441,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4646,6 +4662,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4699,6 +4717,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5257,10 +5276,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5553,6 +5574,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6384,6 +6406,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6908,6 +6931,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -7114,6 +7138,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7220,6 +7245,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7230,6 +7256,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7241,6 +7268,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7488,6 +7516,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 224ad46f41f..69854c8a3ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -776,6 +781,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1229,6 +1235,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_5"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1263,6 +1270,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asic" = dontDistribute super."asic"; "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; + "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1319,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1814,6 +1824,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_13"; "clash-lib" = doDistribute super."clash-lib_0_5_11"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_8"; "clash-verilog" = doDistribute super."clash-verilog_0_5_8"; @@ -2028,6 +2039,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2673,6 +2685,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2981,6 +2994,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3423,6 +3437,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3438,6 +3453,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4246,6 +4262,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4411,6 +4428,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4630,6 +4648,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4683,6 +4703,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5239,10 +5260,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5530,6 +5553,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6358,6 +6382,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6480,6 +6505,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_13"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; @@ -6876,6 +6902,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -6910,6 +6937,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "twitter" = dontDistribute super."twitter"; "twitter-conduit" = dontDistribute super."twitter-conduit"; "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-feed" = doDistribute super."twitter-feed_0_2_0_3"; "twitter-types" = dontDistribute super."twitter-types"; "twitter-types-lens" = dontDistribute super."twitter-types-lens"; "tx" = dontDistribute super."tx"; @@ -7081,6 +7109,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7187,6 +7216,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7197,6 +7227,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7208,6 +7239,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7448,6 +7480,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 82abdcfd64c..f4b25c6283c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ConstraintKinds" = dontDistribute super."ConstraintKinds"; "Consumer" = dontDistribute super."Consumer"; "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; "Contract" = dontDistribute super."Contract"; "Control-Engine" = dontDistribute super."Control-Engine"; "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Hayoo" = dontDistribute super."Hayoo"; "Hclip" = dontDistribute super."Hclip"; "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; "Hermes" = dontDistribute super."Hermes"; "Hieroglyph" = dontDistribute super."Hieroglyph"; "HiggsSet" = dontDistribute super."HiggsSet"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "NanoProlog" = dontDistribute super."NanoProlog"; "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; "Neks" = dontDistribute super."Neks"; "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; @@ -776,6 +781,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ReviewBoard" = dontDistribute super."ReviewBoard"; "RichConditional" = dontDistribute super."RichConditional"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1227,6 +1233,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_5"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1261,6 +1268,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asic" = dontDistribute super."asic"; "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; + "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1317,6 +1326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1808,7 +1818,13 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "claferwiki" = dontDistribute super."claferwiki"; "clanki" = dontDistribute super."clanki"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_14"; + "clash-lib" = doDistribute super."clash-lib_0_5_12"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_9"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_9"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "clckwrks" = dontDistribute super."clckwrks"; @@ -2019,6 +2035,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2657,6 +2674,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2964,6 +2982,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3403,6 +3422,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3418,6 +3438,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4222,6 +4243,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4385,6 +4407,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4602,6 +4625,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4655,6 +4680,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5209,10 +5235,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5498,6 +5526,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6214,6 +6243,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -6321,6 +6351,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6443,6 +6474,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_13"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; @@ -6838,6 +6870,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -6872,6 +6905,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "twitter" = dontDistribute super."twitter"; "twitter-conduit" = dontDistribute super."twitter-conduit"; "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-feed" = doDistribute super."twitter-feed_0_2_0_3"; "twitter-types" = dontDistribute super."twitter-types"; "twitter-types-lens" = dontDistribute super."twitter-types-lens"; "tx" = dontDistribute super."tx"; @@ -7042,6 +7076,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7147,6 +7182,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7157,6 +7193,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; @@ -7167,6 +7204,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7406,6 +7444,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ef4755cc206..01cc139665a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1691,6 +1691,32 @@ self: { license = "GPL"; }) {}; + "BlogLiterately_0_8_1_2" = callPackage + ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs + , containers, data-default, directory, filepath, HaXml, haxr + , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc + , pandoc-types, parsec, process, split, strict, temporary + , transformers + }: + mkDerivation { + pname = "BlogLiterately"; + version = "0.8.1.2"; + sha256 = "740cf96f8d9b38d20740cc44440329632f2d5508fb42d9bf52f52052c33ed672"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bool-extras bytestring cmdargs containers + data-default directory filepath HaXml haxr highlighting-kate + hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec + process split strict temporary transformers + ]; + executableHaskellDepends = [ base cmdargs ]; + homepage = "http://byorgey.wordpress.com/blogliterately/"; + description = "A tool for posting Haskelly articles to blogs"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "BlogLiterately-diagrams_0_1_4_3" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe @@ -3202,6 +3228,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ContextAlgebra" = callPackage + ({ mkDerivation, base, containers, lattices, multiset }: + mkDerivation { + pname = "ContextAlgebra"; + version = "0.1.0.0"; + sha256 = "e3acf793d5766ed33fc386adbc64ffd6b99ce77657465b29ca557cc978698ded"; + libraryHaskellDepends = [ base containers lattices multiset ]; + jailbreak = true; + description = "Context Algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Contract" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -3484,7 +3522,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV" = callPackage + "DAV_1_0_7" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, either, exceptions, http-client, http-client-tls , http-types, lens, mtl, network, network-uri, optparse-applicative @@ -3511,9 +3549,10 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV_1_2" = callPackage + "DAV" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, http-client, http-client-tls , http-types, lens, mtl, mtl-compat, network, network-uri @@ -3541,7 +3580,6 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBlimited" = callPackage @@ -5709,16 +5747,17 @@ self: { }) {}; "FunGEn" = callPackage - ({ mkDerivation, base, GLUT, OpenGL, random }: + ({ mkDerivation, base, base-compat, GLUT, OpenGL, random }: mkDerivation { pname = "FunGEn"; - version = "0.4.6.1"; - sha256 = "d72dfb90f5f971d5c07024d39540d2a216ed1e55964358a222038a26904a3e6d"; + version = "1.0"; + sha256 = "119cb0c6bff7a5cf416f0c94a535a0695e4e461105841fed516d207f8c648686"; + revision = "4"; + editedCabalFile = "7994da4a472d9460df18724f7e96cece4ccd4a62516d76f26d14701ceed19623"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base GLUT OpenGL random ]; + libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; executableHaskellDepends = [ base GLUT OpenGL random ]; - jailbreak = true; homepage = "http://joyful.com/fungen"; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; @@ -5795,7 +5834,7 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5809,7 +5848,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5871,7 +5910,36 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + + "GLM" = callPackage + ({ mkDerivation, aeson, base, bytestring, interpolate, lens, mtl + , parsec, pureMD5, QuickCheck, test-framework + , test-framework-quickcheck2, test-framework-th, transformers + }: + mkDerivation { + pname = "GLM"; + version = "0.5.0.0"; + sha256 = "cf0e0a4e3e0f05a700158adf48e470c9bb77a820219000bf91a29ac0c3725a0f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring interpolate lens mtl parsec pureMD5 QuickCheck + test-framework test-framework-quickcheck2 test-framework-th + transformers + ]; + executableHaskellDepends = [ + aeson base bytestring interpolate lens mtl parsec pureMD5 + test-framework test-framework-quickcheck2 test-framework-th + ]; + testHaskellDepends = [ + base lens mtl parsec test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "http://github.com/sordina/GLM"; + description = "Simple Gridlab-D GLM parser and utilities"; + license = stdenv.lib.licenses.mit; + }) {}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -6833,6 +6901,7 @@ self: { base bytestring directory inline-r process singletons tasty tasty-golden tasty-hunit text vector ]; + doCheck = false; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -7480,7 +7549,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xlibs) libX11;}; + inherit (pkgs.xorg) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -9438,6 +9507,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HerbiePlugin" = callPackage + ({ mkDerivation, base, deepseq, directory, ghc, mtl, process + , sqlite-simple, subhask, template-haskell, text + }: + mkDerivation { + pname = "HerbiePlugin"; + version = "0.1.0.0"; + sha256 = "c8bbadbc2eee99dc92921335c591a8bfbc6ca11bb47477abfeaa48e3dcd5c8d4"; + libraryHaskellDepends = [ + base deepseq directory ghc mtl process sqlite-simple + template-haskell text + ]; + testHaskellDepends = [ subhask ]; + homepage = "github.com/mikeizbicki/herbie-haskell"; + description = "automatically improve your code's numeric stability"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Hermes" = callPackage ({ mkDerivation, AES, base, bytestring, cereal, containers , hslogger, monads-tf, network, old-time, random, random-shuffle @@ -9572,6 +9659,7 @@ self: { array base containers directory filepath libgraph mtl process RBTree regex-posix template-haskell threepenny-gui ]; + jailbreak = true; homepage = "http://maartenfaddegon.nl"; description = "Lighweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; @@ -12597,6 +12685,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "NearContextAlgebra" = callPackage + ({ mkDerivation, base, containers, ContextAlgebra, lattices + , multiset, QuickCheck + }: + mkDerivation { + pname = "NearContextAlgebra"; + version = "0.1.0.0"; + sha256 = "151ec5dc8583c72415936d8c043b3e0f884801c5be28f1389f724e837447a06a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers ContextAlgebra lattices multiset QuickCheck + ]; + jailbreak = true; + description = "Context Algebra of near"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Neks" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, directory , hashable, messagepack, network, stm, vector @@ -14098,8 +14204,8 @@ self: { ({ mkDerivation, alsaLib, base }: mkDerivation { pname = "PortMidi"; - version = "0.1.5.1"; - sha256 = "77c49d3084210b0dabdd04b3d3ad9003964a710ba41ac9a9ddf472aa20b80cda"; + version = "0.1.5.2"; + sha256 = "b855a9f3c0b9796e9e8fe00bbfad47fd233e648b31c3443881f4dfa544800276"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; homepage = "http://haskell.org/haskellwiki/PortMidi"; @@ -15235,6 +15341,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "RoyalMonad" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "RoyalMonad"; + version = "1000.9"; + sha256 = "99bf6ccf65077396f305d18993c23ab8acb85fc38e2bed82638bc4918ee13dbe"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/atzeus/RoyalMonad"; + description = "All hail the Royal Monad!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: mkDerivation { @@ -18444,9 +18562,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs.xlibs) libXrender;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -18462,7 +18580,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11;}; + }) {inherit (pkgs.xorg) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -18514,7 +18632,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -18551,7 +18669,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) xinput;}; + }) {inherit (pkgs.xorg) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -18619,7 +18737,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXau;}; + }) {inherit (pkgs.xorg) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -26770,7 +26888,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_1" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26801,7 +26919,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_2" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26832,7 +26950,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_4" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26862,9 +26980,9 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; - "arbtt" = callPackage + "arbtt_0_9_0_5" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -26891,7 +27009,37 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libXScrnSaver;}; + + "arbtt" = callPackage + ({ mkDerivation, aeson, array, base, binary, bytestring + , bytestring-progress, containers, deepseq, directory, filepath + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 + }: + mkDerivation { + pname = "arbtt"; + version = "0.9.0.6"; + sha256 = "f5f066f471761ed48388b3a80beff4ae3deaa7845666a513fa30dadf7dc4d5ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bytestring bytestring-progress containers + deepseq directory filepath parsec pcre-light strict + terminal-progress-bar time transformers unix utf8-string X11 + ]; + executableSystemDepends = [ libXScrnSaver ]; + testHaskellDepends = [ + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string + ]; + homepage = "http://arbtt.nomeata.de/"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_7" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26921,7 +27069,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -27687,7 +27835,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-encoding" = callPackage + "asn1-encoding_0_9_2" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck, text }: @@ -27705,9 +27853,10 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-encoding_0_9_3" = callPackage + "asn1-encoding" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck, text }: @@ -27723,7 +27872,6 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-parse_0_9_0" = callPackage @@ -27758,12 +27906,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "asn1-parse_0_9_3" = callPackage + "asn1-parse_0_9_4" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: mkDerivation { pname = "asn1-parse"; - version = "0.9.3"; - sha256 = "b06a3a1d642cb55844841a68a98ffc92dbf94fbc9b126d177725b537bef5dca4"; + version = "0.9.4"; + sha256 = "c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring ]; @@ -27773,7 +27921,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-types" = callPackage + "asn1-types_0_3_0" = callPackage ({ mkDerivation, base, bytestring, hourglass }: mkDerivation { pname = "asn1-types"; @@ -27783,9 +27931,10 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1-types"; description = "ASN.1 types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-types_0_3_1" = callPackage + "asn1-types" = callPackage ({ mkDerivation, base, bytestring, hourglass, memory }: mkDerivation { pname = "asn1-types"; @@ -27795,7 +27944,6 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1-types"; description = "ASN.1 types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1dump" = callPackage @@ -29024,6 +29172,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avatar-generator" = callPackage + ({ mkDerivation, base, JuicyPixels, random }: + mkDerivation { + pname = "avatar-generator"; + version = "0.1.0.1"; + sha256 = "ff87c2530ce71ae090c4f29d41c0765652746a93b91f99a53d5125a3dd37369c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base JuicyPixels random ]; + jailbreak = true; + homepage = "http://github.com/keera-studios/avatar-generator"; + description = "A simple random avatar icon generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "average" = callPackage ({ mkDerivation, base, semigroups, vector-space }: mkDerivation { @@ -32398,10 +32561,10 @@ self: { doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; - inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; - inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; inherit (pkgs) mesa;}; "bindings-K8055" = callPackage @@ -36963,6 +37126,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-debian_4_31_6" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, bytestring + , bzlib, Cabal, containers, data-default, deepseq, Diff, directory + , exceptions, filepath, HaXml, hsemail, HUnit, lens, ListLike + , memoize, mtl, network, network-uri, newtype-generics, old-locale + , optparse-applicative, parsec, pretty, process, process-extras + , pureMD5, regex-compat, regex-tdfa, set-extra, syb + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib + }: + mkDerivation { + pname = "cabal-debian"; + version = "4.31.6"; + sha256 = "1cda07da0628d412fdda3862ce819d29c59c5c5bb5fe7a49e06938771c0c9894"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bifunctors bytestring bzlib Cabal containers + data-default deepseq Diff directory exceptions filepath HaXml + hsemail HUnit lens ListLike memoize mtl network network-uri + newtype-generics old-locale optparse-applicative parsec pretty + process process-extras pureMD5 regex-compat regex-tdfa set-extra + syb template-haskell text time unix Unixutils utf8-string zlib + ]; + executableHaskellDepends = [ + base Cabal lens mtl pretty Unixutils + ]; + testHaskellDepends = [ + base Cabal containers Diff directory filepath hsemail HUnit lens + pretty process text + ]; + homepage = "https://github.com/ddssff/cabal-debian"; + description = "Create a Debianization for a Cabal package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-dependency-licenses" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { @@ -41328,7 +41527,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_5_14" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, directory, filepath, ghc, ghc-typelits-natnormalise @@ -41351,9 +41550,10 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc_0_5_15" = callPackage + "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, directory, filepath, ghc, ghc-typelits-natnormalise @@ -41373,11 +41573,9 @@ self: { process text transformers unbound-generics unix unordered-containers ]; - jailbreak = true; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-lib_0_5_10" = callPackage @@ -41426,7 +41624,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib" = callPackage + "clash-lib_0_5_12" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -41446,9 +41644,10 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib_0_5_13" = callPackage + "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -41468,10 +41667,9 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude" = callPackage + "clash-prelude_0_9_2" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck , singletons, template-haskell, th-lift @@ -41490,9 +41688,10 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude_0_9_3" = callPackage + "clash-prelude" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck , singletons, template-haskell, th-lift @@ -41509,7 +41708,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -41561,7 +41759,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog" = callPackage + "clash-systemverilog_0_5_9" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41576,9 +41774,10 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog_0_5_10" = callPackage + "clash-systemverilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41593,7 +41792,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-verilog_0_5_7" = callPackage @@ -41632,7 +41830,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-verilog" = callPackage + "clash-verilog_0_5_9" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41647,9 +41845,10 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-verilog_0_5_10" = callPackage + "clash-verilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41664,7 +41863,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-vhdl_0_5_8" = callPackage @@ -41703,7 +41901,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl" = callPackage + "clash-vhdl_0_5_11" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41718,9 +41916,10 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl_0_5_12" = callPackage + "clash-vhdl" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41735,7 +41934,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -42335,14 +42533,14 @@ self: { , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp , safecopy, stm, tagsoup, text, time, time-locale-compat - , unordered-containers, userid, utf8-string, uuid, vector - , web-plugins, web-routes, web-routes-happstack, web-routes-hsp - , web-routes-th, xss-sanitize + , unordered-containers, userid, utf8-string, uuid-orphans + , uuid-types, vector, web-plugins, web-routes, web-routes-happstack + , web-routes-hsp, web-routes-th, xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.23.9"; - sha256 = "7d4c1b4d181b8c974e8472c43c72a1c226e4806f430e49d07f07039c511df51b"; + version = "0.23.10"; + sha256 = "7e85091501c7a91a51c17920b415e764f20b730f1bf59ad0e0cc5be9b777cbe7"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -42350,12 +42548,11 @@ self: { happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm tagsoup text time - time-locale-compat unordered-containers userid utf8-string uuid - vector web-plugins web-routes web-routes-happstack web-routes-hsp - web-routes-th xss-sanitize + time-locale-compat unordered-containers userid utf8-string + uuid-orphans uuid-types vector web-plugins web-routes + web-routes-happstack web-routes-hsp web-routes-th xss-sanitize ]; librarySystemDepends = [ openssl ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -42439,8 +42636,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.14"; - sha256 = "22075fc30d0795c1954bee0887e856d60e15bc2ccdd3e4b611c3a898441230d3"; + version = "0.6.15"; + sha256 = "1e6e9747a27e24258448b98d82217f9f69317beea18e4607accab1aa3df0ee88"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -42448,7 +42645,6 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -42463,8 +42659,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.13"; - sha256 = "9c044fe6bda21cde985ce04de9a7b8f7f2598696b7f7071a8121003b7093d148"; + version = "0.6.14"; + sha256 = "6a6928e0e768c8c23061de9046250a699bbc7870804d9c9cbff9044f32870bd6"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -42472,7 +42668,6 @@ self: { web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -42488,8 +42683,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.0"; - sha256 = "9a4f39714cbbca951403b06a057b64cb2fad8b55a36fe33ad127f9fbdaef0249"; + version = "0.4.1"; + sha256 = "1fb68c812f3ce260d92df7a6b614c80bea443347ad95612edb8c73160099fbc0"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -42497,7 +42692,6 @@ self: { tagsoup template-haskell text time time-locale-compat uuid web-plugins web-routes web-routes-happstack web-routes-th ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -42515,6 +42709,7 @@ self: { base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -47548,7 +47743,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "country-codes" = callPackage + "country-codes_0_1_2" = callPackage ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup , text }: @@ -47564,9 +47759,10 @@ self: { homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "country-codes_0_1_3" = callPackage + "country-codes" = callPackage ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup , text }: @@ -47582,7 +47778,6 @@ self: { homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "courier_0_1_0_15" = callPackage @@ -52467,8 +52662,8 @@ self: { }: mkDerivation { pname = "dead-code-detection"; - version = "0.1.2"; - sha256 = "522d4646c3e509759cf68e29fa2748d67014d9a623f2db61861e4e7cf2b2bc6c"; + version = "0.2"; + sha256 = "21335b4567f89145af60dca72ad77990662c06ecc75ad7f65e892ae6620925ca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52561,6 +52756,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debian_3_89" = callPackage + ({ mkDerivation, base, bytestring, bzlib, containers, directory + , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl + , network, network-uri, old-locale, parsec, pretty, process + , process-extras, pureMD5, regex-compat, regex-tdfa + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib + }: + mkDerivation { + pname = "debian"; + version = "3.89"; + sha256 = "ec0da528635c8438f26f29a60f12c3ff606ec696ab641cf40b56b1d5ec92401c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib containers directory either exceptions + filepath HaXml HUnit ListLike mtl network network-uri old-locale + parsec pretty process process-extras pureMD5 regex-compat + regex-tdfa template-haskell text time unix Unixutils utf8-string + zlib + ]; + executableHaskellDepends = [ + base directory filepath HaXml pretty process unix + ]; + testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ]; + homepage = "https://github.com/ddssff/debian-haskell"; + description = "Modules for working with the Debian package system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debian-binary" = callPackage ({ mkDerivation, base, directory, filepath, HSH }: mkDerivation { @@ -53920,6 +54145,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-builder_0_7_2_0" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cmdargs + , diagrams-cairo, diagrams-lib, diagrams-postscript + , diagrams-rasterific, diagrams-svg, directory, exceptions + , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens + , lucid-svg, mtl, split, transformers + }: + mkDerivation { + pname = "diagrams-builder"; + version = "0.7.2.0"; + sha256 = "b41c5022404ea59d5b2c545d77486ed44c3ce2501e5f127ea823bf511e09ad8e"; + configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-orphans cmdargs diagrams-lib directory exceptions + filepath hashable haskell-src-exts hint lens mtl split transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs diagrams-cairo diagrams-lib + diagrams-postscript diagrams-rasterific diagrams-svg directory + filepath JuicyPixels lens lucid-svg + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "hint-based build service for the diagrams graphics EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-cairo_1_2_0_4" = callPackage ({ mkDerivation, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, directory @@ -54523,6 +54777,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-haddock_0_3_0_7" = callPackage + ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring + , Cabal, cautious-file, cmdargs, containers, cpphs + , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath + , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec + , QuickCheck, split, strict, tasty, tasty-quickcheck, text + , uniplate + }: + mkDerivation { + pname = "diagrams-haddock"; + version = "0.3.0.7"; + sha256 = "27899e0fb4e3fc1f230374dfc872ffa658c6d797b6cfe8858f312637e1b694a3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base base64-bytestring bytestring cautious-file + containers cpphs diagrams-builder diagrams-lib diagrams-svg + directory filepath haskell-src-exts lens linear lucid-svg mtl + parsec split strict text uniplate + ]; + executableHaskellDepends = [ + base Cabal cmdargs cpphs directory filepath + ]; + testHaskellDepends = [ + base containers haskell-src-exts lens parsec QuickCheck tasty + tasty-quickcheck + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Preprocessor for embedding diagrams in Haddock documentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-hsqml" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, hsqml, lens, text, transformers @@ -54559,6 +54846,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-html5_1_3_0_3" = callPackage + ({ mkDerivation, base, cmdargs, containers, data-default-class + , diagrams-core, diagrams-lib, lens, mtl, NumInstances + , optparse-applicative, split, statestack, static-canvas, text + }: + mkDerivation { + pname = "diagrams-html5"; + version = "1.3.0.3"; + sha256 = "319d8a79041abd91030d12a6b04196ed986432d0bd44a7c6f12505d5364b692b"; + libraryHaskellDepends = [ + base cmdargs containers data-default-class diagrams-core + diagrams-lib lens mtl NumInstances optparse-applicative split + statestack static-canvas text + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-lib_1_2_0_7" = callPackage ({ mkDerivation, active, array, base, colour, containers , data-default-class, diagrams-core, dual-tree, filepath @@ -54823,6 +55130,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-postscript_1_3_0_3" = callPackage + ({ mkDerivation, base, containers, data-default-class + , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens + , monoid-extras, mtl, semigroups, split, statestack + }: + mkDerivation { + pname = "diagrams-postscript"; + version = "1.3.0.3"; + sha256 = "fd2a98a447a3383be967bbef9ed0262e91d7270b5ce9e2eeed7b2ba4cfebf7e9"; + libraryHaskellDepends = [ + base containers data-default-class diagrams-core diagrams-lib dlist + filepath hashable lens monoid-extras mtl semigroups split + statestack + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Postscript backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-qrcode" = callPackage ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib }: @@ -54906,6 +55233,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rasterific_1_3_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable + , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split + , unix + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.3.1.4"; + sha256 = "6fb0d254d7959dd624d5918830601941bed87c4f37f2c625e24107af0560b78d"; + libraryHaskellDepends = [ + base bytestring containers data-default-class diagrams-core + diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl + optparse-applicative Rasterific split unix + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Rasterific backend for diagrams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-rubiks-cube" = callPackage ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: mkDerivation { @@ -55025,6 +55373,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-svg_1_3_1_5" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, colour + , containers, diagrams-core, diagrams-lib, directory, filepath + , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl + , old-time, optparse-applicative, process, semigroups, split, text + , time + }: + mkDerivation { + pname = "diagrams-svg"; + version = "1.3.1.5"; + sha256 = "dbb850c21d1df466e1aadc81f74373fb4ec9f774079a27cf9c97aa99bba0ec30"; + libraryHaskellDepends = [ + base base64-bytestring bytestring colour containers diagrams-core + diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg + monoid-extras mtl old-time optparse-applicative process semigroups + split text time + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "SVG backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-tikz" = callPackage ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }: mkDerivation { @@ -55870,12 +56241,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_2_3_1" = callPackage + "directory_1_2_4_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.3.1"; - sha256 = "250a07a1e67be4a6381c2637f99ad7c0ff948eb1f09b727c5f5fcddc192afc87"; + version = "1.2.4.0"; + sha256 = "f80eb093f772f4be6c9c6d4d179b6cb2358ef40a62f7f9e52bfc6df643268517"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -63963,7 +64334,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fb" = callPackage + "fb_1_0_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, cereal, conduit, conduit-extra , containers, crypto-api, cryptohash, cryptohash-cryptoapi @@ -63992,9 +64363,10 @@ self: { homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fb_1_0_12" = callPackage + "fb" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, cereal, conduit, conduit-extra , containers, crypto-api, cryptohash, cryptohash-cryptoapi @@ -64019,10 +64391,10 @@ self: { text time transformers ]; jailbreak = true; + doCheck = false; homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent_0_3_4" = callPackage @@ -68405,26 +68777,26 @@ self: { }) {}; "funbot" = callPackage - ({ mkDerivation, aeson, base, bytestring, feed, feed-collect, HTTP - , http-listen, irc-fun-bot, irc-fun-color, network-uri, settings - , text, time, time-interval, time-units, transformers - , unordered-containers, vcs-web-hook-parse + ({ mkDerivation, aeson, base, bytestring, feed, feed-collect + , funbot-ext-events, HTTP, http-client, http-client-tls + , http-listen, irc-fun-bot, irc-fun-color, json-state, network-uri + , settings, tagsoup, text, time, time-interval, time-units + , transformers, unordered-containers, utf8-string + , vcs-web-hook-parse }: mkDerivation { pname = "funbot"; - version = "0.1.0.0"; - sha256 = "56cc9eec189f2d7f08ca3c47fb435606a796edcfe0823a2fc44626ccb0164c6b"; - revision = "1"; - editedCabalFile = "2173918811f07e0ac13ca1d9948e6a4aa48dbcd310e04ad6f23d8c549360fb20"; + version = "0.2"; + sha256 = "ce68139f253485451abfc91326f43a8cb711aa7d6f765ca67de3c6ce33f8cb48"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring feed feed-collect HTTP http-listen - irc-fun-bot irc-fun-color network-uri settings text time - time-interval time-units transformers unordered-containers + aeson base bytestring feed feed-collect funbot-ext-events HTTP + http-client http-client-tls http-listen irc-fun-bot irc-fun-color + json-state network-uri settings tagsoup text time time-interval + time-units transformers unordered-containers utf8-string vcs-web-hook-parse ]; - jailbreak = true; homepage = "https://notabug.org/fr33domlover/funbot/"; description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; @@ -71243,7 +71615,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gipeda" = callPackage + "gipeda_0_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers , directory, extra, filepath, gitlib, gitlib-libgit2, scientific , shake, split, tagged, text, unordered-containers, vector, yaml @@ -71262,9 +71634,10 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gipeda_0_2" = callPackage + "gipeda" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers , directory, extra, filepath, gitlib, gitlib-libgit2, scientific , shake, split, tagged, text, unordered-containers, vector, yaml @@ -71283,7 +71656,6 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -74137,17 +74509,13 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, tasty, tasty-golden - , text - }: + ({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }: mkDerivation { pname = "graphql"; - version = "0.2.1"; - sha256 = "4ad90b450052590b8a9bfffd0080aac24fabf11d0b6838891ccd0cac40cf4968"; + version = "0.3"; + sha256 = "7f141c9507c135baf49491461060333e30128b49287f9b72de2875cef8420ba2"; libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ - attoparsec base bytestring tasty tasty-golden text - ]; + testHaskellDepends = [ attoparsec base tasty tasty-hunit text ]; homepage = "https://github.com/jdnavarro/graphql-haskell"; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -78752,8 +79120,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.1.5"; - sha256 = "203026967ec479957db08ad4109fb488eed254403064d7843deb8202b6c71ae2"; + version = "2.2.0"; + sha256 = "7093ae69b6be698102f87df7851eafbdeb830f55467083aea06bd8b11adf5078"; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default filepath happstack-hsp @@ -82847,7 +83215,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql-postgres" = callPackage + "hasql-postgres_0_10_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , directory, doctest, either, filepath, free, hashable, hashtables , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude @@ -82876,9 +83244,10 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-postgres"; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql-postgres_0_10_6" = callPackage + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , directory, doctest, either, filepath, free, hashable, hashtables , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude @@ -82903,10 +83272,10 @@ self: { scientific text time vector ]; jailbreak = true; + doCheck = false; homepage = "https://github.com/nikita-volkov/hasql-postgres"; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-postgres-options" = callPackage @@ -83324,7 +83693,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr" = callPackage + "haxr_3000_11_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -83343,9 +83712,10 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr_3000_11_1_2" = callPackage + "haxr" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -83364,7 +83734,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -89659,7 +90028,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -90632,8 +91001,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.7.1"; - sha256 = "f5bc40349949593d04fb9b501850bc95da03cd0aa2664ec95204073d8a4b0de6"; + version = "0.8.0"; + sha256 = "cd5f5cac842cfedb187f25b8932020e6f9e7c287d0477393330050af0d8e20db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92874,8 +93243,8 @@ self: { ({ mkDerivation, base, deepseq, HUnit, tagged }: mkDerivation { pname = "hset"; - version = "2.0.0"; - sha256 = "f8e0a3064ba59518450f548613a7d8b6752b834bc2dcad37db3ca696b360353d"; + version = "2.1.0"; + sha256 = "34471dc94721e12e3b85f9b32ec2c20e3d1fce62f4306e3542fa60b40aba5b97"; libraryHaskellDepends = [ base deepseq tagged ]; testHaskellDepends = [ base HUnit tagged ]; homepage = "https://bitbucket.org/s9gf4ult/hset"; @@ -100045,8 +100414,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "0.9.19"; - sha256 = "1525b7e9c716d1d09520b8e6cb599dad24ced6161e01a4c864fd7fc636405ff3"; + version = "0.9.19.1"; + sha256 = "ec61914e6099e1159157f1528348b2b67c46808a97fabd6a5f9d4addb60ec480"; configureFlags = [ "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -100062,7 +100431,6 @@ self: { executableHaskellDepends = [ base directory filepath haskeline transformers ]; - jailbreak = true; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; @@ -102899,17 +103267,15 @@ self: { "irc-fun-bot" = callPackage ({ mkDerivation, aeson, base, fast-logger, irc-fun-client - , irc-fun-messages, settings, time, time-interval, time-units + , irc-fun-messages, json-state, time, time-interval, time-units , transformers, unordered-containers }: mkDerivation { pname = "irc-fun-bot"; - version = "0.2.0.0"; - sha256 = "2fc0ac4354117782b425b0b801624c85e46ad3a91c42e3f44f52618ffb0da37a"; - revision = "1"; - editedCabalFile = "12d2e79fef0ee2a48f5cc2d333cf97cfe5c19f82c6ba371547f55994538131e7"; + version = "0.3.0.0"; + sha256 = "e6c6bb7419a53a778509d2e6d5366ab0c39910eceb8a36c6362663cdb25578a1"; libraryHaskellDepends = [ - aeson base fast-logger irc-fun-client irc-fun-messages settings + aeson base fast-logger irc-fun-client irc-fun-messages json-state time time-interval time-units transformers unordered-containers ]; jailbreak = true; @@ -102925,8 +103291,8 @@ self: { }: mkDerivation { pname = "irc-fun-client"; - version = "0.1.1.0"; - sha256 = "00a2191a2a26d5c973f890fcd5cb618e4142acf8ff370b067708de1ed7fb52bc"; + version = "0.2.0.0"; + sha256 = "032c59b494afa94637db7e7bc2257fa210527e4336279dd988647fbbec449b74"; libraryHaskellDepends = [ auto-update base fast-logger irc-fun-messages network time time-units unordered-containers @@ -104702,7 +105068,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype" = callPackage + "json-autotype_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -104732,9 +105098,10 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype_1_0_10" = callPackage + "json-autotype" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -104764,7 +105131,6 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-b" = callPackage @@ -108809,27 +109175,6 @@ self: { }) {}; "language-nix" = callPackage - ({ mkDerivation, base, deepseq, doctest, lens, pretty, QuickCheck - , regex-posix - }: - mkDerivation { - pname = "language-nix"; - version = "2"; - sha256 = "9e39e96ced9da6a878fc647d8cec623e3ab5469249dac20cdb42971b9ad00fc6"; - revision = "2"; - editedCabalFile = "b6ccb47d33cc5e3d7c4a23caf3a3b2c2c1c17b34bc159256808e8f034a48b951"; - libraryHaskellDepends = [ base deepseq lens pretty regex-posix ]; - testHaskellDepends = [ - base deepseq doctest lens pretty QuickCheck regex-posix - ]; - doCheck = false; - homepage = "https://github.com/peti/language-nix"; - description = "Data types and useful functions to represent and manipulate the Nix language"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; - }) {}; - - "language-nix_2_1" = callPackage ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens , pretty, QuickCheck }: @@ -108843,10 +109188,10 @@ self: { testHaskellDepends = [ base base-compat Cabal deepseq doctest lens pretty QuickCheck ]; + doCheck = false; homepage = "https://github.com/peti/language-nix#readme"; description = "Data types and useful functions to represent and manipulate the Nix language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -109228,7 +109573,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lattices" = callPackage + "lattices_1_3" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , unordered-containers }: @@ -109242,9 +109587,10 @@ self: { homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lattices_1_4" = callPackage + "lattices" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck , semigroups, tagged, tasty, tasty-quickcheck, transformers , universe-base, universe-reverse-instances, unordered-containers @@ -109266,7 +109612,6 @@ self: { homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -110737,8 +111082,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.5"; - sha256 = "21124236aec58c454fcd46aa5a192c65ecfa43b0b5b151378d5a648a08b3de5f"; + version = "1.6"; + sha256 = "9970e5390e4ca52d3e1ba32af0b428d6baecebf97c658d6d2b86c33c5b469cd5"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -114473,6 +114818,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {objc = null;}; + "luminance" = callPackage + ({ mkDerivation, base, contravariant, gl, mtl, resourcet + , semigroups, transformers, void + }: + mkDerivation { + pname = "luminance"; + version = "0.1"; + sha256 = "1bd7bb005ed35d876c2c6703a9bcb6402b6a2d379b55b0a78344fafef97bb217"; + libraryHaskellDepends = [ + base contravariant gl mtl resourcet semigroups transformers void + ]; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, dependently-typed and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "luminance-samples" = callPackage + ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels + , luminance, mtl, resourcet, transformers, vector + }: + mkDerivation { + pname = "luminance-samples"; + version = "0.1.1"; + sha256 = "52f139848fec2cfd691af9ce2fd054bd82ca325bf2cea465a8b6c920248eb31e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base contravariant GLFW-b JuicyPixels luminance mtl resourcet + transformers vector + ]; + jailbreak = true; + homepage = "https://github.com/phaazon/luminance-samples"; + description = "Luminance samples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lushtags" = callPackage ({ mkDerivation, base, haskell-src-exts, text, vector }: mkDerivation { @@ -115401,6 +115782,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "managed_1_0_1" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "managed"; + version = "1.0.1"; + sha256 = "d2efbf081803303fb42b7bc105004a49be6f41719ad3e817400cba3a504dcb5f"; + libraryHaskellDepends = [ base transformers ]; + description = "A monad for managed values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "manatee" = callPackage ({ mkDerivation, base, binary, cairo, containers, dbus-client , dbus-core, derive, directory, filepath, gtk, gtk-serialized-event @@ -115911,29 +116304,6 @@ self: { }) {}; "mandrill" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - }: - mkDerivation { - pname = "mandrill"; - version = "0.4.0.0"; - sha256 = "495c8e1863140df809275f1972ec0b2514d78790650a68413c7bf103780205a5"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time - ]; - testHaskellDepends = [ - aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mandrill_0_4_1_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck @@ -115954,7 +116324,6 @@ self: { ]; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mandulia" = callPackage @@ -115976,7 +116345,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mangopay" = callPackage + "mangopay_1_11_4" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, bytestring, case-insensitive , conduit, conduit-extra, connection, country-codes, data-default @@ -116014,9 +116383,10 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mangopay_1_11_5" = callPackage + "mangopay" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, bytestring, case-insensitive , conduit, conduit-extra, connection, country-codes, data-default @@ -116050,10 +116420,10 @@ self: { template-haskell text time tls transformers transformers-base unordered-containers utf8-string vector wai warp x509-system ]; + doCheck = false; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds" = callPackage @@ -119177,29 +119547,6 @@ self: { }) {}; "moesocks" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens - , lens-aeson, mtl, network, optparse-applicative, random, stm - , strict, text, time, transformers, unix, unordered-containers - }: - mkDerivation { - pname = "moesocks"; - version = "1.0.0.10"; - sha256 = "29902a8d0e3640c0a27673ee0b31690607f5f6d3dc973b0f7fda74b5fe0da6e6"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL iproute lens lens-aeson mtl network - optparse-applicative random stm strict text time transformers unix - unordered-containers - ]; - homepage = "https://github.com/nfjinjing/moesocks"; - description = "A functional firewall killer"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "moesocks_1_0_0_20" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens , lens-aeson, mtl, network, optparse-applicative, random, stm @@ -119220,7 +119567,6 @@ self: { homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -123564,23 +123910,6 @@ self: { }) {}; "nationstates" = callPackage - ({ mkDerivation, base, bytestring, clock, containers, http-client - , http-client-tls, http-types, multiset, transformers, xml - }: - mkDerivation { - pname = "nationstates"; - version = "0.3.0.1"; - sha256 = "d5d352ba075f8b42c7eca4f15562bc85197f8832bb0145608f70c3f2fbbe3a39"; - libraryHaskellDepends = [ - base bytestring clock containers http-client http-client-tls - http-types multiset transformers xml - ]; - homepage = "https://github.com/lfairy/nationstates"; - description = "NationStates API client"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "nationstates_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client , http-client-tls, http-types, multiset, transformers, xml }: @@ -123595,7 +123924,6 @@ self: { homepage = "https://github.com/lfairy/nationstates"; description = "NationStates API client"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nats" = callPackage @@ -127230,7 +127558,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage @@ -129734,7 +130062,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-citeproc" = callPackage + "pandoc-citeproc_0_7_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -129762,9 +130090,10 @@ self: { ]; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-citeproc_0_7_4" = callPackage + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -129792,7 +130121,6 @@ self: { ]; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-crossref" = callPackage @@ -129934,7 +130262,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types" = callPackage + "pandoc-types_1_12_4_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , deepseq-generics, ghc-prim, syb }: @@ -129948,9 +130276,10 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types_1_12_4_6" = callPackage + "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , deepseq-generics, ghc-prim, syb }: @@ -129964,7 +130293,6 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -134651,6 +134979,7 @@ self: { sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340"; libraryHaskellDepends = [ base monad-control mongoDB pipes ]; testHaskellDepends = [ base monad-control mongoDB pipes text ]; + doCheck = false; homepage = "http://github.com/jb55/pipes-mongodb"; description = "Stream results from MongoDB"; license = stdenv.lib.licenses.mit; @@ -136760,7 +137089,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-simple_0_5_0_0" = callPackage + "postgresql-simple_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash, hashable, HUnit, postgresql-libpq, scientific @@ -136768,8 +137097,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.5.0.0"; - sha256 = "820799a45f715938e7c5b427e1e273a6116cd616e8b210843ad462f7f299ed1f"; + version = "0.5.0.1"; + sha256 = "1b045b957533eba33fd7a93bf4b4aecc685cdb6592b635a2a383b71502efcb6c"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable postgresql-libpq scientific @@ -137786,7 +138115,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "primitive" = callPackage + "primitive_0_6" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -137797,9 +138126,10 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "primitive_0_6_1_0" = callPackage + "primitive" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -137810,7 +138140,6 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primula-board" = callPackage @@ -139165,6 +139494,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "psc-ide_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, directory, either + , filepath, hspec, lens, lens-aeson, mtl, network + , optparse-applicative, parsec, regex-tdfa, text, wreq + }: + mkDerivation { + pname = "psc-ide"; + version = "0.2.0.0"; + sha256 = "4b670a9e698c1c2b89d7041c3378a59ada3028b7e535fb377b2d979ed7e36ac4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers directory either filepath lens lens-aeson mtl + parsec regex-tdfa text wreq + ]; + executableHaskellDepends = [ + base directory mtl network optparse-applicative text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/kRITZCREEK/psc-ide"; + description = "Language support for the PureScript programming language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pseudo-boolean" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , containers, deepseq, dlist, hashable, HUnit, parsec, QuickCheck @@ -141977,15 +142331,20 @@ self: { }) {}; "react-flux" = callPackage - ({ mkDerivation, aeson, base, deepseq, mtl, text }: + ({ mkDerivation, aeson, base, bytestring, deepseq, mtl + , template-haskell, text, time, unordered-containers + }: mkDerivation { pname = "react-flux"; - version = "0.9.4"; - sha256 = "3e030f6439f25fda59de81d487b289b76106e8d08985dba4e444892deb62e4b6"; + version = "1.0.0"; + sha256 = "3318ec6fcb6b8e6efc2033f366a1cbb11b850e39935dd86513e3c73b0c341e26"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ aeson base deepseq mtl text ]; - executableHaskellDepends = [ base deepseq ]; + libraryHaskellDepends = [ + aeson base bytestring deepseq mtl template-haskell text time + unordered-containers + ]; + executableHaskellDepends = [ base deepseq text time ]; homepage = "https://bitbucket.org/wuzzeb/react-flux"; description = "A binding to React based on the Flux application architecture for GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -145443,6 +145802,8 @@ self: { pname = "rest-example"; version = "0.2.0.2"; sha256 = "f1d66ed2a8d6f700cb60b5d046afe20010ac909cd3004d55cca75c2ee13fb88e"; + revision = "1"; + editedCabalFile = "b0f11f80fe7f78fb76fc0ccb243eb54fe7177a6eef051abbcb2409f8fc79aab2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145794,6 +146155,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-gen_0_18_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder + , directory, fclabels, filepath, hashable, haskell-src-exts + , HStringTemplate, HUnit, hxt, json-schema, pretty, process + , rest-core, safe, scientific, semigroups, split, test-framework + , test-framework-hunit, text, uniplate, unordered-containers + , vector + }: + mkDerivation { + pname = "rest-gen"; + version = "0.18.0.0"; + sha256 = "bca52143478e12a5fc91630c0df7f2206f8f60639d3a6cc568e4772696e92787"; + libraryHaskellDepends = [ + aeson base blaze-html Cabal code-builder directory fclabels + filepath hashable haskell-src-exts HStringTemplate hxt json-schema + pretty process rest-core safe scientific semigroups split text + uniplate unordered-containers vector + ]; + testHaskellDepends = [ + base fclabels haskell-src-exts HUnit rest-core test-framework + test-framework-hunit + ]; + description = "Documentation and client generation from rest definition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-happstack_0_2_10_3" = callPackage ({ mkDerivation, base, containers, happstack-server, mtl, rest-core , rest-gen, utf8-string @@ -145857,6 +146245,8 @@ self: { pname = "rest-happstack"; version = "0.2.10.8"; sha256 = "feec31c1a8ab85941ebfe1d5081e7809592a4d622a6951691c08b79d56603958"; + revision = "1"; + editedCabalFile = "647255beca0013110e88747224f545e198aba15f47af6d894c7313997cca2bc1"; libraryHaskellDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -147086,8 +147476,8 @@ self: { }: mkDerivation { pname = "roller"; - version = "0.1.3"; - sha256 = "1af09fc037e8678121d923179ffc7686f7c955a15f4b1187afdd18385067711d"; + version = "0.1.4"; + sha256 = "369a39d93d125550bc5ffc3dd21e89e2b04a611c7200935afbd303042b254fb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147096,8 +147486,7 @@ self: { executableHaskellDepends = [ base optparse-applicative random regex-applicative ]; - jailbreak = true; - homepage = "https://github.com/Econify/roller"; + homepage = "https://github.com/PiotrJustyna/roller"; description = "Playing with applicatives and dice!"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -148776,6 +149165,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sbv_5_0" = callPackage + ({ mkDerivation, array, async, base, containers, crackNum + , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl + , old-time, pretty, process, QuickCheck, random, syb + }: + mkDerivation { + pname = "sbv"; + version = "5.0"; + sha256 = "eeb19fb888234565c9e5cfda6c760ed4c4650e33ba52400684f9c1ae6c55497f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base containers crackNum data-binary-ieee754 deepseq + directory filepath mtl old-time pretty process QuickCheck random + syb + ]; + executableHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit process syb + ]; + testHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit syb + ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sc3-rdu" = callPackage ({ mkDerivation, base, hsc3, hsc3-db }: mkDerivation { @@ -151214,6 +151631,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant_0_4_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-conversion, case-insensitive, directory, doctest + , filemanip, filepath, hspec, http-media, http-types, network-uri + , parsec, QuickCheck, quickcheck-instances, string-conversions + , text, url + }: + mkDerivation { + pname = "servant"; + version = "0.4.4.3"; + sha256 = "13ca10419a1826a8ecd4b8cf762e58ed25ae31adaf4bdeb8d36c71dfa5869dc1"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-conversion + case-insensitive http-media http-types network-uri + string-conversions text + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring directory doctest filemanip + filepath hspec parsec QuickCheck quickcheck-instances + string-conversions text url + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-JuicyPixels_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -151261,8 +151705,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4.2"; - sha256 = "da58db6c24bb5360c3ee027061d7e9183667c1bdbde56d70f4f8e8fef982a47b"; + version = "0.4.4.3"; + sha256 = "8fca95f4325e10a290d6835c72bd31c69e22327548fcb2bc1094c66d3c3a5287"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -151348,6 +151792,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client_0_4_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq + , either, exceptions, hspec, http-client, http-client-tls + , http-media, http-types, HUnit, network, network-uri, QuickCheck + , safe, servant, servant-server, string-conversions, text + , transformers, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.4.4.3"; + sha256 = "e83b581ebdabd8d81173605fa40da1acc31f2115cd633188402ca5a5938854f6"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring either exceptions http-client + http-client-tls http-media http-types network-uri safe servant + string-conversions text transformers + ]; + testHaskellDepends = [ + aeson base bytestring deepseq either hspec http-client http-media + http-types HUnit network QuickCheck servant servant-server text wai + warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-docs_0_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , lens, servant, string-conversions, system-filepath, text @@ -151428,6 +151899,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-docs_0_4_4_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-conversion + , case-insensitive, hashable, hspec, http-media, http-types, lens + , servant, string-conversions, text, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.4.4.3"; + sha256 = "ca87fe6949cdda55e4745aa3c4863cd68ff3a3904d61a0d9baa556e2f364e89f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-conversion case-insensitive hashable + http-media http-types lens servant string-conversions text + unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring-conversion lens servant string-conversions + text + ]; + testHaskellDepends = [ + aeson base hspec lens servant string-conversions + ]; + homepage = "http://haskell-servant.github.io/"; + description = "generate API docs for your servant webservice"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -151460,8 +151960,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4.2"; - sha256 = "76edea7d08e6ee4e5c41e2056f34353dd4033ba4a171008b92e1d34f1cbd146c"; + version = "0.4.4.3"; + sha256 = "7ccdf278c8f5da6b3630040ec4eba3111eeedd2465d5047034f10372defcb760"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151543,12 +152043,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-jquery_0_4_4_3" = callPackage + ({ mkDerivation, aeson, base, charset, filepath, hspec + , hspec-expectations, language-ecmascript, lens, servant + , servant-server, stm, text, transformers, warp + }: + mkDerivation { + pname = "servant-jquery"; + version = "0.4.4.3"; + sha256 = "1ec131e7b48673c8c7d99f0422d287a34e81f55f6fb2b142377d8e5b4d9288f8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base charset lens servant text ]; + executableHaskellDepends = [ + aeson base filepath servant servant-server stm transformers warp + ]; + testHaskellDepends = [ + base hspec hspec-expectations language-ecmascript lens servant + ]; + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive (jquery) javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4.2"; - sha256 = "073cff7d8e1551d1300d9d5c74159f3a7912951ac1874080359406e6de9fed01"; + version = "0.4.4.3"; + sha256 = "6d6b836794f1f5bda94c15d4f7950913db3396a6f9d233fd88e43e4fdcb100d2"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -151561,8 +152085,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.4.4.2"; - sha256 = "d203424df5f2d0484f874f81ec98623c226ab89f5c232c3a884aa3b91230e7c6"; + version = "0.4.4.3"; + sha256 = "bef08a756d600298f8762a73bf2b25ceed2377a970c4eb69273cd7f7981753ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151792,6 +152316,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server_0_4_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-conversion, directory, doctest, either, exceptions + , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl + , network, network-uri, parsec, QuickCheck, safe, servant, split + , string-conversions, system-filepath, temporary, text + , transformers, wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "servant-server"; + version = "0.4.4.3"; + sha256 = "552ccb848fbb99c471f950412c12fe7a6081507678a4108d195299ecdc987fa0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring either filepath http-types mmorph + mtl network-uri safe servant split string-conversions + system-filepath text transformers wai wai-app-static warp + ]; + executableHaskellDepends = [ aeson base servant text wai warp ]; + testHaskellDepends = [ + aeson base bytestring bytestring-conversion directory doctest + either exceptions filemanip filepath hspec hspec-wai http-types mtl + network parsec QuickCheck servant string-conversions temporary text + transformers wai wai-extra warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -154771,7 +155327,7 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: @@ -155699,7 +156255,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie" = callPackage + "smoothie_0_4_1" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; @@ -155709,9 +156265,10 @@ self: { homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie_0_4_2_1" = callPackage + "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; @@ -155721,7 +156278,6 @@ self: { homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smsaero" = callPackage @@ -158406,7 +158962,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "spdx" = callPackage + "spdx_0_2_0_0" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; @@ -158419,9 +158975,10 @@ self: { homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "spdx_0_2_1_0" = callPackage + "spdx" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; @@ -158432,7 +158989,6 @@ self: { homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spe" = callPackage @@ -159583,6 +160139,7 @@ self: { retry temporary text transformers unix-compat ]; doCheck = false; + enableSharedExecutables = false; postInstall = '' exe=$out/bin/stack mkdir -p $out/share/bash-completion/completions @@ -159648,6 +160205,7 @@ self: { retry temporary text transformers unix-compat ]; doCheck = false; + enableSharedExecutables = false; postInstall = '' exe=$out/bin/stack mkdir -p $out/share/bash-completion/completions @@ -159714,6 +160272,7 @@ self: { retry temporary text transformers unix-compat ]; doCheck = false; + enableSharedExecutables = false; postInstall = '' exe=$out/bin/stack mkdir -p $out/share/bash-completion/completions @@ -162005,7 +162564,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-commons" = callPackage + "streaming-commons_0_1_13" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random , stm, text, transformers, unix, zlib @@ -162025,9 +162584,10 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-commons_0_1_14" = callPackage + "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random , stm, text, transformers, unix, zlib @@ -162047,7 +162607,6 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-histogram" = callPackage @@ -163627,6 +164186,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "syb_0_6" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl }: + mkDerivation { + pname = "syb"; + version = "0.6"; + sha256 = "a38d1f7e6a40e2c990fec85215c45063a508bf73df98a4483ec78c5025b66cdc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers HUnit mtl ]; + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "syb-extras" = callPackage ({ mkDerivation, base, eq, prelude-extras }: mkDerivation { @@ -165922,8 +166495,8 @@ self: { }: mkDerivation { pname = "tasty-lens"; - version = "0.3"; - sha256 = "f8cfd37a5f1da283b99ec0398757510cfbf2affe2004cbf49745e8eb32b69fdd"; + version = "0.3.1"; + sha256 = "06d947e738ef28ba74983fd611f76611483a384d4c637b126419ac61068ce90a"; libraryHaskellDepends = [ base lens smallcheck smallcheck-lens tasty tasty-smallcheck ]; @@ -169443,8 +170016,8 @@ self: { }: mkDerivation { pname = "tighttp"; - version = "0.0.0.8"; - sha256 = "279189c5265c434a8dc73367a1420646577578cc9912a492f13bde74fcbb7175"; + version = "0.0.0.9"; + sha256 = "8b73c5ae1f631621b3e67f9665e5b1dc886c60b16f608f3f929653c21dae1b96"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -170413,6 +170986,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_3_3" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, hourglass, memory, mtl + , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 + , x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.3.3"; + sha256 = "9f03fb059198e1f3d866d1297f86fca3204d07e7cc5e8f7e8ad878be48f1ca24"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default-class hourglass mtl + QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + jailbreak = true; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug_0_3_4" = callPackage ({ mkDerivation, base, bytestring, cprng-aes, crypto-pubkey , data-default-class, network, pem, time, tls, x509, x509-system @@ -170454,6 +171053,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-debug_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, time, tls, x509, x509-store, x509-system + , x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.1"; + sha256 = "0051e7f978cde5825317d0ff9220f15dd4ed13512eec30246ec1ff268d00f42c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem time tls + x509 x509-store x509-system x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -171931,7 +172551,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tttool" = callPackage + "tttool_1_4_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline , JuicyPixels, mtl, parsec, process, random, template-haskell, time @@ -171951,9 +172571,10 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tttool_1_4_0_5" = callPackage + "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline , JuicyPixels, mtl, parsec, process, random, template-haskell, time @@ -171973,7 +172594,6 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tubes" = callPackage @@ -172617,7 +173237,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed" = callPackage + "twitter-feed_0_2_0_3" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework , test-framework-hunit @@ -172635,9 +173255,10 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed_0_2_0_4" = callPackage + "twitter-feed" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework , test-framework-hunit @@ -172655,7 +173276,6 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types" = callPackage @@ -176159,6 +176779,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "uuid-orphans" = callPackage + ({ mkDerivation, base, safecopy, text, uuid-types, web-routes }: + mkDerivation { + pname = "uuid-orphans"; + version = "1.3.11.1"; + sha256 = "264028379dc6bfea1d84ebd6c745d666c51957430822b52480dd6413717a8b75"; + libraryHaskellDepends = [ + base safecopy text uuid-types web-routes + ]; + description = "Orphan instances for the UUID datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uuid-quasi" = callPackage ({ mkDerivation, base, template-haskell, uuid }: mkDerivation { @@ -179381,6 +180014,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-middleware-content-type" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring + , clay, containers, http-media, http-types, lucid, mtl, shakespeare + , text, transformers, wai, wai-transformers, wai-util + }: + mkDerivation { + pname = "wai-middleware-content-type"; + version = "0.0.0"; + sha256 = "067e44b377f653e3e67853f1f756cc1bf891547a83e4311aac55728537595d36"; + libraryHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay containers + http-media http-types lucid mtl shakespeare text transformers wai + wai-transformers wai-util + ]; + description = "Route to different middlewares based on the incoming Accept header"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-crowd" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession @@ -179709,6 +180360,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-verbs" = callPackage + ({ mkDerivation, base, bifunctors, composition-extra, containers + , errors, http-types, mtl, transformers, wai, wai-transformers + }: + mkDerivation { + pname = "wai-middleware-verbs"; + version = "0.0.1"; + sha256 = "35ff8b93b7a971888aace1b4d2e64d3a7820ae2b6e8e5d0e1abdf05b800b42d3"; + libraryHaskellDepends = [ + base bifunctors composition-extra containers errors http-types mtl + transformers wai wai-transformers + ]; + description = "Route different middleware responses based on the incoming HTTP verb"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-predicates_0_8_4" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types @@ -179841,26 +180508,27 @@ self: { , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types , mime-types, monad-loops, mtl, path-pieces, random - , template-haskell, text, wai + , template-haskell, text, wai, wai-app-static, wai-extra }: mkDerivation { pname = "wai-routes"; - version = "0.8.1"; - sha256 = "0ebdf952830d550a6f56bf048ae7f554c88ab8fa0f3a3b613569f620133d41d2"; + version = "0.9.0"; + sha256 = "67a287a1a2347ce4239bce87ecf4b8845866b52493981a58ea4f48654d9ebd8e"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types monad-loops mtl path-pieces random template-haskell text wai + wai-app-static wai-extra ]; testHaskellDepends = [ - aeson base hspec hspec-wai hspec-wai-json wai + aeson base hspec hspec-wai hspec-wai-json wai wai-app-static ]; homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; }) {}; - "wai-routes_0_9_0" = callPackage + "wai-routes_0_9_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types @@ -179869,8 +180537,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.9.0"; - sha256 = "67a287a1a2347ce4239bce87ecf4b8845866b52493981a58ea4f48654d9ebd8e"; + version = "0.9.1"; + sha256 = "156c4c065fc94da10d6af66abf3c14d0dafb25b785d7b6d953347da6fd17dcd3"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -179878,7 +180546,7 @@ self: { wai-app-static wai-extra ]; testHaskellDepends = [ - aeson base hspec hspec-wai hspec-wai-json wai wai-app-static + aeson base hspec hspec-wai hspec-wai-json text wai ]; homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; @@ -180029,6 +180697,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-transformers" = callPackage + ({ mkDerivation, base, composition-extra, transformers, wai }: + mkDerivation { + pname = "wai-transformers"; + version = "0.0.1"; + sha256 = "c8d478a3f5ed775ccdca324e6d042d3e4978935cea553b2139eb442b1f5805eb"; + libraryHaskellDepends = [ + base composition-extra transformers wai + ]; + description = "Simple parameterization of Wai's Application type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-util" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , http-accept, http-types, network-uri, text, transformers, wai @@ -183510,12 +184191,12 @@ self: { ({ mkDerivation, base, directory, random, wx, wxcore }: mkDerivation { pname = "wxAsteroids"; - version = "1.0"; - sha256 = "79116cdf32d6569f3c681e3ccce2dcf0aebc843cc1c3591445cec20f57829a57"; + version = "1.1"; + sha256 = "91fa3fe53f24d28fbbdfd6af0431471baf4b76cc77447366457829522d615d42"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random wx wxcore ]; - homepage = "http://www.haskell.org/haskellwiki/wxAsteroids"; + homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183553,7 +184234,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -183713,7 +184394,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libXi;}; "x509_1_5_0_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -183810,15 +184491,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "x509_1_6_2" = callPackage + "x509_1_6_3" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck }: mkDerivation { pname = "x509"; - version = "1.6.2"; - sha256 = "06e1675ffe9c49055f1419f37adce8fa8692bdda463cd863587ca579305b2f3f"; + version = "1.6.3"; + sha256 = "36c62877046e7ecd6c913da4c21264e18eb56f7cba7abb5d41c42e95845fbade"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -185447,8 +186128,8 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - }) {Xrender = null; inherit (pkgs.xlibs) libXpm; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xorg) libXpm; + inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -185950,7 +186631,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXtst;}; + }) {inherit (pkgs.xorg) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft @@ -186995,14 +187676,13 @@ self: { }: mkDerivation { pname = "yesod-angular"; - version = "0.1.0.1"; - sha256 = "edbfe8ad341813b80855776f71a5246cd6cb723dc009acb2d8834974347c4ab8"; + version = "0.1.0.2"; + sha256 = "27f5f4b53db1474d2d019d84047e73c5ee0da07c55379f76709df0f5fa2a9b1e"; libraryHaskellDepends = [ aeson base containers shakespeare template-haskell text transformers yesod ]; - jailbreak = true; - description = "Yesod Angular JS integration"; + description = "Angular JS integratoin"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -188854,16 +189534,16 @@ self: { }) {}; "yesod-content-pdf" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, directory - , network-uri, process, temporary, yesod-core + ({ mkDerivation, base, blaze-builder, blaze-html, bytestring + , conduit, directory, network-uri, process, temporary, yesod-core }: mkDerivation { pname = "yesod-content-pdf"; - version = "0.1.0.1"; - sha256 = "b97f088141602f0598df0bd00e3f12be23396fa6395c4b6e6a1e21c47d86091b"; + version = "0.1.0.2"; + sha256 = "26cf3132c03deedc76b672b979c4c0588f341109df7f142031ca456d5271a547"; libraryHaskellDepends = [ - base blaze-html bytestring directory network-uri process temporary - yesod-core + base blaze-builder blaze-html bytestring conduit directory + network-uri process temporary yesod-core ]; testHaskellDepends = [ base ]; homepage = "https://github.com/alexkyllo/yesod-content-pdf#readme"; @@ -190035,7 +190715,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-mangopay" = callPackage + "yesod-mangopay_1_11_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra , containers, country-codes, data-default, directory, fast-logger , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay @@ -190067,9 +190747,10 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-mangopay_1_11_5" = callPackage + "yesod-mangopay" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra , containers, country-codes, data-default, directory, fast-logger , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay @@ -190101,7 +190782,6 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-markdown" = callPackage @@ -192343,6 +193023,8 @@ self: { pname = "zlib"; version = "0.6.1.1"; sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735"; + revision = "1"; + editedCabalFile = "e94fcf5a5822e569221c7897bdc15d9ddb31c0d844df0448cd388472d644b212"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ -- GitLab From 5c1afdd5f60989f533a62ba5b4b898680afad693 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Sep 2015 10:35:21 +0200 Subject: [PATCH 163/553] cabal2nix: update to version 20150922 --- .../tools/haskell/cabal2nix/cabal2nix.nix | 13 +++++----- .../cabal2nix/distribution-nixpkgs.nix | 24 ++++++++++--------- .../tools/haskell/cabal2nix/hackage2nix.nix | 18 ++++++++------ 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index c7cc21a823c..89a56f1dbad 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -1,16 +1,17 @@ -{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs -, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show -, stdenv, nix-prefetch-scripts, makeWrapper +{ mkDerivation, ansi-wl-pprint, base, Cabal, containers +, distribution-nixpkgs, language-nix, lens, optparse-applicative +, pretty, pretty-show, stdenv, text, yaml +, nix-prefetch-scripts, makeWrapper, fetchFromGitHub }: mkDerivation rec { pname = "cabal2nix"; - version = "20150903"; + version = "20150922"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; @@ -18,7 +19,7 @@ mkDerivation rec { enableSharedExecutables = false; executableHaskellDepends = [ ansi-wl-pprint base Cabal containers distribution-nixpkgs - language-nix lens optparse-applicative pretty pretty-show + language-nix lens optparse-applicative pretty pretty-show text yaml ]; executableToolDepends = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 694b452dd81..6c2243628da 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -1,31 +1,33 @@ { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq -, deepseq-generics, directory, doctest, fetchFromGitHub, filepath -, hackage-db, hspec, language-nix, lens, pretty, process, SHA -, split, stdenv, transformers, utf8-string +, deepseq-generics, directory, doctest, filepath, hackage-db +, hashable, hspec, language-nix, lens, pretty, process, QuickCheck +, SHA, split, stdenv, text, transformers, unordered-containers +, utf8-string, yaml, fetchFromGitHub }: mkDerivation rec { pname = "distribution-nixpkgs"; - version = "20150903"; + version = "20150922"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec language-nix lens - pretty process SHA split transformers utf8-string + aeson base bytestring Cabal containers deepseq-generics directory + filepath hackage-db hashable language-nix lens pretty process SHA + split text transformers unordered-containers utf8-string yaml ]; testHaskellDepends = [ aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec language-nix lens - pretty process SHA split transformers utf8-string + directory doctest filepath hackage-db hashable hspec language-nix + lens pretty process QuickCheck SHA split text transformers + unordered-containers utf8-string yaml ]; homepage = "https://github.com/nixos/cabal2nix#readme"; - description = "Convert Cabal files into Nix build instructions"; + description = "Data types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; } diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index 0f7a31652da..422ab0fb18f 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -1,24 +1,28 @@ -{ mkDerivation, base, Cabal, containers, distribution-nixpkgs -, fetchFromGitHub, filepath, language-nix, lens, monad-par -, monad-par-extras, mtl, optparse-applicative, pretty, stdenv +{ mkDerivation, aeson, base, bytestring, Cabal, containers +, deepseq-generics, directory, distribution-nixpkgs, filepath +, language-nix, lens, monad-par, monad-par-extras, mtl +, optparse-applicative, pretty, SHA, split, stackage-types, stdenv +, text, time, utf8-string, yaml, fetchFromGitHub }: mkDerivation rec { pname = "hackage2nix"; - version = "20150903"; + version = "20150922"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; isExecutable = true; enableSharedExecutables = false; executableHaskellDepends = [ - base Cabal containers distribution-nixpkgs filepath language-nix - lens monad-par monad-par-extras mtl optparse-applicative pretty + aeson base bytestring Cabal containers deepseq-generics directory + distribution-nixpkgs filepath language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty SHA split + stackage-types text time utf8-string yaml ]; postInstall = '' exe=$out/bin/${pname} -- GitLab From 8ce1f6efcd261912a826fccdc3713cbbf3e15380 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Tue, 22 Sep 2015 17:53:44 -0300 Subject: [PATCH 164/553] bump ghcjs, ghcjs-boot, ghcjs-shims --- pkgs/development/compilers/ghcjs/default.nix | 28 +++++++++++--------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 5423c41f25b..0c270bfc099 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -29,7 +29,7 @@ , lens , parallel, safe, shelly, split, stringsearch, syb , tar, terminfo -, vector, yaml, fetchgit, Cabal +, vector, yaml, fetchgit, fetchFromGitHub, Cabal , alex, happy, git, gnumake, autoconf, patch , automake, libtool , cryptohash @@ -40,23 +40,27 @@ let version = "0.1.0"; ghcjsBoot = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "d435c60b62d24b7a4117493f7aaecbfa09968fe6"; # 7.10 branch - sha256 = "07vhmjz21ccnqccms003550xacmwb08pjdkhnjcwcbl2603v4na1"; + url = "git://github.com/ghcjs/ghcjs-boot.git"; + rev = "ec9f795b42b40fd24933d1672db153df5a29cc00"; # master branch + sha256 = "0bkvqlsgb9n0faayi4k1dlkn9cbm99a66m9nnx1kykb44qcl40yg"; fetchSubmodules = true; }; - shims = fetchgit { - url = git://github.com/ghcjs/shims.git; - rev = "0b670ca27fff3f0bad515c37e56ccb8b4d6758fb"; # master branch - sha256 = "19zq79f2y59lw7c8m100awh3rcra5yhbsvpb5xmp3mq6grac7h08"; + shims = fetchFromGitHub { + owner = "ghcjs"; + repo = "shims"; + rev = "01e01dee31a4786b3d01092e72350b0859a9f8c9"; # master branch + sha256 = "01m1yhq6l71azx0zqbpzmqc6rxxf654hgjibc0lz2cg5942wh1hf"; }; in mkDerivation (rec { pname = "ghcjs"; inherit version; - src = fetchgit { - url = git://github.com/ghcjs/ghcjs.git; - rev = "39c1cb6d5d2551b306a7957a0e7f682f4a048490"; # master branch - sha256 = "1v2hpmhdssgf1jmchiwkvp5j8j6rw3k0hpkf326vb8l1b0kbmibr"; + # `src` is ghcjs's a3157072c2593debf2e45e751e9a8aa90b860b4d plus this + # additional dependency bump: https://github.com/ghcjs/ghcjs/pull/408 + src = fetchFromGitHub { + owner = "k0001"; + repo = "ghcjs"; + rev = "1b767e0b3dabdd1561bd17314d472651bfd9b97c"; + sha256 = "0j4vj47qljbcbrp3md3jwxwl2kz9k85visq6yi1x8wdch4wb2kgy"; }; isLibrary = true; isExecutable = true; -- GitLab From c8707db64c9c943e677a5c2d7f8422f9a2a7228e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 23 Sep 2015 16:31:15 +0200 Subject: [PATCH 165/553] yoshimi: update from 1.3.5.1 to 1.3.5.2 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9aafae7a5f4..cd334c4254f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.5.1"; + version = "1.3.5.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1c7049pnvadxndk1rbja77kyr0rwnqca2546pxjnxksg923s5l8n"; + sha256 = "001xvwknsm1sv5lvwz7f6dgf57b8djbpwbyk2gfxjy9rzl5q53qr"; }; buildInputs = [ -- GitLab From 69db836dbca3d581a40837f9f80bc41ffcaf2f14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Sep 2015 17:17:20 +0200 Subject: [PATCH 166/553] configuration-hackage2nix.yaml: fix evaluation errors on Darwin --- .../configuration-hackage2nix.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4fe1e013aec..36324b91c7e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -202,12 +202,19 @@ dont-distribute-packages: alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-core: [ x86_64-darwin ] + alsa-gui: [ x86_64-darwin ] alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-mixer: [ x86_64-darwin ] alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-pcm: [ x86_64-darwin ] alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-seq: [ x86_64-darwin ] altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] + ALUT: [ x86_64-darwin ] + al: [ x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -355,6 +362,7 @@ dont-distribute-packages: bindings-codec2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-common: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-dc1394: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-directfb: [ x86_64-darwin ] bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -367,7 +375,9 @@ dont-distribute-packages: bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-lxc: [ x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-sane: [ x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -727,6 +737,7 @@ dont-distribute-packages: curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] + cv-combinators: [ x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -820,6 +831,7 @@ dont-distribute-packages: dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-hsqml: [ x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -871,6 +883,7 @@ dont-distribute-packages: doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] + dotfs: [ x86_64-darwin ] download: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1087,6 +1100,7 @@ dont-distribute-packages: Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freenect: [ x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1102,6 +1116,8 @@ dont-distribute-packages: fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + FTGL-bytestring: [ x86_64-darwin ] + FTGL: [ x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1220,6 +1236,7 @@ dont-distribute-packages: graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphics-drawingcombinators: [ x86_64-darwin ] graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1238,6 +1255,7 @@ dont-distribute-packages: greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] + gridland: [ x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] GrowlNotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1382,6 +1400,8 @@ dont-distribute-packages: hash: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskakafka: [ x86_64-darwin ] + haskanoid: [ x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1478,6 +1498,7 @@ dont-distribute-packages: hcron: [ i686-linux, x86_64-linux, x86_64-darwin ] hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ] hcube: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcwiid: [ x86_64-darwin ] hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1534,6 +1555,7 @@ dont-distribute-packages: hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + HFuse: [ x86_64-darwin ] hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hgalib: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-API: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1570,6 +1592,8 @@ dont-distribute-packages: H: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hidapi: [ x86_64-darwin ] + hid: [ x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1605,6 +1629,7 @@ dont-distribute-packages: HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlibBladeRF: [ x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1667,6 +1692,7 @@ dont-distribute-packages: hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] + HOpenCV: [ x86_64-darwin ] hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1782,8 +1808,10 @@ dont-distribute-packages: hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-demo-notes: [ x86_64-darwin ] hsqml-demo-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml: [ x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] hstatistics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2105,6 +2133,7 @@ dont-distribute-packages: libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + libsystemd-journal: [ x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2152,6 +2181,7 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + logging-facade-journald: [ x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2182,6 +2212,7 @@ dont-distribute-packages: luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + lxc: [ x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2251,6 +2282,8 @@ dont-distribute-packages: Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-alsa: [ x86_64-darwin ] + midimory: [ x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2328,6 +2361,7 @@ dont-distribute-packages: mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-idl: [ i686-linux, x86_64-linux, x86_64-darwin ] + msi-kb-backlit: [ x86_64-darwin ] mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2370,6 +2404,7 @@ dont-distribute-packages: nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanomsg: [ x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2462,6 +2497,7 @@ dont-distribute-packages: onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAL: [ x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2497,6 +2533,7 @@ dont-distribute-packages: packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + pam: [ x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2607,6 +2644,7 @@ dont-distribute-packages: poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] + PortMidi: [ x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2633,6 +2671,7 @@ dont-distribute-packages: primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] printf-mauke: [ i686-linux, x86_64-linux, x86_64-darwin ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] + printxosd: [ x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2658,6 +2697,7 @@ dont-distribute-packages: propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] + proteaaudio: [ x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2711,6 +2751,7 @@ dont-distribute-packages: rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2842,7 +2883,9 @@ dont-distribute-packages: rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtlsdr: [ x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rubberband: [ x86_64-darwin ] ruff: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2899,6 +2942,8 @@ dont-distribute-packages: Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] + SDL-mixer: [ x86_64-darwin ] + sdr: [ x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2932,6 +2977,7 @@ dont-distribute-packages: sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] sext: [ i686-linux, x86_64-linux, x86_64-darwin ] + sfml-audio: [ x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3221,6 +3267,7 @@ dont-distribute-packages: tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + tidal-midi: [ x86_64-darwin ] tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3246,6 +3293,8 @@ dont-distribute-packages: toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokyotyrant-haskell: [ x86_64-darwin ] + tomato-rubato-openal: [ x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] Top: [ i686-linux, x86_64-linux, x86_64-darwin ] topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3278,6 +3327,7 @@ dont-distribute-packages: tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] + turing-music: [ x86_64-darwin ] twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3394,6 +3444,7 @@ dont-distribute-packages: Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] + vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3531,12 +3582,14 @@ dont-distribute-packages: xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmobar: [ x86_64-darwin ] xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + xosd: [ x86_64-darwin ] xournal-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3613,6 +3666,7 @@ dont-distribute-packages: zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] + ZEO: [ x86_64-darwin ] zeromq3-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] -- GitLab From efa5b92bfca97a23724faceeba06e6fdcfceeabe Mon Sep 17 00:00:00 2001 From: michael bishop Date: Wed, 23 Sep 2015 07:03:42 -0300 Subject: [PATCH 167/553] open-iscsi: 2.0-871 -> 2.0-873 remove the kernel patch, since the package no longer builds the module, its already in the kernel move it from the kernel function to the main all-packages list --- pkgs/os-specific/linux/open-iscsi/default.nix | 12 ++++-------- pkgs/os-specific/linux/open-iscsi/kernel.patch | 12 ------------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 pkgs/os-specific/linux/open-iscsi/kernel.patch diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 88ab08e6c3d..c4e39e45cad 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, kernel}: +{ stdenv, fetchurl }: let - pname = "open-iscsi-2.0-871"; + pname = "open-iscsi-2.0-873"; in stdenv.mkDerivation { - name = "${pname}-${kernel.version}"; + name = "${pname}"; src = fetchurl { url = "http://www.open-iscsi.org/bits/${pname}.tar.gz"; - sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw"; + sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx"; }; - KSRC = "${kernel.dev}/lib/modules/*/build"; DESTDIR = "$(out)"; preConfigure = '' sed -i 's|/usr/|/|' Makefile ''; - patches = [./kernel.patch]; - meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; - broken = true; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/kernel.patch b/pkgs/os-specific/linux/open-iscsi/kernel.patch deleted file mode 100644 index 48dfa195400..00000000000 --- a/pkgs/os-specific/linux/open-iscsi/kernel.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** open-iscsi-2.0-871/kernel/Makefile 2009-07-11 05:55:58.000000000 +0200 ---- open-iscsi-2.0-871-new/kernel/Makefile 2010-08-30 11:37:56.000000000 +0200 -*************** -*** 101,106 **** ---- 101,107 ---- - linux_2_6_29: $(unpatch_code) - - linux_2_6_30: $(unpatch_code) -+ linux_2_6_32: $(unpatch_code) - - - do_unpatch_code: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93004d8949b..bad50dd737d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9577,6 +9577,8 @@ let linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + openiscsi = callPackage ../os-specific/linux/open-iscsi { }; + # -- Linux kernel expressions ------------------------------------------------ linuxHeaders = linuxHeaders_3_12; @@ -9757,8 +9759,6 @@ let openafsClient = callPackage ../servers/openafs-client { }; - openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; -- GitLab From e9f2dc883074fbba612f4e57a7bff06a8a6420e7 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Fri, 18 Sep 2015 02:02:16 -0400 Subject: [PATCH 168/553] thunar: plugin improvements (close #9908) Improve thunar/thunarx so that thunar's plugin directory could be overriden using a `THUNARX_MODULE_DIR` environment variable so that plugins not built along with the `thunar` package could be installed as well. This could allow one to wrap `thunar` in a `thunar-with-plugins` package where plugins are declared instead of being found (a bit in the same fashion as gstreamer plugins). --- pkgs/desktops/xfce/core/thunar.nix | 2 + .../xfce/core/thunarx_plugins_directory.patch | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/desktops/xfce/core/thunarx_plugins_directory.patch diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 6e479454459..1ddab2b0752 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; + patches = [ ./thunarx_plugins_directory.patch ]; + buildInputs = [ pkgconfig intltool gtk dbus_glib libstartup_notification libnotify libexif pcre udev diff --git a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch new file mode 100644 index 00000000000..e1431d86b14 --- /dev/null +++ b/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch @@ -0,0 +1,48 @@ +diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c +index 31b8835..a3e7f4e 100644 +--- a/thunarx/thunarx-provider-factory.c ++++ b/thunarx/thunarx-provider-factory.c +@@ -141,12 +141,19 @@ static GList* + thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) + { + ThunarxProviderModule *module; ++ const gchar *thunar_dir; + const gchar *name; + GList *modules = NULL; + GList *lp; + GDir *dp; + +- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL); ++ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); ++ if (NULL == thunar_dir) ++ { ++ thunar_dir = THUNARX_DIRECTORY; ++ } ++ ++ dp = g_dir_open (thunar_dir, 0, NULL); + if (G_LIKELY (dp != NULL)) + { + /* determine the types for all existing plugins */ +diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c +index 023ad2a..6c21997 100644 +--- a/thunarx/thunarx-provider-module.c ++++ b/thunarx/thunarx-provider-module.c +@@ -174,10 +174,17 @@ static gboolean + thunarx_provider_module_load (GTypeModule *type_module) + { + ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module); ++ const gchar *thunar_dir; + gchar *path; ++ ++ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); ++ if (NULL == thunar_dir) ++ { ++ thunar_dir = THUNARX_DIRECTORY; ++ } + + /* load the module using the runtime link editor */ +- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL); ++ path = g_build_filename (thunar_dir, type_module->name, NULL); + module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + g_free (path); + -- GitLab From 9a1245280d4d4f5fb0263bca41063e5901afcc62 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Sep 2015 19:04:51 +0200 Subject: [PATCH 169/553] hol_light: add support for camlp5 > 6.12 --- .../science/logic/hol_light/Makefile.patch | 13 +++++++++++++ .../science/logic/hol_light/default.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/science/logic/hol_light/Makefile.patch diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch new file mode 100644 index 00000000000..2cb05f27a4f --- /dev/null +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -0,0 +1,13 @@ +Index: Makefile +=================================================================== +--- a/Makefile (révision 199) ++++ b/Makefile (copie de travail) +@@ -59,7 +59,7 @@ + then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ + else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ + then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ +- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ ++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" ; \ + then cp pa_j_3.1x_6.11.ml pa_j.ml; \ + else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ + fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 7653e137e26..8311ac46654 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml camlp5 ]; + patches = [ ./Makefile.patch ]; + installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light -- GitLab From 399a9da2ae1286c039f15fe6c9c502669dbd6809 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Sep 2015 19:05:02 +0200 Subject: [PATCH 170/553] camlp5: 6.12 -> 6.14 --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 1c811b21758..d9f36423430 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.12"; + name = "camlp5${if transitional then "_transitional" else ""}-6.14"; src = fetchurl { - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz; - sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp"; + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz; + sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89"; }; buildInputs = [ ocaml ]; -- GitLab From 8d2e4761c8eeabcdf07825af7d73989f36ad8016 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Fri, 18 Sep 2015 23:07:26 -0400 Subject: [PATCH 171/553] xfce.thunar-dropbox-plugin: init at 0.2.1 A thunar dropbox plugin that allows to copy links and add files to dropbox. Depends on new `xfce.thunarx-2-dev` plugin sdk package instead of thunar. Doing so seem standard on other distributions such as Ubuntu and narrows depedencies to only the sdk headers (i.e.: what's needed by plugins). Note that replacing the `xfce.thunarx-2-dev` dependency directly by `xfce.thunar` work equally well. However it now would be impossible for the `thunar` executable to depend on the plugin. Tests: - When dropbox daemon active, functionalities are added to right click on file and folders menu. - When dropbox daemon inactive, functionalities **not** added to menu. - Successfully copied a dropbox link. - Successfully moved a file to dropbox. --- pkgs/desktops/xfce/core/thunarx-2-dev.nix | 38 +++++++++++++++++ pkgs/desktops/xfce/default.nix | 3 ++ .../xfce/thunar-plugins/dropbox/default.nix | 42 +++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 pkgs/desktops/xfce/core/thunarx-2-dev.nix create mode 100644 pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix diff --git a/pkgs/desktops/xfce/core/thunarx-2-dev.nix b/pkgs/desktops/xfce/core/thunarx-2-dev.nix new file mode 100644 index 00000000000..2cce01b75e7 --- /dev/null +++ b/pkgs/desktops/xfce/core/thunarx-2-dev.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev +, exo, libxfce4util +, xfconf, libxfce4ui +}: + +stdenv.mkDerivation rec { + host_p_name = "thunar"; + p_name = "thunarx-2-dev"; + ver_maj = "1.6"; + ver_min = "6"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${host_p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; + sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + preBuild = '' + cd thunarx + ''; + + buildInputs = [ + pkgconfig intltool + gtk dbus_glib libstartup_notification libnotify libexif pcre udev + exo libxfce4util + xfconf libxfce4ui + ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://thunar.xfce.org/; + description = "Thunar Extension Framework"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f2a9f848342..f348c98e803 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -25,8 +25,11 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfce4util = callPackage ./core/libxfce4util.nix { }; libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; + thunarx-2-dev = callPackage ./core/thunarx-2-dev.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; + thunar-dropbox-plugin + = callPackage ./thunar-plugins/dropbox { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix new file mode 100644 index 00000000000..4027e5cb996 --- /dev/null +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig +, gtk +, thunarx-2-dev, python2 +}: + +stdenv.mkDerivation rec { + p_name = "thunar-dropbox-plugin"; + ver_maj = "0.2"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "http://softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-${ver_maj}.${ver_min}.tar.bz2"; + sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf"; + }; + + buildInputs = [ + pkgconfig + gtk + thunarx-2-dev python2 + ]; + + configurePhase = "python2 waf configure --prefix=$out"; + + buildPhase = "python2 waf"; + + installPhase = '' + python2 waf install + ''; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + + enableParallelBuilding = true; + + meta = { + homepage = http://softwarebakery.com/maato/thunar-dropbox.html; + description = "A plugin for thunar that adds context-menu items from dropbox"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + }; +} -- GitLab From 735f0f2ca8b9da0791554a6335f2f0b1238ffad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 19:12:36 +0200 Subject: [PATCH 172/553] thunar-dropbox-plugin: fixup after #9935 Close #9935. I don't think it's good to split thunarx into a separate derivation in this way. We would have the library and associated stuff twice and two expressions, etc. Distributions do these things by an analogy to multiple-output derivation (Debian does, for example), so we could use that, but it doesn't seem important in this case and would be better after #7701 anyway. --- pkgs/desktops/xfce/core/thunarx-2-dev.nix | 38 ------------------- pkgs/desktops/xfce/default.nix | 6 +-- .../xfce/thunar-plugins/dropbox/default.nix | 11 +++--- 3 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 pkgs/desktops/xfce/core/thunarx-2-dev.nix diff --git a/pkgs/desktops/xfce/core/thunarx-2-dev.nix b/pkgs/desktops/xfce/core/thunarx-2-dev.nix deleted file mode 100644 index 2cce01b75e7..00000000000 --- a/pkgs/desktops/xfce/core/thunarx-2-dev.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev -, exo, libxfce4util -, xfconf, libxfce4ui -}: - -stdenv.mkDerivation rec { - host_p_name = "thunar"; - p_name = "thunarx-2-dev"; - ver_maj = "1.6"; - ver_min = "6"; - - src = fetchurl { - url = "mirror://xfce/src/xfce/${host_p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; - sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"; - }; - name = "${p_name}-${ver_maj}.${ver_min}"; - - preBuild = '' - cd thunarx - ''; - - buildInputs = [ - pkgconfig intltool - gtk dbus_glib libstartup_notification libnotify libexif pcre udev - exo libxfce4util - xfconf libxfce4ui - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://thunar.xfce.org/; - description = "Thunar Extension Framework"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f348c98e803..a9903c941bf 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -25,11 +25,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfce4util = callPackage ./core/libxfce4util.nix { }; libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; - thunarx-2-dev = callPackage ./core/thunarx-2-dev.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; - thunar-dropbox-plugin - = callPackage ./thunar-plugins/dropbox { }; + thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; + thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 4027e5cb996..cf83386fa26 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , gtk -, thunarx-2-dev, python2 +, thunar, python2 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk - thunarx-2-dev python2 + thunar python2 ]; configurePhase = "python2 waf configure --prefix=$out"; @@ -30,13 +30,12 @@ stdenv.mkDerivation rec { preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://softwarebakery.com/maato/thunar-dropbox.html; description = "A plugin for thunar that adds context-menu items from dropbox"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + platforms = platforms.linux; }; } -- GitLab From 56b1f7934c9b07243e1c12a80f9125c74f6ad23b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 23 Sep 2015 20:28:29 +0200 Subject: [PATCH 173/553] modsecurity: init at 2.9.0 --- pkgs/tools/security/modsecurity/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/security/modsecurity/default.nix diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix new file mode 100644 index 00000000000..5ed6c9ecdc4 --- /dev/null +++ b/pkgs/tools/security/modsecurity/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchurl +, curl, apacheHttpd, pcre, apr, aprutil, libxml2 }: + +with lib; + +stdenv.mkDerivation rec { + name = "modsecurity-${version}"; + version = "2.9.0"; + + src = fetchurl { + url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; + sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434"; + }; + + buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ]; + configureFlags = [ + "--enable-standalone-module" + "--enable-static" + "--with-curl=${curl}" + "--with-apxs=${apacheHttpd}/bin/apxs" + "--with-pcre=${pcre}" + "--with-apr=${apr}" + "--with-apu=${aprutil}/bin/apu-1-config" + "--with-libxml=${libxml2}" + ]; + + outputs = ["out" "nginx"]; + + preBuild = '' + substituteInPlace apache2/Makefile.in --replace "install -D " "# install -D" + ''; + + postInstall = '' + mkdir -p $nginx + cp -R * $nginx + ''; + + meta = { + description = "Open source, cross-platform web application firewall (WAF)"; + license = licenses.asl20; + homepage = https://www.modsecurity.org/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3990a1f6326..6ad6207e6ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,6 +2231,8 @@ let modemmanager = callPackage ../tools/networking/modemmanager {}; + modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + monit = callPackage ../tools/system/monit { }; moreutils = callPackage ../tools/misc/moreutils { -- GitLab From 46828582abbfa7d45edb4528953cf6197b36d7f8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 23 Sep 2015 20:28:44 +0200 Subject: [PATCH 174/553] nginx: add support for modescurity --- pkgs/servers/http/nginx/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 7888a772e2a..54f4e1599b8 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat , gd, geoip, luajit +, curl, apr, aprutil, apacheHttpd, yajl, libcap, modsecurity_standalone , rtmp ? false , fullWebDAV ? false , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false +, modsecurity ? false +, ngx_lua ? modsecurity || false , set_misc ? false , fluent ? false , extraModules ? [] @@ -48,6 +50,8 @@ let sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn"; }; + modsecurity-ext = modsecurity_standalone.nginx; + echo-ext = fetchFromGitHub { owner = "openresty"; repo = "echo-nginx-module"; @@ -93,7 +97,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] ++ optional fullWebDAV expat - ++ optional ngx_lua luajit; + ++ optional ngx_lua luajit + ++ optionals modsecurity [ curl apr aprutil apacheHttpd yajl ]; LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else ""; LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else ""; @@ -132,14 +137,17 @@ stdenv.mkDerivation rec { ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" ++ optional set_misc "--add-module=${set-misc-ext}" - ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) + ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) [ "--with-file-aio" "--with-aio_module" ] ++ optional fluent "--add-module=${fluentd}" + ++ optional modsecurity "--add-module=${modsecurity-ext}/nginx/modsecurity" ++ (map (m: "--add-module=${m}") extraModules); additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; + NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include"; + preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" ''; -- GitLab From 52379183e15fffa8fb2e0f138110d00a0e4e3be5 Mon Sep 17 00:00:00 2001 From: Andreas Wagner Date: Wed, 9 Sep 2015 05:04:47 -0400 Subject: [PATCH 175/553] urjtag: path fixes, use svn to get version string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If built from svn: $ jtag --version UrJTAG 0.10 #2051 If built from git: $ jtag --version UrJTAG 0.10 # Also, with svn we don't need to download the web/ subdirectory because svn supports partial repository clones. [Bjørn: extend commit message] --- pkgs/tools/misc/urjtag/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 589f7d9a94b..7b7d52bcb3f 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison -, flex, fetchgit, makeWrapper +, flex, which, subversion, fetchsvn, makeWrapper , jedecSupport ? false , pythonBindings ? false , python3 ? null @@ -9,23 +9,21 @@ stdenv.mkDerivation rec { version = "0.10"; name = "urjtag-${version}"; - src = fetchgit { - url = "git://git.code.sf.net/p/urjtag/git"; - rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; - sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag"; + rev = "2051"; + sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ] + buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which subversion makeWrapper ] ++ stdenv.lib.optional pythonBindings python3; configureFlags = '' - --prefix=/ ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} ${if pythonBindings then "--enable-python" else "--disable-python"} ''; - preConfigure = "cd urjtag; ./autogen.sh"; - makeFlags = [ "DESTDIR=$(out)" ]; + preConfigure = "./autogen.sh"; meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; -- GitLab From 23ed438d5a474ff17593693213c94d71826fce3f Mon Sep 17 00:00:00 2001 From: Andreas Wagner Date: Tue, 22 Sep 2015 07:18:08 -0400 Subject: [PATCH 176/553] urjtag: enable various features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: commit message: enabled -> enable] --- pkgs/tools/misc/urjtag/default.nix | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 7b7d52bcb3f..59153e68a56 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,8 +1,10 @@ { stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison -, flex, which, subversion, fetchsvn, makeWrapper +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, python3 +, svfSupport ? false +, bsdlSupport ? false +, staplSupport ? false , jedecSupport ? false -, pythonBindings ? false -, python3 ? null }: stdenv.mkDerivation rec { @@ -15,12 +17,14 @@ stdenv.mkDerivation rec { sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which subversion makeWrapper ] - ++ stdenv.lib.optional pythonBindings python3; + buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which + subversion makeWrapper readline libftdi libusb python3 ]; configureFlags = '' + ${if svfSupport then "--enable-svf" else "--disable-svf"} + ${if bsdlSupport then "--enable-bsdl" else "--disable-bsdl"} + ${if staplSupport then "--enable-stapl" else "--disable-stapl"} ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} - ${if pythonBindings then "--enable-python" else "--disable-python"} ''; preConfigure = "./autogen.sh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be92929e658..851c06e37f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3406,8 +3406,10 @@ let uptimed = callPackage ../tools/system/uptimed { }; urjtag = callPackage ../tools/misc/urjtag { + svfSupport = true; + bsdlSupport = true; + staplSupport = true; jedecSupport = true; - pythonBindings = true; }; urlwatch = callPackage ../tools/networking/urlwatch { }; -- GitLab From 9bd0bac3111bc89e8b21bb80c0ca8d26fd601ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 20:51:03 +0200 Subject: [PATCH 177/553] nixos/manualPDF: use new `texlive` instead of `tetex` This includes updating dblatex and crafting ~100 MB TeX package set to make our manual compile. --- nixos/doc/manual/default.nix | 7 ++-- .../tools/typesetting/tex/dblatex/default.nix | 33 ++++++++++++------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 419df915e6a..15bd185ccec 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -146,12 +146,9 @@ in rec { inherit sources; - buildInputs = [ libxml2 libxslt dblatex tetex ]; + buildInputs = [ libxml2 libxslt dblatex dblatex.tex ]; buildCommand = '' - # TeX needs a writable font cache. - export VARTEXFONTS=$TMPDIR/texfonts - ${copySources} dst=$out/share/doc/nixos @@ -162,7 +159,7 @@ in rec { mkdir -p $out/nix-support echo "doc-pdf manual $dst/manual.pdf" >> $out/nix-support/hydra-build-products - ''; # */ + ''; }; # Generate the NixOS manpages. diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index a68ab2d01b9..408ef8ae263 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchurl, python, libxslt, tetex -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null }: +{ stdenv, fetchurl, python, libxslt, texlive +, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null + +, tex ? texlive.combine { # satisfy all packages that ./configure mentions + inherit (texlive) scheme-basic epstopdf anysize appendix changebar + fancybox fancyvrb float footmisc listings jknapltx/*for mathrsfs.sty*/ + multirow overpic pdfpages rotating stmaryrd subfigure titlesec wasysym + # pkgs below don't seem requested by dblatex, but our manual fails without them + ec zapfding symbol eepic times rsfs cs tex4ht courier helvetic ly1; + } +}: # NOTE: enableAllFeatures just purifies the expression, it doesn't actually # enable any extra features. @@ -12,14 +21,14 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.4"; + name = "dblatex-0.3.7"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "120w3wm07qx0k1grgdhjwm2vpwil71icshjvqznskp1f6ggch290"; + sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr"; }; - buildInputs = [ python libxslt tetex ] + buildInputs = [ python libxslt tex ] ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -31,11 +40,11 @@ stdenv.mkDerivation rec { sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \ -e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \ -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \ - -e 's|cmd = "epstopdf|cmd = "${tetex}/bin/epstopdf|g' \ - -e 's|cmd = \["makeindex|cmd = ["${tetex}/bin/makeindex|g' \ - -e 's|doc.program = "pdflatex"|doc.program = "${tetex}/bin/pdflatex"|g' \ - -e 's|self.program = "latex"|self.program = "${tetex}/bin/latex"|g' \ - -e 's|Popen("pdflatex|Popen("${tetex}/bin/pdflatex|g' \ + -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \ + -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \ + -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \ + -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \ + -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ -e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ @@ -47,11 +56,13 @@ stdenv.mkDerivation rec { ''; buildPhase = "true"; - + installPhase = '' python ./setup.py install --prefix="$out" --use-python-path --verbose ''; + passthru = { inherit tex; }; + meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; -- GitLab From 77084d30561d746e16a8716125b7b4d6dba3544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 21:07:12 +0200 Subject: [PATCH 178/553] lilypond: fix with new dblatex+texlive, fix meta Also enableParallelBuilding, as it took quite some time to build. /cc maintainer @MarcWeber. --- pkgs/misc/lilypond/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 3dd3f4378de..29bb9d7d680 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex +, python, gettext, flex, perl, bison, pkgconfig, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fetchsvn, makeWrapper, t1utils +, texlive, tex ? texlive.combine { + inherit (texlive) scheme-small lh metafont epsf; + } }: stdenv.mkDerivation rec{ @@ -34,17 +37,19 @@ stdenv.mkDerivation rec{ 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 + [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + python gettext flex perl bison pkgconfig fontconfig freetype pango fontforge help2man groff makeWrapper t1utils ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Music typesetting system"; homepage = http://lilypond.org/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; patches = [ ./findlib.patch ]; -- GitLab From 179218252bbd6d50559128e8381db9c194ab26d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Sep 2015 21:16:12 +0200 Subject: [PATCH 179/553] tetex: don't build on Hydra anymore Only asciidoc refers to it now (and broken latex2html). --- pkgs/tools/typesetting/tex/tetex/default.nix | 2 +- pkgs/top-level/release-small.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index ab3d49c6b11..8d6c88a0004 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { homepage = http://www.tug.org/tetex/; matintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; - hydraPlatforms = platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7c3f516c494..4978c2e41b0 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -158,7 +158,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; sysvtools = linux; tcl = linux; tcpdump = linux; - tetex = linux; texLive = linux; texLiveBeamer = linux; texLiveExtra = linux; -- GitLab From 284ea9295e5f40d460fe21f0b66e77a5cba86bf4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:03:59 -0700 Subject: [PATCH 180/553] kernel: 3.10.88 -> 3.10.89 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index b26bc1eb34a..a66397f689b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.88"; + version = "3.10.89"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0ayz62v46zmbz43zd36a0zpczv4dyjjcyljcfv1p7mgj3fc9fs4z"; + sha256 = "13697akpdkv7xyyprysb4017q7j1ccynppb6wwllmhz1g2ichpii"; }; features.iwlwifi = true; -- GitLab From 397f806453f4980ef9762a91c0295f85d9496d96 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:04:06 -0700 Subject: [PATCH 181/553] kernel: 3.12.47 -> 3.12.48 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index f49dceac110..da520d13a02 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.47"; + version = "3.12.48"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn"; + sha256 = "1mvvpi2s8avg629y72miak8mdbv0mwb5dz0m7b48aah6dg866hiz"; }; features.iwlwifi = true; -- GitLab From 97200b780867907b85fdd1bc76eb0898736c54b3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:04:14 -0700 Subject: [PATCH 182/553] kernel: 3.14.52 -> 3.14.53 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index fb38e32a4b9..5ea214c9eb3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.52"; + version = "3.14.53"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1sgjxp98wdq4a0044i46970jm2prrgp0xz9jg1q4mfysdz3n3fhv"; + sha256 = "0zqaqa7gs895p521c82jggak9zlmiwmkfarh2ykvh423sxjbvs5i"; }; features.iwlwifi = true; -- GitLab From d5c7b265f7c8a701cf0e82d14a5d476154b54570 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:04:22 -0700 Subject: [PATCH 183/553] kernel: 4.1.7 -> 4.1.8 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 917e5d6ffee..1a84e00f788 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.7"; + version = "4.1.8"; # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn"; + sha256 = "1zhck5892c3anbifq3d0ngy40zm9q4c651kgkjk9wf32jjpnngar"; }; features.iwlwifi = true; -- GitLab From 40396584eb6428e4565d7749007349a44431d67b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:04:26 -0700 Subject: [PATCH 184/553] kernel: 4.2 -> 4.2.1 --- pkgs/os-specific/linux/kernel/linux-4.2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index aa87249e5c9..d82e567de8f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.2"; - modDirVersion = "4.2.0"; + version = "4.2.1"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + sha256 = "1b4dpf3rhr1sb1hpz4qx3h1swlcr1xnbrh6sjybqmj2c6szkbpvz"; }; features.iwlwifi = true; -- GitLab From 6c6ebacf8bab84c67f8d4ff25bee7807b9e717ab Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:10:11 -0700 Subject: [PATCH 185/553] yubikey-personalization: 1.17.1 -> 1.17.2 --- pkgs/tools/misc/yubikey-personalization/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index f6b14635d29..c109903e6ee 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "1i399z23skvyfdr3fp7a340qi3ynfcwdqr1y540swjy9pg1awssm"; + sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; }; - buildInputs = [ pkgconfig libusb libyubikey json_c ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb libyubikey json_c ]; configureFlags = [ "--with-backend=libusb-1.0" -- GitLab From 25dbb2d8bc348011078b445ce6cd84c1b695f1bb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:31:35 -0700 Subject: [PATCH 186/553] git: 2.5.2 -> 2.5.3 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2c29ce82de5..0710e38c941 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.5.2"; + version = "2.5.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "16qcli3cip1ixbrxrb3hhvvgx6ppy4anig83wz7aqlfy1sln0isb"; + sha256 = "06is8pq8gsia3dav8mgl2zlvms2ny4hs1x0w2792ya51azc2jk8j"; }; patches = [ -- GitLab From f8094068a4d1fd0ee7272a1a5e7ae2bf052c522c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 11:32:02 -0700 Subject: [PATCH 187/553] gotty: Make it easier to access the binary --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 851c06e37f1..a225ba1cc6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5516,6 +5516,8 @@ let gob2 = callPackage ../development/tools/misc/gob2 { }; + gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; }; + gradle = callPackage ../development/tools/build-managers/gradle { }; gperf = callPackage ../development/tools/misc/gperf { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index c6877b7e9ab..056d8d8fb3f 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -818,11 +818,6 @@ let buildInputs = [ cli-go go manners go-bindata-assetfs go-multierror structs websocket hcl pty ]; - postInstall = '' - mkdir $out/bin - ln -s go/bin/gotty $out/bin/ - ''; - meta = with stdenv.lib; { description = "Share your terminal as a web application"; homepage = "https://github.com/yudai/gotty"; -- GitLab From cc698a2986578f3bbf6979fd180c4c67996e255e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 21:18:23 -0700 Subject: [PATCH 188/553] ceph-git: 2015-09-11 -> 2015-09-22 --- pkgs/tools/filesystems/ceph/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index ef9330a510b..5b44a7d20f8 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-09-11"; + version = "2015-09-22"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "78de6fd61d5c0422f18c2f683b2cc489f3cbb4d3"; - sha256 = "1kbrsr6vzvprcdq0hg7cgcmvqc61w3i1yzgrmjdmy3jcsmc979xi"; + rev = "f1ead76f80cc3d078778080c35a6427256874062"; + sha256 = "16c01b9v04slp80dlgw8n9a5ndjqxi6lv0pnklh1ykh4xb248gjh"; }; patches = [ ./fix-pythonpath.patch ]; -- GitLab From a7b55bc32490991a81ae573d78e1b27a8d20d2f6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 11:15:57 -0700 Subject: [PATCH 189/553] subversion: 1.9.1 -> 1.9.2 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 9e0a093c958..db29360c9ec 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation (rec { - version = "1.9.1"; + version = "1.9.2"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "1244a741dbcf24f2b1d165225f0159a0c994e37a"; + sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; }; buildInputs = [ zlib apr aprutil sqlite ] -- GitLab From abb4088c6cefebe9ee804674a543032457184b15 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 11:42:08 -0700 Subject: [PATCH 190/553] chromium: Updates - stable: 45.0.2454.93 -> 45.0.2454.99 - dev: 47.0.2508.0 -> 47.0.2516.0 --- .../browsers/chromium/source/sources.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 62a5fd80a58..86eb4169874 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,10 +1,10 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "47.0.2508.0"; - sha256 = "1jmcvbimj3x91czvclnqbp8w2nfqhk2bd7bw9yd37c576md1wnw2"; - sha256bin32 = "10spq63yfyzw419bz22r2g5rmnaxy5861715mkrcbpfm8cylzmzh"; - sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; + version = "47.0.2516.0"; + sha256 = "05caz427lis89rrh1885mp84q4lsavkn7d1x519drmjvyz3djal8"; + sha256bin32 = "0fylv375j7wypwbjpccsjiyzzijkj6v96nvmal2x6fqyzz1qcx2s"; + sha256bin64 = "1n4vyibv9jvm12cxpj3grvafc0x7izw71hz83dr9q5r73q43bkkk"; }; beta = { version = "46.0.2490.33"; @@ -13,9 +13,9 @@ sha256bin64 = "1kn0k8gpjnm1xsdiby76phwr0i8yb1w9mzmnf7ppj5cddikc5n3v"; }; stable = { - version = "45.0.2454.93"; - sha256 = "1iraimblbzp9q16s5q7rbbb7079v095kr8dzqq1wwdb1bvcsllh6"; - sha256bin32 = "1gndmychajm4qb623k57zirp72w4y1vfxp17gyrbjpg4kzbi1qcg"; - sha256bin64 = "107l7f7crhcsv4xa219lmnsg2i7jqi5zly71cix54qg2bb7wgfwn"; + version = "45.0.2454.99"; + sha256 = "0h53gvgrs7f9sjw9vq21fr890f4qja0m2ja2c5ys1z5cs0gs7l8m"; + sha256bin32 = "18cc3vqvcfv1x11w1briis57fz53cdnmlxzzkrgs3585kw1q3m1d"; + sha256bin64 = "16pj25zvjiinc2wgvj2fwai6s2y5g8nx7j1p2s8bjix3hfnp26df"; }; } -- GitLab From de2906e6706c6c342f016906865026cb443d96a1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 22 Sep 2015 21:18:07 -0700 Subject: [PATCH 191/553] rustc: Update both versions of the compiler rustc: 1.2.0 -> 1.3.0 rustcMaster: 2015-09-05 -> 2015-09-21 This also removes the llvm bundling which reduced immediate the closure size by ~50MB. It also tries to reduce some of the superfluous dependencies to help reduce the number of potential rebuilds (namely removing git). --- pkgs/development/compilers/rustc/default.nix | 36 +++++------- pkgs/development/compilers/rustc/generic.nix | 51 ++++++++++------- pkgs/development/compilers/rustc/head.nix | 21 +++++-- .../compilers/rustc/patches/cc-ar-opts.patch | 57 +++++++++++++++++++ .../compilers/rustc/patches/grsec-head.patch | 24 ++++++++ .../compilers/rustc/patches/head.patch | 13 ----- .../rustc/patches/remove-uneeded-git.patch | 19 +++++++ .../compilers/rustc/patches/stable.patch | 28 --------- .../libraries/jemalloc/default.nix | 5 ++ 9 files changed, 166 insertions(+), 88 deletions(-) create mode 100644 pkgs/development/compilers/rustc/patches/cc-ar-opts.patch create mode 100644 pkgs/development/compilers/rustc/patches/grsec-head.patch delete mode 100644 pkgs/development/compilers/rustc/patches/head.patch create mode 100644 pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch delete mode 100644 pkgs/development/compilers/rustc/patches/stable.patch diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix index a4f70172e1f..00bfb3222e0 100644 --- a/pkgs/development/compilers/rustc/default.nix +++ b/pkgs/development/compilers/rustc/default.nix @@ -1,33 +1,27 @@ { stdenv, callPackage }: + callPackage ./generic.nix { - shortVersion = "1.2.0"; + shortVersion = "1.3.0"; isRelease = true; - srcSha = "1zq2nhgaxkv1ghi3z2qgff6cylqirn33nphvkjiczlkjfi0pyw16"; + configureFlags = [ "--release-channel=stable" ]; + srcSha = "14lhk40n9aslz8h8wj7fas5vsgyrb38b2r319q3hlvplgggdksg8"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. The shapshot info you want can be found at https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt - with the set you want at the top. + with the set you want at the top. Make sure this is the latest snapshot + for the tagged release and not a snapshot in the current HEAD. */ - # linux-i386 - snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b"; - - # linux-x86_64 - snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c"; - - # macos-i386 - snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f"; + snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8"; + snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c"; + snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd"; + snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6"; + snapshotDate = "2015-07-26"; + snapshotRev = "a5c12f4"; - # macos-x86_64 - snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae"; - - snapshotDate = "2015-05-24"; - snapshotRev = "ba0e1cd"; - - patches = [ - ./patches/stable.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=stable" ]; + # cc-ar-opts.patch should be removable in 1.4.0+ + patches = [ ./patches/remove-uneeded-git.patch ./patches/cc-ar-opts.patch ] + ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; } diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index ee7d0c7749d..9df259cee8e 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchgit, fetchzip, which, file, perl, curl, python27 -, makeWrapper, tzdata, git, valgrind, procps, coreutils +{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps +, llvmPackages_37, jemalloc, ncurses , shortVersion, isRelease , srcSha, srcRev ? "" @@ -15,15 +15,12 @@ assert !stdenv.isFreeBSD; /* Rust's build process has a few quirks : -- It requires some patched in llvm that haven't landed upstream, so it - compiles its own llvm. This might change in the future, so at some - point we may be able to switch to nix's llvm. - - The Rust compiler is written is Rust, so it requires a bootstrap compiler, which is downloaded during the build. To make the build pure, we download it ourself before and put it where it is expected. Once the language is stable (1.0) , we might want to - switch it to use nix's packaged rust compiler. + switch it to use nix's packaged rust compiler. This might not be possible + as the compiler is highly coupled to the bootstrap. NOTE : some derivation depend on rust. When updating this, please make sure those derivations still compile. (racer, for example). @@ -62,7 +59,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; @@ -118,29 +115,43 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] - # TODO always include starting from 1.3.0, superseeding patch and substituteInPlace below - ++ stdenv.lib.optional (!isRelease) [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] + ++ [ "--llvm-root=${llvmPackages_37.llvm}" "--jemalloc-root=${jemalloc}/lib" ] + ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"; inherit patches; postPatch = '' substituteInPlace src/rust-installer/gen-install-script.sh \ - --replace /bin/echo "${coreutils}/bin/echo" + --replace /bin/echo "$(type -P echo)" substituteInPlace src/rust-installer/gen-installer.sh \ - --replace /bin/echo "${coreutils}/bin/echo" + --replace /bin/echo "$(type -P echo)" # Workaround for NixOS/nixpkgs#8676 substituteInPlace mk/rustllvm.mk \ --replace "\$\$(subst /,//," "\$\$(subst /,/," - '' + stdenv.lib.optionalString (isRelease) '' - substituteInPlace src/librustc_back/target/mod.rs \ - --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \ - --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" - ''; # TODO remove in 1.3.0, superseeded by configure flags - - buildInputs = [ which file perl curl python27 makeWrapper git ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ]; + + # Fix dynamic linking against llvm + sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py + + # Fix the configure script to not require curl as we won't use it + sed -i configure \ + -e '/probe_need CFG_CURLORWGET/d' + + # Useful debugging parameter + #export VERBOSE=1 + ''; + + preConfigure = '' + # Needed flags as the upstream configure script has a broken prefix substitution + configureFlagsArray+=("--datadir=$out/share") + configureFlagsArray+=("--infodir=$out/share/info") + ''; + + # Procps is needed for one of the test cases + nativeBuildInputs = [ file python2 ] + ++ stdenv.lib.optionals stdenv.isLinux [ procps ]; + buildInputs = [ llvmPackages_37.llvm ncurses ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 3b1cccee941..045a47e88de 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,18 +1,27 @@ # Please make sure to check if rustfmt still builds when updating nightly - { stdenv, callPackage }: + callPackage ./generic.nix { - shortVersion = "2015-09-05"; + shortVersion = "2015-09-21"; isRelease = false; - # src rev for 2015-09-05's nightly channel - srcRev = "779b2a9847319106647dcad12fc6dc472bc0cf4d"; - srcSha = "0m22lxpcjnwa68bpxhfvp07k52gyds8ykif2pf5r2x22lw28vbg3"; + srcRev = "547fd5c11e6902e2f9748e7b46893211b36da421"; + srcSha = "10wklbxz6f4ga9q2rxghih18xdw6xm01bay6c13y72c4bwlnkm2w"; + + /* Rust is bootstrapped from an earlier built version. We need + to fetch these earlier versions, which vary per platform. + The shapshot info you want can be found at + https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt + with the set you want at the top. + */ + snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216"; snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f"; snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d"; snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2"; snapshotDate = "2015-08-11"; snapshotRev = "1af31d4"; - patches = stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + + patches = [ ./patches/remove-uneeded-git.patch ] + ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec-head.patch; } diff --git a/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch b/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch new file mode 100644 index 00000000000..e73d54de8f5 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch @@ -0,0 +1,57 @@ +From c97759699264c6b1fa0e88420cd3c720df25e594 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Tue, 11 Aug 2015 01:09:21 +0200 +Subject: [PATCH] rustc_back: add configure options for default linker and ar + +Signed-off-by: Marc-Antoine Perennou +--- + configure | 4 ++++ + mk/target.mk | 4 ++++ + src/librustc_back/target/mod.rs | 4 ++-- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 071788c..dc9d7d7 100755 +--- a/configure ++++ b/configure +@@ -607,6 +607,10 @@ valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path" + valopt release-channel "dev" "the name of the release channel to build" + valopt musl-root "/usr/local" "MUSL root installation directory" + ++# Used on systems where "cc" and "ar" are unavailable ++valopt default-linker "cc" "the default linker" ++valopt default-ar "ar" "the default ar" ++ + # Many of these are saved below during the "writing configuration" step + # (others are conditionally saved). + opt_nosave manage-submodules 1 "let the build manage the git submodules" +diff --git a/mk/target.mk b/mk/target.mk +index aae66c4..408ab96 100644 +--- a/mk/target.mk ++++ b/mk/target.mk +@@ -13,6 +13,10 @@ + # this exists can be found on issue #2400 + export CFG_COMPILER_HOST_TRIPLE + ++# Used as defaults for the runtime ar and cc tools ++export CFG_DEFAULT_LINKER ++export CFG_DEFAULT_AR ++ + # The standard libraries should be held up to a higher standard than any old + # code, make sure that these common warnings are denied by default. These can + # be overridden during development temporarily. For stage0, we allow warnings +diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs +index d9cfdaa..542791a 100644 +--- a/src/librustc_back/target/mod.rs ++++ b/src/librustc_back/target/mod.rs +@@ -185,8 +185,8 @@ impl Default for TargetOptions { + fn default() -> TargetOptions { + TargetOptions { + data_layout: String::new(), +- linker: "cc".to_string(), +- ar: "ar".to_string(), ++ linker: option_env!("CFG_DEFAULT_LINKER").unwrap_or("cc").to_string(), ++ ar: option_env!("CFG_DEFAULT_AR").unwrap_or("ar").to_string(), + pre_link_args: Vec::new(), + post_link_args: Vec::new(), + cpu: "generic".to_string(), diff --git a/pkgs/development/compilers/rustc/patches/grsec-head.patch b/pkgs/development/compilers/rustc/patches/grsec-head.patch new file mode 100644 index 00000000000..b97b40c2409 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/grsec-head.patch @@ -0,0 +1,24 @@ +diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile +index b22f34f..c6489bd 100644 +--- a/src/test/run-make/relocation-model/Makefile ++++ b/src/test/run-make/relocation-model/Makefile +@@ -2,9 +2,11 @@ + + all: others + $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs +@@ -16,6 +18,7 @@ others: + else + others: + $(RUSTC) -C relocation-model=static foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + $(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs + endif diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch deleted file mode 100644 index 2425fff04a1..00000000000 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs -index 2772fc8..3d37b08 100644 ---- a/src/test/run-pass/issue-20797.rs -+++ b/src/test/run-pass/issue-20797.rs -@@ -97,7 +97,7 @@ impl Iterator for Subpaths { - } - - fn _foo() { -- let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/home")).unwrap(); -+ let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/tmp")).unwrap(); - } - - fn main() {} diff --git a/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch b/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch new file mode 100644 index 00000000000..3c68d777f88 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch @@ -0,0 +1,19 @@ +diff --git a/src/etc/tidy.py b/src/etc/tidy.py +index 9f5f919..a607180 100644 +--- a/src/etc/tidy.py ++++ b/src/etc/tidy.py +@@ -66,13 +66,9 @@ def interesting_file(f): + return any(os.path.splitext(f)[1] == ext for ext in interesting_files) + + +-# Be careful to support Python 2.4, 2.6, and 3.x here! +-config_proc = subprocess.Popen(["git", "config", "core.autocrlf"], +- stdout=subprocess.PIPE) +-result = config_proc.communicate()[0] + + true = "true".encode('utf8') +-autocrlf = result.strip() == true if result is not None else False ++autocrlf = False + + current_name = "" + current_contents = "" diff --git a/pkgs/development/compilers/rustc/patches/stable.patch b/pkgs/development/compilers/rustc/patches/stable.patch deleted file mode 100644 index e927d7a742a..00000000000 --- a/pkgs/development/compilers/rustc/patches/stable.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs -index 402fbcd..8fe2de2 100644 ---- a/src/librustc_back/target/mod.rs -+++ b/src/librustc_back/target/mod.rs -@@ -172,8 +172,8 @@ impl Default for TargetOptions { - /// incomplete, and if used for compilation, will certainly not work. - fn default() -> TargetOptions { - TargetOptions { -- linker: "cc".to_string(), -- ar: "ar".to_string(), -+ linker: "@ccPath@".to_string(), // ignore-tidy-linelength -+ ar: "@arPath@".to_string(), // ignore-tidy-linelength - pre_link_args: Vec::new(), - post_link_args: Vec::new(), - cpu: "generic".to_string(), -diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs -index 2772fc8..3d37b08 100644 ---- a/src/test/run-pass/issue-20797.rs -+++ b/src/test/run-pass/issue-20797.rs -@@ -97,7 +97,7 @@ impl Iterator for Subpaths { - } - - fn _foo() { -- let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/home")).unwrap(); -+ let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/tmp")).unwrap(); - } - - fn main() {} diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index d40cdf75ad1..e0272529907 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91"; }; + # Rust refers to jemalloc functions directly so make sure the prefix matchs. + configureFlags = [ + "--with-jemalloc-prefix=je_" + ]; + meta = with stdenv.lib; { homepage = http://www.canonware.com/jemalloc/index.html; description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; -- GitLab From 0d0be1387869f8ddc84a9548fc327015b7745ec4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 12:29:44 -0700 Subject: [PATCH 192/553] rustUnstable: Don't depend on a stable rust compiler --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a225ba1cc6d..823fa1f849f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4669,10 +4669,12 @@ let rustPlatform = rustStable; rustStable = recurseIntoAttrs (makeRustPlatform rustc cargo rustStable); - rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); + rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster + (cargo.override { rustPlatform = rustUnstableCargoPlatform; }) rustUnstable); # rust platform to build cargo itself (with cargoSnapshot) rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform; + rustUnstableCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot.cargo rustUnstableCargoPlatform; makeRustPlatform = rustc: cargo: self: let -- GitLab From 3973f9f2fe8b3b5d506cddc4a9dafe8cc1155b01 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 21 Sep 2015 12:25:39 +0300 Subject: [PATCH 193/553] inconsolata-lgc: init at 2015-04-18 Add Inconsolata-LGC, fork of Inconsolata font with improved Cyrillic and Greek support. --- pkgs/data/fonts/inconsolata/lgc.nix | 59 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/data/fonts/inconsolata/lgc.nix diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix new file mode 100644 index 00000000000..ffa55a33e8e --- /dev/null +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -0,0 +1,59 @@ +{stdenv, fetchFromGitHub, fontforge}: + +stdenv.mkDerivation rec { + name = "inconsolata-lgc-${version}"; + version = "git-2015-04-18"; + + src = fetchFromGitHub { + owner = "MihailJP"; + repo = "Inconsolata-LGC"; + rev = "30bbc1bd82502bf76f1cc5553f17388da2ba20e7"; + sha256 = "02af2gpksdxdp7zfh5qhgfqzc6gvah9v4ph818irwhs9gcq8833c"; + }; + + buildInputs = [ fontforge ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v $(find . -name '*.ttf') $out/share/fonts/truetype + + mkdir -p $out/share/fonts/opentype + cp -v $(find . -name '*.otf') $out/share/fonts/opentype + + mkdir -p "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + ''; + + meta = { + description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; + longDescription = '' + Inconsolata is one of the most suitable font for programmers created by Raph + Levien. Since the original Inconsolata does not contain Cyrillic alphabet, + it was slightly inconvenient for not a few programmers from Russia. + + Inconsolata LGC is a modified version of Inconsolata with added the Cyrillic + alphabet which directly descends from Inconsolata Hellenic supporting modern + Greek. + + Inconsolata LGC is licensed under SIL OFL. + + + Inconsolata LGC changes: + * Cyrillic glyphs added. + * Italic and Bold font added. + + Changes inherited from Inconsolata Hellenic: + * Greek glyphs. + + Changes inherited from Inconsolata-dz: + * Straight quotation marks. + ''; + + # See `License.txt' for details. + license = stdenv.lib.licenses.ofl; + homepage = https://github.com/MihailJP/Inconsolata-LGC; + maintainers = [ + stdenv.lib.maintainers.avnik + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e53c988f88..85b9cf5774d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10400,6 +10400,7 @@ let hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; + inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; ipafont = callPackage ../data/fonts/ipafont {}; -- GitLab From db74af9a5f5f0b6f6c87320a12ff60129f48c58e Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 23 Sep 2015 23:44:28 +0300 Subject: [PATCH 194/553] fonts: Formatting, empty lines and whitespaces. --- pkgs/data/fonts/aurulent-sans/default.nix | 8 +++- pkgs/data/fonts/dejavu-fonts/default.nix | 3 ++ pkgs/data/fonts/font-awesome-ttf/default.nix | 3 -- pkgs/data/fonts/fontWrap/default.nix | 46 +++++++++---------- pkgs/data/fonts/freefont-ttf/default.nix | 5 +- pkgs/data/fonts/gyre/default.nix | 16 +++---- pkgs/data/fonts/hack/default.nix | 1 - pkgs/data/fonts/mph-2b-damase/default.nix | 4 ++ pkgs/data/fonts/nafees/default.nix | 13 +++--- pkgs/data/fonts/opensans-ttf/default.nix | 3 -- pkgs/data/fonts/poly/default.nix | 16 +++---- .../fonts/redhat-liberation-fonts/binary.nix | 3 -- .../fonts/redhat-liberation-fonts/default.nix | 3 -- .../data/fonts/ttf-bitstream-vera/default.nix | 3 ++ 14 files changed, 61 insertions(+), 66 deletions(-) diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 3685dbf356e..f57f3de7f82 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "aurulent-sans-0.1"; + src = fetchgit { url = "https://github.com/deepfire/hartke-aurulent-sans.git"; rev = "refs/tags/${name}"; sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; }; + buildPhase = "true"; - installPhase = " + + installPhase = '' fontDir=$out/share/fonts/opentype mkdir -p $fontDir cp *.otf $fontDir - "; + ''; + meta = { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 728cb444539..9d5e25e0abd 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2"; sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4"; }; + buildFlags = "full-ttf"; + preBuild = '' sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/* sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/* @@ -30,6 +32,7 @@ stdenv.mkDerivation rec { ln -s ${unicodeData} resources/UnicodeData.txt ln -s ${blocks} resources/Blocks.txt ''; + installPhase = '' mkdir -p $out/share/fonts/truetype for i in $(find build -name '*.ttf'); do diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index 992b87b8ec7..246eb3fb481 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -16,15 +16,12 @@ stdenv.mkDerivation rec { meta = { description = "Font Awesome - TTF font"; - longDescription = '' Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the TTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; license = stdenv.lib.licenses.ofl; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.abaldeau ]; }; diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 9a65c0cde30..e2822cf164f 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,31 +1,31 @@ args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }: with args; - let localDefs = builderDefs.passthru.function { - src =""; /* put a fetchurl here */ - buildInputs = [mkfontdir mkfontscale]; - configureFlags = []; - }; - in with localDefs; + let localDefs = builderDefs.passthru.function { + src =""; /* put a fetchurl here */ + buildInputs = [mkfontdir mkfontscale]; + configureFlags = []; + }; + in with localDefs; let - doInstall = fullDepEntry (" - mkdir -p \$out/share/fonts/ - cd \$out/share/fonts - for i in ${toString paths}; do - find \$i -type f -exec ln -s '{}' . ';' ; - done - mkfontdir - mkfontscale - ") [minInit addInputs defEnsureDir] ; + doInstall = fullDepEntry (" + mkdir -p \$out/share/fonts/ + cd \$out/share/fonts + for i in ${toString paths}; do + find \$i -type f -exec ln -s '{}' . ';' ; + done + mkfontdir + mkfontscale + ") [minInit addInputs defEnsureDir] ; in stdenv.mkDerivation rec { - name = "wrapped-font-dir"; - builder = writeScript (name + "-builder") - (textClosure localDefs [ doInstall doForceShare doPropagate]); + name = "wrapped-font-dir"; + builder = writeScript (name + "-builder") + (textClosure localDefs [ doInstall doForceShare doPropagate]); preferLocalBuild = true; - meta = { - description = " - Just a wrapper to create fonts.dir and fonts.scale . + meta = { + description = " + Just a wrapper to create fonts.dir and fonts.scale . "; - inherit src; - }; + inherit src; + }; } diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 51505320ba4..00d5cfba27a 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -17,17 +17,14 @@ stdenv.mkDerivation rec { meta = { description = "GNU Free UCS Outline Fonts"; - longDescription = '' The GNU Freefont project aims to provide a set of free outline (PostScript Type0, TrueType, OpenType...) fonts covering the ISO 10646/Unicode UCS (Universal Character Set). ''; - homepage = http://www.gnu.org/software/freefont/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + maintainers = []; }; } diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index 46b947ce77a..a5f43d4169b 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -21,17 +21,15 @@ stdenv.mkDerivation rec { meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; - - longDescription = ''The Gyre project started in 2006, and will - eventually include enhanced releases of all 35 freely available - PostScript fonts distributed with Ghostscript v4.00. These are - being converted to OpenType and extended with diacritical marks - covering all modern European languages and then some''; - + longDescription = '' + The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some + ''; homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; - license = stdenv.lib.licenses.lppl13c; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ bergey ]; }; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 522847a5241..faa126d693e 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation { the license is available in LICENSE.md" (From the GitHub page) */ license = licenses.free; - platforms = platforms.all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 7fe56987ad3..0424f6e727c 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation { name = "MPH-2B-Damase"; + src = fetchurl { url = http://www.wazu.jp/downloads/damase_v.2.zip; sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h"; }; + buildInputs = [unzip]; + unpackPhase = '' unzip $src; ''; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index bcbf5749810..f90cb98b802 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -40,19 +40,18 @@ stdenv.mkDerivation rec { meta = { description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; - - longDescription = '' The Nafees font family is developed according - to calligraphic rules, following the style of Syed Nafees - Al-Hussaini (Nafees Raqam) one of the finest calligraphers of - Pakistan ''; - + longDescription = '' + The Nafees font family is developed according + to calligraphic rules, following the style of Syed Nafees + Al-Hussaini (Nafees Raqam) one of the finest calligraphers of + Pakistan + ''; homepage = "http://www.cle.org.pk/software/localization.htm"; # Used to be GPLv2. The license distributed with the fonts looks # more like a modified BSD, but still contains the GPLv2 embedded # font exception, and some not-for-resale language. license = "unknown"; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ bergey ]; }; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 946efa00b9a..c0d533ca620 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -19,15 +19,12 @@ stdenv.mkDerivation rec { meta = { description = "Open Sans fonts"; - longDescription = '' Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = "http://en.wikipedia.org/wiki/Open_Sans"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 1bd0d898067..7298dbb18ce 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { meta = { description = "Medium contrast serif font"; longDescription = '' - With short ascenders and a very high x-height, Poly is efficient in small - sizes. Thanks to its careful balance between the x-height and glyph widths, - it allows more economy and legibility than standard web serifs, even in - small sizes. The aglutinative language for which it was designed contains - very long words. The goal was to develop a typeface that would tolerate - cramped tracking and that would increase the number of letters on a single - line. Poly is a Unicode typeface family that supports Open Type features - and languages that use the Latin script and its variants. + With short ascenders and a very high x-height, Poly is efficient in small + sizes. Thanks to its careful balance between the x-height and glyph widths, + it allows more economy and legibility than standard web serifs, even in + small sizes. The aglutinative language for which it was designed contains + very long words. The goal was to develop a typeface that would tolerate + cramped tracking and that would increase the number of letters on a single + line. Poly is a Unicode typeface family that supports Open Type features + and languages that use the Latin script and its variants. ''; homepage = http://www.fontsquirrel.com/fonts/poly; license = stdenv.lib.licenses.ofl; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix index 369ab3493f3..df206fe13b5 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and @@ -38,9 +37,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index a9304769378..cd5c5030941 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and @@ -40,9 +39,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 1dfaa376df4..10766d9fa78 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation { name = "ttf-bitstream-vera-1.10"; + src = fetchurl { url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; }; + buildPhase = "true"; + installPhase = " fontDir=$out/share/fonts/truetype mkdir -p $fontDir -- GitLab From 1aff91160189105bb334966c0071d222a17b52ab Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 13:48:38 +0000 Subject: [PATCH 195/553] rustUnstable: 2015-09-05 -> 2015-09-23 --- pkgs/development/compilers/rustc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 045a47e88de..016d09b3cf1 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,10 +2,10 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-09-21"; + shortVersion = "2015-09-23"; isRelease = false; - srcRev = "547fd5c11e6902e2f9748e7b46893211b36da421"; - srcSha = "10wklbxz6f4ga9q2rxghih18xdw6xm01bay6c13y72c4bwlnkm2w"; + srcRev = "b2f379cdc23aec5c5d0d62acfcc5a4a18ebf0e30"; + srcSha = "1z710f5vv9pbis1q96dc6kqvi0j7xgg95r5f5c3czbvndrxjwm03"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. -- GitLab From 73438e3d8d006324ec4c2b185523b3bbe47abace Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 16:57:36 +0000 Subject: [PATCH 196/553] rustRegistry: 2015-08-21 -> 2015-09-23 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index e79ff5ca57e..e5d76276301 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-08-21"; - rev = "02e31a901d5f0942466ca7730431b547477126b1"; + version = "2015-09-23"; + rev = "14906530682acd6fa4bac6a8578f6fd1c1090081"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0jppl2grir4wxc3da24h18h21kvh1wj0iff1b0z9vvx0a1iqp4gm"; + sha256 = "1ycrf8qb776lsgcw9rfz5r63rih2m35n4p4h76hq1dxgvp1f2awh"; }; in -- GitLab From feda2925f7d0856ec03faeda619cc08d0381d8f1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 16:58:38 +0000 Subject: [PATCH 197/553] cargo: 0.3.0 -> 0.5.0 --- .../tools/build-managers/cargo/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 9ffc9b0cbb9..6d16cbf7405 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib }: -with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; }); +with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; }); with rustPlatform; buildRustPackage rec { inherit name version meta; + # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules src = fetchgit { - url = "https://github.com/rust-lang/cargo.git"; - rev = "refs/tags/0.3.0"; - sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793"; + url = "git://github.com/rust-lang/cargo"; + rev = "refs/tags/${version}"; + sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w"; }; - depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w"; + depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; -- GitLab From 760be9cf7025a1a30b7e7c73a3935a652f098f2d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 13:49:54 +0000 Subject: [PATCH 198/553] rustfmt: git-2015-09-05 -> git-2015-09-23 --- pkgs/development/tools/rust/rustfmt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 1e735611782..1a2bf7ac01c 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchgit, rustUnstable, makeWrapper }: +{ stdenv, fetchgit, rustUnstable, makeWrapper }: with rustUnstable; buildRustPackage rec { - name = "rustfmt-git-2015-09-05"; + name = "rustfmt-git-2015-09-23"; src = fetchgit { url = https://github.com/nrc/rustfmt; - rev = "6c5d3500bb805b37865fe961a7054f8435d176fc"; - sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90"; + rev = "c14cfca0e3de3dfa5fd91d39a85c5b452e7756e3"; + sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b"; }; - depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8"; + depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; -- GitLab From 3c8b92f4b35618e7c1db33e6878eb9526127406d Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Fri, 11 Sep 2015 19:23:52 -0700 Subject: [PATCH 199/553] Workaround for getcwd configure test on 10.11. See https://openradar.appspot.com/22671534 for a description of the problem. --- pkgs/stdenv/darwin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9ad2c8504d1..c5634984532 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -58,6 +58,8 @@ rec { export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" export CMAKE_OSX_ARCHITECTURES=x86_64 + # Workaround for https://openradar.appspot.com/22671534 on 10.11. + export gl_cv_func_getcwd_abort_bug=no ''; # A stdenv that wraps the Apple command-line tools and our other trivial symlinked bootstrap tools -- GitLab From 7c149b86c3c2e84a07c7eb575e23c64878507fc8 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Tue, 1 Sep 2015 21:16:36 +0800 Subject: [PATCH 200/553] dfhack: init at 0.40.24-r3 A Dwarf Fortress memory access library, distributed with scripts and plugins implementing a wide variety of useful functions and tools. --- pkgs/games/dfhack/default.nix | 62 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 66 insertions(+) create mode 100644 pkgs/games/dfhack/default.nix diff --git a/pkgs/games/dfhack/default.nix b/pkgs/games/dfhack/default.nix new file mode 100644 index 00000000000..046f11545a5 --- /dev/null +++ b/pkgs/games/dfhack/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchgit, dwarf_fortress, cmake, zlib, perl, XMLLibXML, XMLLibXSLT +}: + +let + baseVersion = "40"; + patchVersion = "24-r3"; + src = fetchgit { + url = "https://github.com/DFHack/dfhack.git"; + rev = "0849099f2083e100cae6f64940b4eff4c28ce2eb"; + sha256 = "0lnqrayi8hwfivkrxb7fw8lb6v95i04pskny1px7084n7nzvyv8b"; + }; + +in + +assert stdenv.system == "i686-linux"; +assert dwarf_fortress.name == "dwarf-fortress-0.40.24"; + +stdenv.mkDerivation rec { + name = "dfhack-0.${baseVersion}.${patchVersion}"; + + inherit baseVersion patchVersion src; + + buildInputs = [ cmake zlib perl XMLLibXML XMLLibXSLT ]; + + preConfigure = '' + export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/dfhack $cmakeFlags" + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/build/depends/protobuf + ''; + + installPhase = '' + mkdir -p $out/dfhack + make install + cp ../package/linux/dfhack $out/dfhack/ + mkdir -p $out/bin + cat > $out/bin/dfhack_install_dir < dfhack + # write md5sum of binary + sed -e s/c42f55948a448645d6609102ef6439e8/`md5sum ${dwarf_fortress}/share/df_linux/libs/Dwarf_Fortress | cut -f1 -d\ `/ $out/dfhack/hack/symbols.xml > hack/symbols.xml + + echo "DFHack installed successfully in \$1. To play, run ./dfhack in it." + + EOF + chmod +x $out/bin/dfhack_install_dir + ''; + + meta = { + description = "A Dwarf Fortress memory access library"; + homepage = https://github.com/DFHack/dfhack; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4b1752e397..d63c5d67a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13489,6 +13489,10 @@ let crrcsim = callPackage ../games/crrcsim {}; + dfhack = callPackage_i686 ../games/dfhack { + inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT; + }; + dhewm3 = callPackage ../games/dhewm3 {}; drumkv1 = callPackage ../applications/audio/drumkv1 { }; -- GitLab From cdf13a0a0608a13fb9e1df41d7e3ee372e8533b8 Mon Sep 17 00:00:00 2001 From: Andy Georges Date: Tue, 15 Sep 2015 01:52:44 +0200 Subject: [PATCH 201/553] elasticsearch: 1.5.2 -> 1.7.2 --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- pkgs/servers/search/elasticsearch/es-home.patch | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 859f1501bb3..16f01030290 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.5.2"; + name = "elasticsearch-1.7.2"; src = fetchurl { url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg"; + sha256 = "1lix4asvx1lbc227gzsrws3xqbcbqaal7v10w60kch0c4xg970bg"; }; patches = [ ./es-home.patch ]; diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch index 2f7a7fe7919..2f2018fd69f 100644 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ b/pkgs/servers/search/elasticsearch/es-home.patch @@ -28,9 +28,10 @@ diff -rupN a/bin/plugin b/bin/plugin # make ELASTICSEARCH_HOME absolute ES_HOME=`cd "$ES_HOME"; pwd` -@@ -45,4 +48,4 @@ while [ $# -gt 0 ]; do - shift - done - --exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args -+exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args +@@ -105,4 +105,4 @@ + + export HOSTNAME=`hostname -s` + +-eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home=\""$ES_HOME"\" $properties -cp \""$ES_HOME/lib/*"\" org.elasticsearch.plugins.PluginManager $args +\ No newline at end of file ++eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args -- GitLab From e7605dd08b460bc824b1f568c62b20a50d3fa18b Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 23 Sep 2015 16:13:29 -0700 Subject: [PATCH 202/553] add nodejs-4.1.0 --- pkgs/development/libraries/libuv/default.nix | 1 + .../web/nodejs/no-xcode-4.1.0.patch | 95 +++++++++++++++++++ pkgs/development/web/nodejs/v4_1_0.nix | 53 +++++++++++ pkgs/top-level/all-packages.nix | 7 +- 4 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/web/nodejs/no-xcode-4.1.0.patch create mode 100644 pkgs/development/web/nodejs/v4_1_0.nix diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 8052f0bc731..2a35264799b 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -109,4 +109,5 @@ in mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) { v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx"; v1_6_1 = "10w9pjbmqcv03v04rnjd8mdh886j7v4y0svdsdklz69zskgdvvqg"; + v1_7_5 = "18x6cy2xn31am97vn6jli7kmb2fbp4c8kmv7jm97vggh0x55flsc"; } diff --git a/pkgs/development/web/nodejs/no-xcode-4.1.0.patch b/pkgs/development/web/nodejs/no-xcode-4.1.0.patch new file mode 100644 index 00000000000..137158b01b7 --- /dev/null +++ b/pkgs/development/web/nodejs/no-xcode-4.1.0.patch @@ -0,0 +1,95 @@ +diff --git a/configure b/configure +index d199975..66d903b 100755 +--- a/configure ++++ b/configure +@@ -734,7 +734,7 @@ def configure_library(lib, output): + # libpath needs to be provided ahead libraries + if pkg_libpath: + output['libraries'] += ( +- filter(None, map(str.strip, pkg_cflags.split('-L')))) ++ pkg_libpath.split()) + + default_libs = getattr(options, shared_lib + '_libname') + default_libs = map('-l{0}'.format, default_libs.split(',')) +diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +index c002b11..fefb765 100644 +--- a/tools/gyp/pylib/gyp/xcode_emulation.py ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py +@@ -446,10 +446,17 @@ class XcodeSettings(object): + + def _XcodeSdkPath(self, sdk_root): + if sdk_root not in XcodeSettings._sdk_path_cache: +- sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path') +- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path +- if sdk_root: +- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ try: ++ sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path') ++ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path ++ if sdk_root: ++ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root ++ 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): +@@ -572,10 +579,12 @@ class XcodeSettings(object): + framework_root = sdk_root + else: + framework_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)', framework_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)', framework_root)) + + self.configname = None + return cflags +@@ -826,10 +835,12 @@ class XcodeSettings(object): + sdk_root = self._SdkPath() + if not sdk_root: + sdk_root = '' +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.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: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension() + if sdk_root and is_extension: +@@ -1032,7 +1043,11 @@ class XcodeSettings(object): + sdk_root = self._SdkPath(config_name) + if not sdk_root: + sdk_root = '' +- return l.replace('$(SDKROOT)', sdk_root) ++ ++ if self._SdkPath(): ++ return l.replace('$(SDKROOT)', sdk_root) ++ else: ++ return l + + def AdjustLibraries(self, libraries, config_name=None): + """Transforms entries like 'Cocoa.framework' in libraries into entries like +@@ -1248,7 +1263,7 @@ def XcodeVersion(): + if version: + version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] + else: +- raise GypError("No Xcode or CLT version detected!") ++ version = "7.0.0" + # The CLT has no build information, so we return an empty string. + version_list = [version, ''] + version = version_list[0] diff --git a/pkgs/development/web/nodejs/v4_1_0.nix b/pkgs/development/web/nodejs/v4_1_0.nix new file mode 100644 index 00000000000..de8fa5f6bd3 --- /dev/null +++ b/pkgs/development/web/nodejs/v4_1_0.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool +}: + +let + version = "4.1.0"; + + deps = { + inherit openssl zlib libuv; + + # disabled system v8 because v8 3.14 no longer receives security fixes + # we fall back to nodejs' internal v8 copy which receives backports for now + # inherit v8 + } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + inherit http-parser; + }); + + 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 = "025lqmhvl7xpx1ip97jwkz21a97sw9zb4zi3y7fgfag59vv0ac25"; + }; + + configureFlags = map (name: "--shared-${name}") (builtins.attrNames deps) ++ [ "--without-dtrace" ]; + + dontDisableStatic = true; + + prePatch = '' + patchShebangs . + ''; + + patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode-4.1.0.patch; + + buildInputs = [ python which ] ++ (builtins.attrValues deps) + ++ optional stdenv.isLinux utillinux + ++ optionals stdenv.isDarwin [ openssl libtool ]; + setupHook = ./setup-hook.sh; + + enableParallelBuilding = true; + + passthru.interpreterName = "nodejs"; + + meta = { + description = "Event-driven I/O framework for the V8 JavaScript engine"; + homepage = http://nodejs.org; + license = licenses.mit; + maintainers = [ maintainers.goibhniu maintainers.havvy ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5f1f09c355..bccccc12bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2006,6 +2006,11 @@ let ninka = callPackage ../development/tools/misc/ninka { }; + nodejs-4_1 = callPackage ../development/web/nodejs/v4_1_0.nix { + libuv = libuvVersions.v1_7_5; + openssl = openssl_1_0_2; + }; + nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_6_1; }; @@ -2019,8 +2024,8 @@ let else nodejs-0_12; + nodePackages_4_1 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; }); nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_12; }; - nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; nodePackages = if stdenv.system == "armv5tel-linux" then -- GitLab From 738acf065173e8b123a9ae8d8f3a83eb7ded95ab Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 23 Sep 2015 22:40:03 -0400 Subject: [PATCH 203/553] smartgithg: 7.0.0 -> 7.0.2 Also adapted package's freedesktop item install script so that it works in the context of nix. (i.e.: icons and `*.desktop` file now properly installed by the package). --- .../version-management/smartgithg/default.nix | 7 +++++-- .../smartgithg/install_freedesktop_items.sh | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 40a3a3f9ae5..778ae995f3d 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "7_0_0"; + version = "7_0_2"; src = fetchurl { url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz"; - sha256 = "099hnpczh2c0s86nsdybymmm4903n0bsjdq1fpdmm0x5w4216iy6"; + sha256 = "1jpi424aqy6niq31j750rgbspwii013c8kbi965i4jzjpba1pagi"; }; buildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildCommand = let pkg_path = "$out/${name}"; bin_path = "$out/bin"; + install_freedesktop_items = ./install_freedesktop_items.sh; runtime_paths = lib.makeSearchPath "bin" [ jre git mercurial subversion @@ -48,6 +49,8 @@ stdenv.mkDerivation rec { --prefix SMARTGITHG_JAVA_HOME : ${jre} patchShebangs $out cp ${bin_path}/smartgit ${bin_path}/smartgithg + + ${install_freedesktop_items} "${pkg_path}/bin" "$out" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh new file mode 100755 index 00000000000..66fb0cf8f95 --- /dev/null +++ b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +inBinDir=$1 +out=$2 + +cat $inBinDir/add-menuitem.sh | \ +sed -re 's#xdg-icon-resource[ ]+install[ ]+--size[ ]+([0-9]+)[ ]+("[^"]+")[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/icons/hicolor/\1x\1/apps \&\& cp \2 '${out}'/share/icons/hicolor/\1x\1/apps/\3\.png #' | \ +sed -re 's#xdg-desktop-menu[ ]+install[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/applications \&\& cp \1 '${out}'/share/applications/#' | \ +sed -re 's#Exec="[^"]+"#Exec=smartgit#' | +sed -re 's#SMARTGIT_BIN=.*#'SMARTGIT_BIN=${inBinDir}'#' \ +| bash -- GitLab From 2dc98aaec7a912d830917fc56cf6bfa312bb5eb3 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 27 Jul 2015 06:04:06 -0500 Subject: [PATCH 204/553] skalibs: 2.3.4.0 -> 2.3.7.0 --- pkgs/development/libraries/skalibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index cc49466d020..e8b3403df40 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.4.0"; + version = "2.3.7.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "03kqcinb5sn1pk297nqg7w5hzgmkkhhcs3l9x99w1x9kgmw6wisp"; + sha256 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx"; }; dontDisableStatic = true; -- GitLab From 1fcf088a6a4c7e5f7b1c22b19f23e83332646fcf Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Tue, 28 Jul 2015 06:13:42 -0500 Subject: [PATCH 205/553] execline 2.1.2.0 -> 2.1.4.0 --- pkgs/tools/misc/execline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 162cc9a48ff..7478b1e33ee 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.2.0"; + version = "2.1.4.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "0p9wp1rq8010k5yxlvamajhi6m24r9v7ikb7scvznf6zb2b0d9hf"; + sha256 = "1ih0mmkra3aa697nz7haaifq2hfy3wjj39npxzg9zr37m7yw67yz"; }; dontDisableStatic = true; -- GitLab From 9eb0f8307c9ebedebacda5d5fb4af6f7c1507e34 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Tue, 28 Jul 2015 06:16:43 -0500 Subject: [PATCH 206/553] s6-dns 2.0.0.3 -> 2.0.0.4 --- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index e8ed6e68e41..233425dc3a1 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.3"; + version = "2.0.0.4"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0kabv1k5xn2vhwlq42913d22kd1f79nssmi7jkncgvsgv1zs0sym"; + sha256 = "0h2s0r0g0qi74aw04c0jap09yjzzprwc6ihknx8bqgbzv08yv03w"; }; dontDisableStatic = true; -- GitLab From 5856e44258166d261698aae54c3992e87c495fe1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 20:47:27 -0700 Subject: [PATCH 207/553] jemalloc: Fix jemalloc prefix for applications which expect ^malloc --- pkgs/development/compilers/rustc/generic.nix | 4 ++++ pkgs/development/libraries/jemalloc/default.nix | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 9df259cee8e..8b3c61d5271 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -138,6 +138,10 @@ stdenv.mkDerivation { sed -i configure \ -e '/probe_need CFG_CURLORWGET/d' + # Fix the use of jemalloc prefixes which our jemalloc doesn't have + [ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs + [ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ + # Useful debugging parameter #export VERBOSE=1 ''; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index e0272529907..d40cdf75ad1 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -8,11 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91"; }; - # Rust refers to jemalloc functions directly so make sure the prefix matchs. - configureFlags = [ - "--with-jemalloc-prefix=je_" - ]; - meta = with stdenv.lib; { homepage = http://www.canonware.com/jemalloc/index.html; description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; -- GitLab From 09d336ea5ec198663011eac93b30649fcc5f294c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 20:49:03 -0700 Subject: [PATCH 208/553] libarchive: Support lzo --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 1ec253dccd6..837db32ea4b 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz +{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz, lzo , sharutils }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # ^ it's CVE-2015-2304 specific to libarchive ]; - buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++ + buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; preBuild = if stdenv.isCygwin then '' -- GitLab From 2dc9cb1120cc172055601182e76ee4759cd22fe9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 20:49:17 -0700 Subject: [PATCH 209/553] libcap-ng: 0.7.3 -> 0.7.7 Also support swig + python bindings --- pkgs/os-specific/linux/libcap-ng/default.nix | 34 +++++++++++++++----- pkgs/top-level/all-packages.nix | 6 +++- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 3670f06e543..ea54f1a39fd 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -1,22 +1,40 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: -assert stdenv.isLinux; +assert python2 != null || python3 != null -> swig != null; stdenv.mkDerivation rec { name = "libcap-ng-${version}"; - version = "0.7.3"; + # When updating make sure to test that the version with + # all of the python bindings still works + version = "0.7.7"; src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "1cavlcrpqi4imkmagjhw65br8rv2fsbhf68mm3lczr51sg44392w"; + sha256 = "0syhyrixk7fqvwis3k7iddn75g0qxysc1q5fifvzccxk7774jmb1"; }; - buildInputs = [ python ]; # ToDo? optional swig for python bindings + nativeBuildInputs = [ swig ]; + buildInputs = [ python2 python3 ]; - meta = { + postPatch = '' + function get_header() { + echo -e "#include <$1>" | gcc -M -xc - | tr ' ' '\n' | grep "$1" | head -n 1 + } + + # Fix some hardcoding of header paths + sed -i "s,/usr/include/linux/capability.h,$(get_header linux/capability.h),g" bindings/python{,3}/Makefile.in + ''; + + configureFlags = [ + (if python2 != null then "--with-python" else "--without-python") + (if python3 != null then "--with-python3" else "--without-python3") + ]; + + meta = let inherit (stdenv.lib) platforms licenses maintainers; in { description = "Library for working with POSIX capabilities"; homepage = http://people.redhat.com/sgrubb/libcap-ng/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21; + platforms = platforms.linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bccccc12bae..bb9392f9053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9921,7 +9921,11 @@ let libcap_manpages = callPackage ../os-specific/linux/libcap/man.nix { }; - libcap_ng = callPackage ../os-specific/linux/libcap-ng { }; + libcap_ng = callPackage ../os-specific/linux/libcap-ng { + swig = null; # Currently not using the python2/3 bindings + python2 = null; # Currently not using the python2 bindings + python3 = null; # Currently not using the python3 bindings + }; libnscd = callPackage ../os-specific/linux/libnscd { }; -- GitLab From 4856efb7046809184778f6d9c59e6e6f3e81b74f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 22:31:28 -0700 Subject: [PATCH 210/553] rustc: Disable system jemalloc until we can make it compatible --- pkgs/development/compilers/rustc/generic.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 8b3c61d5271..2dc91cb5ec4 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] - ++ [ "--llvm-root=${llvmPackages_37.llvm}" "--jemalloc-root=${jemalloc}/lib" ] + ++ [ "--llvm-root=${llvmPackages_37.llvm}" ] #"--jemalloc-root=${jemalloc}/lib" ] ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"; @@ -139,8 +139,9 @@ stdenv.mkDerivation { -e '/probe_need CFG_CURLORWGET/d' # Fix the use of jemalloc prefixes which our jemalloc doesn't have - [ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs - [ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ + # TODO: reenable if we can figure out how to get our jemalloc to work + #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs + #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Useful debugging parameter #export VERBOSE=1 -- GitLab From 9c345fc97d15d34655759fb5076eab162098b138 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 22:31:40 -0700 Subject: [PATCH 211/553] jemalloc: 4.0.0 -> 4.0.2 --- pkgs/development/libraries/jemalloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index d40cdf75ad1..4e13c9b1d93 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jemalloc-4.0.0"; + name = "jemalloc-4.0.2"; src = fetchurl { url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91"; + sha256 = "04a6iw9wiwiknd7v3l3i7vpmc5nvv52islnb1hz9idmdk259r2hd"; }; meta = with stdenv.lib; { -- GitLab From 07cd629184251106f647a64bfe409e127491f805 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 23 Sep 2015 19:06:06 +0200 Subject: [PATCH 212/553] libeb: init at 4.4.3 --- pkgs/development/libraries/libeb/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libeb/default.nix diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix new file mode 100644 index 00000000000..9315a8f12b5 --- /dev/null +++ b/pkgs/development/libraries/libeb/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perl, zlib }: +stdenv.mkDerivation rec { + name = "libeb-${version}"; + version = "4.4.3"; + + src = fetchurl { + url = "ftp://ftp.sra.co.jp/pub/misc/eb/eb-${version}.tar.bz2"; + sha256 = "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + description = "C library for accessing Japanese CD-ROM books"; + longDescription = '' + The EB library is a library for accessing CD-ROM books, which are a + common way to distribute electronic dictionaries in Japan. It supports + the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. + ''; + licence = licenses.bsd3; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d63c5d67a8d..09d97e78149 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6836,6 +6836,8 @@ let libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeb = callPackage ../development/libraries/libeb { }; + libebml = callPackage ../development/libraries/libebml { }; libebur128 = callPackage ../development/libraries/libebur128 { }; -- GitLab From 4b9428038e279a40184106a9a8640788d7db01c3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 23 Sep 2015 19:06:29 +0200 Subject: [PATCH 213/553] goldendict: 1.0.1 -> 1.5.0.20150801 --- pkgs/applications/misc/goldendict/default.nix | 28 +++++-------- pkgs/applications/misc/goldendict/gcc47.patch | 40 ------------------- .../misc/goldendict/goldendict-paths.diff | 10 ----- 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 pkgs/applications/misc/goldendict/gcc47.patch delete mode 100644 pkgs/applications/misc/goldendict/goldendict-paths.diff diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 717d0a012a2..32a16e79c21 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }: +{ stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }: stdenv.mkDerivation rec { - name = "goldendict-1.0.1"; - src = fetchurl { - url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2"; - sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk"; + name = "goldendict-1.5.0.20150801"; + src = fetchFromGitHub { + owner = "goldendict"; + repo = "goldendict"; + rev = "b4bb1e9635c764aa602fbeaeee661f35e461d062"; + sha256 = "0dhaa0nii226541al3i2d8x8h7cfh96w5vkw3pa3l74llgrj7yx2"; }; - buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ]; - unpackPhase = '' - mkdir ${name}-src - cd ${name}-src - tar xf ${src} - ''; - patches = [ ./goldendict-paths.diff ./gcc47.patch ]; - patchFlags = "-p 0"; + + buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; configurePhase = '' - qmake - ''; - installPhase = '' - make INSTALL_ROOT="$out" install - rm -rf "$out/share/app-install" + qmake PREFIX=$out 'CONFIG+=zim_support' ''; meta = { diff --git a/pkgs/applications/misc/goldendict/gcc47.patch b/pkgs/applications/misc/goldendict/gcc47.patch deleted file mode 100644 index 311dad4f648..00000000000 --- a/pkgs/applications/misc/goldendict/gcc47.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Fri, 20 Jul 2012 03:27:38 +1000 -Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes. - ---- - processwrapper.cc | 4 ++++ - qtsingleapplication/src/qtlocalpeer.cpp | 1 + - 2 files changed, 5 insertions(+) - -diff --git processwrapper.cc processwrapper.cc -index f7f3f19..86b985d 100644 ---- processwrapper.cc -+++ processwrapper.cc -@@ -2,6 +2,10 @@ - - #include - -+#if defined(Q_OS_UNIX) -+#include -+#endif -+ - #ifdef Q_OS_WIN32 - - #include -diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp -index 382d182..506c142 100644 ---- qtsingleapplication/src/qtlocalpeer.cpp -+++ qtsingleapplication/src/qtlocalpeer.cpp -@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0; - #endif - #if defined(Q_OS_UNIX) - #include -+#include - #endif - - namespace QtLP_Private { --- -1.7.11.1 - diff --git a/pkgs/applications/misc/goldendict/goldendict-paths.diff b/pkgs/applications/misc/goldendict/goldendict-paths.diff deleted file mode 100644 index 6682911dbe4..00000000000 --- a/pkgs/applications/misc/goldendict/goldendict-paths.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100 -+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100 -@@ -63,2 +63,2 @@ -- isEmpty( PREFIX ):PREFIX = /usr/local -- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\" -+ isEmpty( PREFIX ):PREFIX = / -+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\" -@@ -66 +66 @@ -- locale.path = $$PREFIX/share/apps/goldendict/locale/ -+ locale.path = $$PREFIX/share/goldendict/locale/ -- GitLab From 2f3eb5e0eff9958999245fb8ae9f2702480cf6c6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 23:22:17 -0700 Subject: [PATCH 214/553] ipfs: 2015-08-29 -> 2015-09-23 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d63c5d67a8d..0607bc27851 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1886,6 +1886,8 @@ let iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; + ipfs = goPackages.ipfs.bin // { outputs = [ "bin" ]; }; + ipmitool = callPackage ../tools/system/ipmitool { static = false; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 056d8d8fb3f..2bf0a96a5aa 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1592,11 +1592,11 @@ let }; ipfs = buildFromGitHub{ - rev = "ff26c312000da12d395c9cdba05c43f29b68b456"; + rev = "9c6ec296e396cc6be551c9807ae220fb50dd07d4"; + date = "2015-09-23"; owner = "ipfs"; repo = "go-ipfs"; - sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg"; - disabled = !isGo14; + sha256 = "0lmj2s9ihl1a5r8yn6w0lvb8z3n6c9b8wi1yvi77vgzm6b6lfl3a"; }; ldap = buildGoPackage rec { -- GitLab From 3e6bb402b18c7b08e85a0468b442c40e4983ab58 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 22 Sep 2015 09:24:10 +0200 Subject: [PATCH 215/553] nixos/tests/virtualbox: Give VMs more memory. We previously had 1024 MB of memory to fit a VirtualBox VM with 512 MB plus the memory needed of the VirtualBox host VM. That obviously won't work for two VirtualBox VMs, which are used for testing networking between two VirtualBox guests. Now, we have 2048 MB on the qemu guest (the VirtualBox host) and 768 MB for each VirtualBox guest. That should be enough to fit in two VirtualBox guests (I hope). Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 728d46d446e..a2d33fa328b 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -141,6 +141,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let vmFlags = mkFlags ([ "--uart1 0x3F8 4" "--uartmode1 client /run/virtualbox-log-${name}.sock" + "--memory 768" ] ++ (attrs.vmFlags or [])); controllerFlags = mkFlags [ @@ -324,7 +325,7 @@ in { mkVMConf = name: val: val.machine // { key = "${name}-config"; }; vmConfigs = mapAttrsToList mkVMConf vboxVMs; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; - virtualisation.memorySize = 1024; + virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; users.extraUsers.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; -- GitLab From 764a767d5f263e97406c07e6341b387643e1c7ac Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 24 Sep 2015 09:13:15 +0200 Subject: [PATCH 216/553] nixos/tests/virtualbox: Destroy detectvirt VM. I forgot to do this in da0e642. It shouldn't be a big problem but it's more clean to destroy the VM once we're done testing. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index a2d33fa328b..2b5b5a180fc 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -413,6 +413,7 @@ in { shutdownVM_detectvirt; my $result = $machine->succeed("cat '$detectvirt_sharepath/result'"); chomp $result; + destroyVM_detectvirt; die "systemd-detect-virt returned \"$result\" instead of \"oracle\"" if $result ne "oracle"; }; -- GitLab From 2d066a8869e3d2e5cb6f44f1fb969dded65f7740 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 24 Sep 2015 10:08:30 +0200 Subject: [PATCH 217/553] mu: 0.9.12 -> 0.9.13 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 2104768e3b9..3710cffb990 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -3,12 +3,12 @@ , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { - version = "0.9.12"; + version = "0.9.13"; name = "mu-${version}"; src = fetchurl { url = "https://github.com/djcb/mu/archive/v${version}.tar.gz"; - sha256 = "1bxryacmas2llj68m2dv8dr1vwx8f5k2i2azh69jajkpqx7i4wdq"; + sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51"; }; buildInputs = -- GitLab From 5ad29f6b85b7f49ede3f2a14f995b524c452e0aa Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 24 Sep 2015 10:14:00 +0200 Subject: [PATCH 218/553] gpaste: 3.16.3 -> 3.16.3.1 --- pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix index dee9caf444c..6563f797970 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.3"; + version = "${gnome3.version}.3.1"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + sha256 = "1m171r1d1jrv9d7ssj25ikrw7lc96gr41rgkxnsa2lsqrvv8i16l"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib -- GitLab From fcab752abf94ae36e903097846c752d6b22e0dff Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 24 Sep 2015 10:24:54 +0200 Subject: [PATCH 219/553] openvswitch module: do not fork services --- nixos/modules/virtualisation/openvswitch.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index b5155246fda..1c77945a6cb 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -92,13 +92,11 @@ in { --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ --pidfile=/var/run/openvswitch/ovsdb.pid \ - --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; RestartSec = 3; PIDFile = "/var/run/openvswitch/ovsdb.pid"; - Type = "forking"; }; postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init @@ -114,11 +112,9 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ - --detach + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid ''; PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; - Type = "forking"; }; }; @@ -143,11 +139,10 @@ in { ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor --detach \ + --monitor \ unix:/var/run/openvswitch/db.sock ''; PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; - Type = "forking"; }; preStart = '' -- GitLab From 8e45d4da52389c0782ca14f5f596ccd24a230ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 10:38:43 +0200 Subject: [PATCH 220/553] mu: don't use nested lists and refactor meta This doesn't even change derivation hash in the default setting. --- pkgs/tools/networking/mu/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 3710cffb990..1191129894c 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite pkgconfig autoconf automake xapian glib gmime texinfo emacs guile libsoup icu ] - ++ stdenv.lib.optional withMug [ gtk3 webkit ]; + ++ stdenv.lib.optionals withMug [ gtk3 webkit ]; preConfigure = '' autoreconf -i @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { cp -v toys/mug/mug $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; - platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ antono the-kenny ]; }; } -- GitLab From 3f06a234f634f2377081a275a8a6f11cf9a24e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 10:41:17 +0200 Subject: [PATCH 221/553] texlive: just comment about (not) another mirror --- pkgs/tools/typesetting/tex/texlive-new/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index 85bfe24e77f..961fbc26ba4 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -129,7 +129,7 @@ let urlPrefix = args.urlPrefix or ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); # beware: standard mirrors http://mirror.ctan.org/ don't have releases - mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu + mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu but same IP in '' tar -xf '${ fetchurl { inherit url md5; } }' \ '--strip-components=${toString stripPrefix}' \ -- GitLab From 2d3537fbf2ec94d9eab06ed68ce80e0c2a1af1ad Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 23:45:45 +0000 Subject: [PATCH 222/553] racer: git-2015-05-18 -> 1.0.0 --- pkgs/development/tools/rust/racer/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 0b614f4edc6..463f57f5e75 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchgit, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: with rustPlatform; buildRustPackage rec { - #TODO add emacs support - name = "racer-git-2015-05-18"; - src = fetchgit { - url = https://github.com/phildawes/racer; - rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035"; - sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7"; + name = "racer-${version}"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "phildawes"; + repo = "racer"; + rev = "v${version}"; + sha256 = "1b6829nqx0sqw1akcid61izw8mah1dfx2nxldkmmg4scnydhvw1l"; }; - depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn"; + depsSha256 = "1hfqr1kidl77lq3djbhfn37whvv6k0hg9g5gcnl6pgl6kn669hdc"; buildInputs = [ makeWrapper ]; @@ -24,13 +25,13 @@ buildRustPackage rec { cp -p target/release/racer $out/bin/ wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src" install -d $out/share/emacs/site-lisp - install "editors/"*.el $out/share/emacs/site-lisp + install "editors/emacs/"*.el $out/share/emacs/site-lisp ''; meta = with stdenv.lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/phildawes/racer; license = stdenv.lib.licenses.mit; - maintainers = [ maintainers.jagajaga ]; + maintainers = with maintainers; [ jagajaga globin ]; }; } -- GitLab From 4ed66c9f02de8722586f08371a1b202d2ef2b723 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 24 Sep 2015 08:58:13 +0000 Subject: [PATCH 223/553] rustfmt: fix build rustfmt now needs to have llvm in its buildInputs since rust does not bundle it and rustfmt needs to link to it. --- pkgs/development/tools/rust/rustfmt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 1a2bf7ac01c..95818a323d6 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, rustUnstable, makeWrapper }: +{ stdenv, fetchgit, rustUnstable, makeWrapper, llvmPackages_37 }: with rustUnstable; @@ -10,6 +10,8 @@ buildRustPackage rec { sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b"; }; + buildInputs = [ llvmPackages_37.llvm ]; + depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw"; meta = with stdenv.lib; { -- GitLab From 1eb5566af549ac1af600834a5e5782563f38e89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 11:07:38 +0200 Subject: [PATCH 224/553] doc/functions: fix a typo --- doc/functions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/functions.xml b/doc/functions.xml index 7fd30cabf16..5378b59abcb 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -127,7 +127,7 @@ in ... lib.makeOverridable - The function lib.makeOverridable is used make the result + The function lib.makeOverridable is used to make the result of a function easily customizable. This utility only makes sense for functions that accept an argument set and return an attribute set. -- GitLab From 57287106bef24ef4f8fe97557ba3dfc90fff6e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Jul 2015 23:10:11 +0200 Subject: [PATCH 225/553] xfce.xfdesktop: maintenance update --- pkgs/desktops/xfce/core/xfdesktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 4402e61a2fb..e5d04879008 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; ver_maj = "4.12"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225"; + sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac"; }; name = "${p_name}-${ver_maj}.${ver_min}"; -- GitLab From b3d4b1bef278987103c2258148d5f4b05a6776a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Sep 2015 20:08:04 +0200 Subject: [PATCH 226/553] ec2-ami-tools: Update to 1.5.7 --- pkgs/tools/virtualization/ec2-ami-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index dad581c93d0..dee14db46bc 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ec2-ami-tools-${version}"; - version = "1.5.6"; + version = "1.5.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; - sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks"; + sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; }; # Amazon EC2 requires that disk images are writable. If they're -- GitLab From 5ab7a37febe3acce36bf659bbbc430fb572c73d8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 10:36:32 +0200 Subject: [PATCH 227/553] ec2-api-tools: Update to 1.7.5.1 --- pkgs/tools/virtualization/ec2-api-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 5ffba07087a..86ad36886c9 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "ec2-api-tools-1.6.5.1"; + name = "ec2-api-tools-1.7.5.1"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.zip"; - sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda"; + sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; buildInputs = [ unzip makeWrapper ]; -- GitLab From e73b19ae4e984f58cebe4dd4f82cda622da552ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 10:36:50 +0200 Subject: [PATCH 228/553] ec2-data.nix: Print all SSH host keys Also, don't barf if there is no DSA key. --- nixos/modules/virtualisation/ec2-data.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 0b0fdda4988..91f4774cdc2 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -80,8 +80,9 @@ with lib; # can obtain it securely by parsing the output of # ec2-get-console-output. echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console - ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console - ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_ed25519_key.pub > /dev/console + for i in /etc/ssh/ssh_host_*_key.pub; do + ${config.programs.ssh.package}/bin/ssh-keygen -l -f $i > /dev/console + done echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console ''; serviceConfig.Type = "oneshot"; -- GitLab From 89e983786a4e2cf6dd238af4df6da373cc01e62b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 11:42:32 +0200 Subject: [PATCH 229/553] Manual: Remove store path references --- nixos/modules/config/shells-environment.nix | 5 +++-- nixos/modules/programs/ssh.nix | 3 ++- nixos/modules/programs/venus.nix | 3 ++- nixos/modules/services/amqp/activemq/default.nix | 3 ++- nixos/modules/services/hardware/sane.nix | 3 ++- nixos/modules/services/logging/logstash.nix | 4 ++-- nixos/modules/services/misc/nixos-manual.nix | 3 ++- nixos/modules/services/misc/subsonic.nix | 4 +++- nixos/modules/services/monitoring/grafana.nix | 6 ++++-- nixos/modules/services/networking/dnscrypt-proxy.nix | 5 +---- nixos/modules/services/networking/seeks.nix | 2 +- nixos/modules/services/web-servers/phpfpm.nix | 5 +++-- nixos/modules/services/x11/display-managers/lightdm.nix | 4 +++- 13 files changed, 30 insertions(+), 20 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 533280890a7..d0243f9775c 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -57,8 +57,8 @@ in type = types.attrsOf (types.listOf types.str); example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; }; description = '' - Attribute set of environment variable. Each attribute maps to a list - of relative paths. Each relative path is appended to the each profile + Attribute set of environment variable. Each attribute maps to a list + of relative paths. Each relative path is appended to the each profile of to form the content of the corresponding environment variable. ''; @@ -123,6 +123,7 @@ in "''${pkgs.dash}/bin/dash" ''; type = types.path; + visible = false; description = '' The shell executable that is linked system-wide to /bin/sh. Please note that NixOS assumes all diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cf7ef455eb8..87a7bac208b 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -36,7 +36,6 @@ in askPassword = mkOption { type = types.str; - default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; description = ''Program used by SSH to ask for passwords.''; }; @@ -223,5 +222,7 @@ in export SSH_ASKPASS=${askPassword} ''; + programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + }; } diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index ca3188b1819..8f85b602fe2 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -99,7 +99,6 @@ in }; outputTheme = mkOption { - default = "${pkgs.venus}/themes/classic_fancy"; type = types.path; description = '' Directory containing a config.ini file which is merged with this one. @@ -170,5 +169,7 @@ in startAt = cfg.dates; }; + services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy"; + }; } diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f9761766..56ff388f8a9 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -32,7 +32,6 @@ in { ''; }; configurationDir = mkOption { - default = "${activemq}/conf"; description = '' The base directory for ActiveMQ's configuration. By default, this directory is searched for a file named activemq.xml, @@ -126,6 +125,8 @@ in { ''; }; + services.activemq.configurationDir = mkDefault "${activemq}/conf"; + }; } diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 3bf765c6f99..0428602688d 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -36,7 +36,6 @@ in hardware.sane.configDir = mkOption { type = types.string; - default = "${saneConfig}/etc/sane.d"; description = "The value of SANE_CONFIG_DIR."; }; @@ -47,6 +46,8 @@ in config = mkIf config.hardware.sane.enable { + hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d"; + environment.systemPackages = backends; environment.sessionVariables = { SANE_CONFIG_DIR = config.hardware.sane.configDir; diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index aec45d9286d..3a798c6f372 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -84,10 +84,10 @@ in type = types.lines; default = ''stdin { type => "example" }''; description = "Logstash input configuration."; - example = '' + example = literalExample '' # Read from journal pipe { - command => "${pkgs.systemd}/bin/journalctl -f -o json" + command => "''${pkgs.systemd}/bin/journalctl -f -o json" type => "syslog" codec => json {} } ''; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index c570a01fb3b..0c9a916ed21 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -80,7 +80,6 @@ in services.nixosManual.browser = mkOption { type = types.path; - default = "${pkgs.w3m}/bin/w3m"; description = '' Browser used to show the manual. ''; @@ -116,6 +115,8 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress for the NixOS manual."; + services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m"; + }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 3e1a2e8fbb5..4d164ad8d65 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -97,7 +97,6 @@ in transcoders = mkOption { type = types.listOf types.path; - default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside @@ -153,5 +152,8 @@ in }; users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + + services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; + }; } diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 0393d01054d..fa653565a67 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -200,7 +200,6 @@ in { staticRootPath = mkOption { description = "Root path for static assets."; - default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public"; type = types.str; }; @@ -311,7 +310,7 @@ in { config = mkIf cfg.enable { warnings = [ - "Grafana passwords will be stored as plaintext in nix store!" + "Grafana passwords will be stored as plaintext in the Nix store!" ]; systemd.services.grafana = { @@ -331,5 +330,8 @@ in { home = cfg.dataDir; createHome = true; }; + + services.grafana.staticRootPath = mkDefault "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public"; + }; } diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index c724ee979c2..218bce2dbb3 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -52,10 +52,7 @@ in default = "opendns"; type = types.nullOr types.string; description = '' - The name of the upstream DNSCrypt resolver to use. See - ${resolverListFile} for alternative resolvers - (e.g., if you are concerned about logging and/or server - location). + The name of the upstream DNSCrypt resolver to use. ''; }; customResolver = mkOption { diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index 155ecbb98ef..f5bc60be345 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -33,7 +33,7 @@ in type = types.str; description = " The Seeks server configuration. If it is not specified, - a default configuration is used (${seeks}/etc/seeks). + a default configuration is used. "; }; diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix index 41dbfff41cf..82398948bfa 100644 --- a/nixos/modules/services/web-servers/phpfpm.nix +++ b/nixos/modules/services/web-servers/phpfpm.nix @@ -44,8 +44,7 @@ in { phpIni = mkOption { type = types.path; - default = "${cfg.phpPackage}/etc/php-recommended.ini"; - description = "php.ini file to use."; + description = "PHP configuration file to use."; }; poolConfigs = mkOption { @@ -86,5 +85,7 @@ in { }; }; + services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini"; + }; } diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index bc8f478c7d8..11e21c9d917 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -104,7 +104,6 @@ in }; background = mkOption { - default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; @@ -172,5 +171,8 @@ in }; users.extraGroups.lightdm.gid = config.ids.gids.lightdm; + + services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; + }; } -- GitLab From 5b8dae8ef3870aca16632ff29bf26391898d08f5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 11:47:00 +0200 Subject: [PATCH 230/553] Prevent future store path references in the manual --- nixos/doc/manual/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 15bd185ccec..87964e27bb9 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -31,10 +31,8 @@ let else fn; - # Convert the list of options into an XML file. The builtin - # unsafeDiscardStringContext is used to prevent the realisation of - # the store paths which are used in options definitions. - optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML optionsList')); + # Convert the list of options into an XML file. + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); optionsDocBook = runCommand "options-db.xml" {} '' optionsXML=${optionsXML} @@ -139,6 +137,8 @@ in rec { ''; # */ meta.description = "The NixOS manual in HTML format"; + + allowedReferences = ["out"]; }; manualPDF = stdenv.mkDerivation { @@ -187,6 +187,8 @@ in rec { ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ ./man-pages.xml ''; + + allowedReferences = ["out"]; }; } -- GitLab From 9cc7859b2ea2a9f79a17489ba945c0358296c8ed Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 18 Sep 2015 17:50:31 +0000 Subject: [PATCH 231/553] nixos: show the manual in system's /share/doc (close #9928) --- nixos/modules/services/misc/nixos-manual.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 0c9a916ed21..c10d8197686 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -92,7 +92,7 @@ in system.build.manual = manual; - environment.systemPackages = [ manual.manpages help ]; + environment.systemPackages = [ manual.manpages manual.manual help ]; boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; -- GitLab From 251a00da4cb5073b9e38f40348835a194a68e6ca Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 24 Sep 2015 12:44:07 +0200 Subject: [PATCH 232/553] openvswitch module: add option to reset db on start --- nixos/modules/virtualisation/openvswitch.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 1c77945a6cb..4d6123e4ce5 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -19,6 +19,15 @@ in { ''; }; + resetOnStart = mkOption { + type = types.bool; + default = false; + description = '' + Whether to reset the Open vSwitch configuration database to a default + configuration on every start of the systemd ovsdb.service. + ''; + }; + package = mkOption { type = types.package; default = pkgs.openvswitch; @@ -75,6 +84,7 @@ in { mkdir -p ${runDir} mkdir -p /var/db/openvswitch chmod +w /var/db/openvswitch + ${optionalString cfg.resetOnStart "rm -f /var/db/openvswitch/conf.db"} if [[ ! -e /var/db/openvswitch/conf.db ]]; then ${cfg.package}/bin/ovsdb-tool create \ "/var/db/openvswitch/conf.db" \ -- GitLab From f96582fc609f576bdf63ba94b2fe954f107b6c69 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 24 Sep 2015 09:31:43 +0000 Subject: [PATCH 233/553] mercurial: add package for crecord extension as optional dependency, include by default in mercurialFull --- .../version-management/mercurial/default.nix | 9 +++++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 28 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 62f2cc80d6f..5a44240fa76 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich -, guiSupport ? false, tk ? null, curses +, guiSupport ? false, tk ? null, hg-crecord ? null, curses , ApplicationServices }: let @@ -36,6 +36,13 @@ stdenv.mkDerivation { WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\" --set HG \"$out/bin/hg\" --prefix PATH : \"${tk}/bin\" " + '') + (stdenv.lib.optionalString (hg-crecord != null) + '' + mkdir -p $out/etc/mercurial + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + crecord=${hg-crecord}/${python.sitePackages}/crecord + EOF '') + '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0607bc27851..b16c179c7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11934,7 +11934,7 @@ let guiSupport = false; # use mercurialFull to get hgk GUI }; - mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); + mercurialFull = appendToName "full" (pkgs.mercurial.override { inherit (pythonPackages) hg-crecord; guiSupport = true; }); merkaartor = callPackage ../applications/misc/merkaartor { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9e99efb3f6..5983ff67a3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5720,6 +5720,34 @@ let }; + hg-crecord = buildPythonPackage rec { + rev = "5cfaabfe9cb9f0a0d6837956d73127f290a213be"; + name = "hg-crecord-${rev}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://bitbucket.org/edgimar/crecord/get/${builtins.substring 0 12 rev}.tar.gz"; + sha256 = "02003fa5620ec40a5ad0d7cede2e65c2cb398a7fe4e1ee26bd3396a87d63ad35"; + }; + + # crecord comes as just a bare directory + configurePhase = " "; + buildPhase = "${python.executable} -m compileall crecord"; + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -Lr crecord $out/${python.sitePackages}/ + ''; + + # there ain't none + doCheck = false; + + meta = { + description = "Mercurial extension for selecting graphically which files/hunk/lines to commit"; + homepage = https://bitbucket.org/edgimar/crecord; + }; + }; + + docutils = buildPythonPackage rec { name = "docutils-0.12"; -- GitLab From 1e1a54f62c7b3a849bd353b70cbe06aebcfdb60c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 00:48:25 +0200 Subject: [PATCH 234/553] libpsl: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/libpsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 58de331c0c5..dcffa005bc4 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -13,13 +13,13 @@ let owner = "publicsuffix"; }; - libVersion = "0.10.0"; + libVersion = "0.11.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "0m6jz0cc49cp0zki1qb2b1z7z0djladayfhbxi0i20pad28czsbn"; + sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; -- GitLab From d2f3041d270cba3746dbdb021a4be3d166517e77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 01:32:25 +0200 Subject: [PATCH 235/553] sshuttle: carry a few bug fixes until next release --- pkgs/tools/security/sshuttle/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 18997abb678..d392f8a2fb6 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, pandoc +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps, python }: let version = "0.71"; in @@ -12,6 +12,21 @@ stdenv.mkDerivation rec { owner = "sshuttle"; }; + patches = [ + (fetchpatch { + sha256 = "1yrjyvdz6k6zk020dmbagf8w49w8vhfbzgfpsq9jqdh2hbykv3m3"; + url = https://github.com/sshuttle/sshuttle/commit/3cf5002b62650c26a50e18af8d8c5c91d754bab9.patch; + }) + (fetchpatch { + sha256 = "091gg28cnmx200q46bcnxpp9ih9p5qlq0r3bxfm0f4qalg8rmp2g"; + url = https://github.com/sshuttle/sshuttle/commit/d70b5f2b89e593506834cf8ea10785d96c801dfc.patch; + }) + (fetchpatch { + sha256 = "17l9h8clqlbyxdkssavxqpb902j7b3yabrrdalybfpkhj69x8ghk"; + url = https://github.com/sshuttle/sshuttle/commit/a38963301e9c29fbe3232f0a41ea080b642c5ad2.patch; + }) + ]; + nativeBuildInputs = [ makeWrapper pandoc ]; buildInputs = [ coreutils iptables nettools openssh procps python ]; -- GitLab From 198dda950be230df9794833a0bc916a48bb13195 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 09:44:10 +0200 Subject: [PATCH 236/553] sshuttle: add PyXAPI for tproxy UDP proxy support --- pkgs/tools/security/sshuttle/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index d392f8a2fb6..e085bfaaa91 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pandoc -, coreutils, iptables, nettools, openssh, procps, python }: +, coreutils, iptables, nettools, openssh, procps, pythonPackages }: let version = "0.71"; in stdenv.mkDerivation rec { @@ -28,20 +28,25 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper pandoc ]; - buildInputs = [ coreutils iptables nettools openssh procps python ]; + buildInputs = + [ coreutils iptables nettools openssh procps pythonPackages.python ]; + pythonPaths = with pythonPackages; [ PyXAPI ]; preConfigure = '' cd src ''; - installPhase = '' + installPhase = let + mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); + in '' mkdir -p $out/share/sshuttle cp -R sshuttle *.py compat $out/share/sshuttle mkdir -p $out/bin ln -s $out/share/sshuttle/sshuttle $out/bin - wrapProgram $out/bin/sshuttle --prefix PATH : \ - "${stdenv.lib.concatStringsSep ":" (map (x: "${x}/bin") buildInputs)}" + wrapProgram $out/bin/sshuttle \ + --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \ + --prefix PYTHONPATH : "${mapPath (x: "$(toPythonPath ${x})") pythonPaths}" install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8 ''; -- GitLab From 0d08b2c5990f201081201445df955984f836cb2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 13:29:52 +0200 Subject: [PATCH 237/553] exfat: 1.2.0 -> 1.2.1 Upstream changes: - Fixed compatibility with Zalman VE-200: now newly created directories do not have archive bit set. - Fixed heap corruption: malformed FS can use invalid sector or cluster size. - Fixed hang on mount: malformed FS can have cyclic references in the clusters map. --- pkgs/tools/filesystems/exfat/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index a0a4223731c..08cb70dcfc8 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: -let version = "1.2.0"; in +let version = "1.2.1"; in stdenv.mkDerivation rec { name = "exfat-${version}"; src = fetchFromGitHub { - sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8"; + sha256 = "1k716civkxszkzpc7bcqqcmfik8lpwk3zwp2nl4v844b8g7r5xz9"; rev = "v${version}"; repo = "exfat"; owner = "relan"; @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; } - -- GitLab From 1f5f472a8a21f9bceed7f50c581007cb9c7ec3d6 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 24 Sep 2015 14:51:44 +0200 Subject: [PATCH 238/553] Revert "openvswitch module: do not fork services" This reverts commit fcab752abf94ae36e903097846c752d6b22e0dff. --- nixos/modules/virtualisation/openvswitch.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 4d6123e4ce5..a0231315236 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -102,11 +102,14 @@ in { --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ --pidfile=/var/run/openvswitch/ovsdb.pid \ + --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; RestartSec = 3; PIDFile = "/var/run/openvswitch/ovsdb.pid"; + # Use service type 'forking' to correctly determine when ovsdb-server is ready. + Type = "forking"; }; postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init @@ -122,9 +125,12 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ + --detach ''; PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; + # Use service type 'forking' to correctly determine when vswitchd is ready. + Type = "forking"; }; }; @@ -149,10 +155,12 @@ in { ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor \ + --monitor --detach \ unix:/var/run/openvswitch/db.sock ''; PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; + # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready. + Type = "forking"; }; preStart = '' -- GitLab From 9952afa2ffcb9401fb8216bd57895797cea5b72b Mon Sep 17 00:00:00 2001 From: Robbin C Date: Tue, 22 Sep 2015 08:11:53 +0800 Subject: [PATCH 239/553] kiwix: init at 0.9. This adds kiwix, an offline reader for Web content (like Wikipedia). --- pkgs/applications/misc/kiwix/default.nix | 110 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 112 insertions(+) create mode 100644 pkgs/applications/misc/kiwix/default.nix diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix new file mode 100644 index 00000000000..30db6a45ea1 --- /dev/null +++ b/pkgs/applications/misc/kiwix/default.nix @@ -0,0 +1,110 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, zip, python +, zlib, xapian, which , icu, libmicrohttpd , lzma, zimlib +, ctpp2, aria2, wget , bc, libuuid , glibc, libX11 +, libXext, libXt, libXrender , glib, dbus, dbus_glib, gtk +, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib +, atk +}: + +let + xulrunner64_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2; + sha256 = "0i3m30gm5z7qmas14id6ypvbmnb2k7jhz8aby2wz5vvv49zqmx3s"; + }; + xulrunnersdk64_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2; + sha256 = "0z90v7c4mq15g5klmsj8vs2r10fbygj3qzynx4952hkv8ihw8n3a"; + }; + xulrunner32_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2; + sha256 = "0yln6pxz8f6b9wm9124sx049z8mgi17lgd63rcv2hnix825y8gjb"; + }; + xulrunnersdk32_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2; + sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi"; + }; + + xulrunner_tar = if stdenv.system == "x86_64-linux" then xulrunner64_tar else xulrunner32_tar; + xulrunnersdk_tar = if stdenv.system == "x86_64-linux" then xulrunnersdk64_tar else xulrunnersdk32_tar; + pugixml_tar = fetchurl { + url = http://download.kiwix.org/dev/pugixml-1.2.tar.gz; + sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; + }; + +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "kiwix-${version}"; + version = "0.9"; + + src = fetchurl { + url = "http://download.kiwix.org/src/kiwix-${version}-src.tar.xz"; + sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; + }; + + buildInputs = [ + zip + pkgconfig + python + zlib + xapian + which + icu + libmicrohttpd + lzma + zimlib + ctpp2 + aria2 + wget + bc + libuuid + makeWrapper + ]; + + postUnpack = '' + cd kiwix-* + mkdir static + cp Makefile.in static/ + + cd src/dependencies + cp ${pugixml_tar} pugixml-1.2.tar.gz + + tar -xf ${xulrunner_tar} + tar -xf ${xulrunnersdk_tar} + + cd ../../.. + ''; + + configurePhase = '' + bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF + ''; + + buildPhase = '' + cd src/dependencies + make pugixml-1.2/libpugixml.a + + cd ../.. + bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF + + make + ''; + + installPhase = '' + make install + cp -r src/dependencies/xulrunner $out/lib/kiwix + + patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner + + rm $out/bin/kiwix + makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ + --suffix LD_LIBRARY_PATH : `cat ${stdenv.cc}/nix-support/orig-cc`/lib:${makeLibraryPath [libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix PATH : ${aria2}/bin + ''; + + meta = { + description = "An offline reader for Web content"; + homepage = http://kiwix.org; + license = licenses.gpl3; + maintainers = with maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3990a1f6326..6435be0269a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11768,6 +11768,8 @@ let inherit (gnome) libglade; }; + kiwix = callPackage ../applications/misc/kiwix { }; + koji = callPackage ../tools/package-management/koji { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; -- GitLab From 3733c25227ba2304bba2c3c4b390b4e7696b4c9d Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 19 Sep 2015 13:35:59 +0000 Subject: [PATCH 240/553] nodejs: 0.12.7 -> 4.1.0 A big version jump after io.js merge. dontDisableStatic flag is added since the ./configure script didn't recognize "--disable-static" flag added by default. New dependencies are also introduced, coming from io.js --- pkgs/development/web/nodejs/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 0f41723ee94..440ed7aca92 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "0.12.7"; + version = "4.1.0"; deps = { inherit openssl zlib libuv; @@ -31,18 +31,18 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj"; + sha256 = "453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; - + dontDisableStatic = true; prePatch = '' patchShebangs . ''; patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch; - buildInputs = [ python which ] + buildInputs = [ python which http-parser zlib libuv openssl python ] ++ (optional stdenv.isLinux utillinux) ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0607bc27851..c009ea0d39b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2008,8 +2008,9 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-0_12 = callPackage ../development/web/nodejs { + nodejs-4_1 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_6_1; + openssl = openssl_1_0_2; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { @@ -2019,16 +2020,16 @@ let nodejs = if stdenv.system == "armv5tel-linux" then nodejs-0_10 else - nodejs-0_12; + nodejs-4_1; - nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_12; }; + nodePackages_4_1 = callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; }; nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; nodePackages = if stdenv.system == "armv5tel-linux" then nodePackages_0_10 else - nodePackages_0_12; + nodePackages_4_1; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; }; -- GitLab From fbe9201a8ad9f06cc2f328376821fc659e757e30 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 19 Sep 2015 21:48:16 +0300 Subject: [PATCH 241/553] Remove io.js Since they're merged with nodejs and nodejs is updated to 4.1 --- pkgs/development/web/iojs/default.nix | 36 ------------------- pkgs/development/web/iojs/update-iojs | 50 --------------------------- pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 90 deletions(-) delete mode 100644 pkgs/development/web/iojs/default.nix delete mode 100755 pkgs/development/web/iojs/update-iojs diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix deleted file mode 100644 index 6a0c8ca512e..00000000000 --- a/pkgs/development/web/iojs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: - -let - version = "3.1.0"; - inherit (stdenv.lib) optional maintainers licenses platforms; -in stdenv.mkDerivation { - name = "iojs-${version}"; - - src = fetchurl { - url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727"; - }; - - prePatch = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure - ''; - - configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ]; - - # iojs has --enable-static but no --disable-static. Automatically adding --disable-static - # causes configure to fail, so don't add --disable-static. - dontDisableStatic = true; - - buildInputs = [ python openssl_1_0_2 http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); - setupHook = ../nodejs/setup-hook.sh; - - passthru.interpreterName = "iojs"; - - meta = { - description = "A friendly fork of Node.js with an open governance model"; - homepage = https://iojs.org/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.havvy ]; - }; -} diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs deleted file mode 100755 index 837238f27c6..00000000000 --- a/pkgs/development/web/iojs/update-iojs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Fetch the latest io.js release (stable/nightly) and update -# `default.nix` in this directory. -# -# Call this from the root of your nixpkgs directory. -# - -set -e - -HERE="$(dirname "$0")" - -latest() { - curl -s "$1" | grep 'href="v' \ - | tail -1 | sed 's/.*href="v//;s/\/".*//' -} - -latest_log() { - echo "Getting latest $1 version from $2" >&2 - version=$(latest "$2") - echo "version -> $version" >&2 - echo "$version" -} - -url() { - nix-instantiate -A "$1" \ - | xargs cat \ - | sed 's/.*"urls","//;s/".*//' -} - -hash() { - nix-prefetch-url "$1" -} - -hash_log() { - echo "Finding hash for $1" >&2 - value=$(hash "$1") - echo "hash -> $value" >&2 - echo "$value" -} - -stableVersion=$(latest_log stable 'https://iojs.org/dist/') -stableHash=$(hash_log "$(url iojs.src)") - -sed -i \ - "/version = /s/\"[^\"]*\"/\"$stableVersion\"/" \ - "$HERE/default.nix" -sed -i \ - "/sha256 = /s/\"[^\"]*\"/\"$stableHash\"/" \ - "$HERE/default.nix" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c009ea0d39b..8390b16def9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2031,10 +2031,6 @@ let else nodePackages_4_1; - iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; }; - - iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; - npm2nix = nodePackages.npm2nix; ldapvi = callPackage ../tools/misc/ldapvi { }; -- GitLab From f40c7ed1435d9507868337ae7509fe6d0392498b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 19:58:41 +0200 Subject: [PATCH 242/553] Remove relatime mount option This has been the kernel default for a long time. --- nixos/modules/tasks/filesystems.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 4409bd4cc8c..ab64106f353 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -41,7 +41,7 @@ let }; options = mkOption { - default = "defaults,relatime"; + default = "defaults"; example = "data=journal"; type = types.commas; description = "Options used to mount the file system."; @@ -69,8 +69,6 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); - # The vboxsf filesystem doesn't support the relatime option: - options = mkIf (config.fsType == "vboxsf") (mkDefault "defaults"); }; }; -- GitLab From 9d92bd7845a0fcf895a1e7c4ae95c908be673060 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 18:13:14 +0200 Subject: [PATCH 243/553] Add filesystem option to automatically grow to the maximum size This is primarily for EC2 and other cloud environments, where the disk may be bigger than the original image. --- nixos/modules/system/boot/stage-1-init.sh | 15 +++++++++- nixos/modules/system/boot/stage-1.nix | 7 ++++- nixos/modules/tasks/filesystems.nix | 16 ++++++++-- nixos/tests/make-test.nix | 2 +- nixos/tests/resize-root.nix | 36 +++++++++++++++++++++++ 5 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 nixos/tests/resize-root.nix diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 480bbfa2b07..516cbb295fa 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -290,10 +290,23 @@ mountFS() { if [ -z "$fsType" ]; then fsType=auto; fi fi - echo "$device /mnt-root$mountPoint $fsType $options" >> /etc/fstab + # Filter out x- options, which busybox doesn't do yet. + local optionsFiltered="$(IFS=,; for i in $options; do if [ "${i:0:2}" != "x-" ]; then echo -n $i,; fi; done)" + + echo "$device /mnt-root$mountPoint $fsType $optionsFiltered" >> /etc/fstab checkFS "$device" "$fsType" + # Optionally resize the filesystem. + case $options in + *x-nixos.autoresize*) + if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then + echo "resizing $device..." + resize2fs "$device" + fi + ;; + esac + # Create backing directories for unionfs-fuse. if [ "$fsType" = unionfs-fuse ]; then for i in $(IFS=:; echo ${options##*,dirs=}); do diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f782eca3f64..ace2d10ec9c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -70,6 +70,12 @@ let copy_bin_and_libs ${pkgs.kmod}/bin/kmod ln -sf kmod $out/bin/modprobe + # Copy resize2fs if needed. + ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) '' + # We need mke2fs in the initrd. + copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs + ''} + ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly @@ -393,7 +399,6 @@ in } ]; - system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk; system.build.extraUtils = extraUtils; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ab64106f353..9dd250f140c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -7,7 +7,7 @@ let fileSystems = attrValues config.fileSystems; - prioOption = prio: optionalString (prio !=null) " pri=${toString prio}"; + prioOption = prio: optionalString (prio != null) " pri=${toString prio}"; fileSystemOpts = { name, config, ... }: { @@ -43,7 +43,7 @@ let options = mkOption { default = "defaults"; example = "data=journal"; - type = types.commas; + type = types.commas; # FIXME: should be a list description = "Options used to mount the file system."; }; @@ -58,6 +58,17 @@ let ''; }; + autoResize = mkOption { + default = false; + type = types.bool; + description = '' + If set, the filesystem is grown to its maximum size before + being mounted. (This is typically the size of the containing + partition.) This is currently only supported for ext2/3/4 + filesystems that are mounted during early boot. + ''; + }; + noCheck = mkOption { default = false; type = types.bool; @@ -69,6 +80,7 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); + options = mkIf config.autoResize "x-nixos.autoresize"; }; }; diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index 285ca5b71d6..f3e26aa7e74 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if builtins.isFunction f then f (args // { inherit pkgs; }) else f) +makeTest (if builtins.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/nixos/tests/resize-root.nix b/nixos/tests/resize-root.nix new file mode 100644 index 00000000000..c8ccab38ab6 --- /dev/null +++ b/nixos/tests/resize-root.nix @@ -0,0 +1,36 @@ +import ./make-test.nix ({ pkgs, lib, ...} : { + + meta.maintainers = [ lib.maintainers.eelco ]; + + machine = { config, pkgs, ... }: { + virtualisation.diskSize = 512; + fileSystems = lib.mkVMOverride { + "/".autoResize = true; + }; + }; + + testScript = + '' + # Create a VM with a 512 MiB disk. + $machine->start; + $machine->waitForUnit("multi-user.target"); + my $blocks = $machine->succeed("stat -c %b -f /"); + my $bsize = $machine->succeed("stat -c %S -f /"); + my $size = $blocks * $bsize; + die "wrong free space $size" if $size < 480 * 1024 * 1024 || $size > 512 * 1024 * 1024; + $machine->succeed("touch /marker"); + $machine->shutdown; + + # Grow the disk to 1024 MiB. + system("qemu-img resize vm-state-machine/machine.qcow2 1024M") == 0 or die; + + # Start the VM again and check whether the initrd has correctly + # grown the root filesystem. + $machine->start; + $machine->waitForUnit("multi-user.target"); + $machine->succeed("[ -e /marker ]"); + my $blocks = $machine->succeed("stat -c %b -f /"); + my $size = $blocks * $bsize; + die "wrong free space $size" if $size < 980 * 1024 * 1024 || $size > 1024 * 1024 * 1024; + ''; +}) -- GitLab From 866e3932c74962402f19053883f436ffad1c9a8a Mon Sep 17 00:00:00 2001 From: michael bishop Date: Thu, 24 Sep 2015 16:42:06 -0300 Subject: [PATCH 244/553] tgt: init at 1.0.60 --- pkgs/tools/networking/tgt/default.nix | 37 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/networking/tgt/default.nix diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix new file mode 100644 index 00000000000..b5acdce800a --- /dev/null +++ b/pkgs/tools/networking/tgt/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages }: + +let + version = "1.0.60"; +in stdenv.mkDerivation rec { + name = "tgt-${version}"; + src = fetchFromGitHub { + owner = "fujita"; + repo = "tgt"; + rev = "ab51727a361bf296b1c2036375b5e45479059921"; + sha256 = "1bf8rn3mavjrzkp5k23akqn5ilw43g8mpfr68z1bi8s9lr2gkf37"; + }; + + buildInputs = [ libxslt systemd libaio ]; + + DESTDIR = "$(out)"; + PREFIX = "/"; + SD_NOTIFY="1"; + + preConfigure = '' + sed -i 's|/usr/bin/||' doc/Makefile + sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile + sed -i 's|/usr/include/sys/|${stdenv.glibc}/include/sys/|' usr/Makefile + sed -i 's|/usr/include/linux/|${stdenv.glibc}/include/linux/|' usr/Makefile + ''; + + postInstall = '' + sed -i 's|#!/usr/bin/perl|#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}|' $out/sbin/tgt-admin + ''; + + enableParallelBuilding = true; + meta = { + description = "iSCSI Target daemon with rdma support"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0607bc27851..2937bcf2ccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9580,6 +9580,8 @@ let openiscsi = callPackage ../os-specific/linux/open-iscsi { }; + tgt = callPackage ../tools/networking/tgt { }; + # -- Linux kernel expressions ------------------------------------------------ linuxHeaders = linuxHeaders_3_12; -- GitLab From 7216159cbee6b16d8289a36ce663f91751ae0ec5 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Thu, 24 Sep 2015 18:34:02 +0300 Subject: [PATCH 245/553] memcached: build on darwin Versions up to 1.4.24 are broken when building with clang: https://code.google.com/p/memcached/issues/detail?id=409 --- pkgs/servers/memcached/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 294cb003ab4..9d110d9c146 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://memcached.org/; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } - -- GitLab From 8ba640d932d69a1c25d7a4906955d6780e7b24e4 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Thu, 24 Sep 2015 18:47:19 +0300 Subject: [PATCH 246/553] libmemcached: build on darwin (patch from homebrew) --- .../libraries/libmemcached/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 16196c9abc9..619aa014497 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl, cyrus_sasl, libevent }: +{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: stdenv.mkDerivation rec { name = "libmemcached-1.0.18"; - + src = fetchurl { url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; - + # Fix linking against libpthread (patch from Fedora) # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 # https://bugs.launchpad.net/libmemcached/+bug/1281907 - patches = [ ./libmemcached-fix-linking-with-libpthread.patch ]; + # Fix building on OS X (patch from Homebrew) + # https://bugs.launchpad.net/libmemcached/+bug/1245562 + patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; + sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb"; + }); buildInputs = [ cyrus_sasl libevent ]; @@ -19,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } -- GitLab From 5c4ad05f9655da667d6e6f0cd51aab6a5f31b3e0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:14:58 -0700 Subject: [PATCH 247/553] soxr: 0.1.1 -> 0.1.2 --- pkgs/applications/misc/audio/soxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 084a95b962a..135ae47aa84 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "soxr-0.1.1"; + name = "soxr-0.1.2"; src = fetchurl { url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; - sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; + sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"; }; preConfigure = if stdenv.isDarwin then '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src ''; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "An audio resampling library"; -- GitLab From de514ea33425d6087bb2465565930623773999ff Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:15:14 -0700 Subject: [PATCH 248/553] llvm2: 2.02.128 -> 2.02.132 --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 6ddbbc9340f..0e6bf512aa2 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.128"; + version = "2.02.132"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0a5m63b729ranbnmg964b36jlbfc140bs92di37w2gq54hzp1v97"; + sha256 = "0ac8izssflj371zzar16965zlia6a6zd97i0n00jxfxssnfa0fj1"; }; configureFlags = [ -- GitLab From 0f85ef398281bcaeafe41353f055477c268fc0dd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:15:24 -0700 Subject: [PATCH 249/553] unifi: 4.6.6 -> 4.7.5 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b19ccd8db8d..5d0e7455d94 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "4.6.6"; + version = "4.7.5"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0c9j5h4dyivfdic1y2q3nvhzajzagskzxyj7009icmy3fzgkv3y5"; + sha256 = "1d5jkpwnz4wvcjr5i73m8i5aah6rkxwd0r9239l90v1ja9lkyk7w"; }; buildInputs = [ unzip ]; -- GitLab From 83ac62eb5d19625338dea35dd63e4f684e0dca38 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:33:57 -0700 Subject: [PATCH 250/553] pulseaudio: 6.0 -> 7.0 --- pkgs/servers/pulseaudio/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 86bcb3e1cec..d1888e1928a 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "6.0"; + version = "7.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"; + sha256 = "1yp8x8z4wigrzik131kjdyhn7hznazvbkbp2zz1vy9l9gqvy26na"; }; patches = [ ./caps-fix.patch ]; @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" + "--with-bash-completion-dir=\${out}/share/bash-completions/completions" ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" @@ -109,7 +110,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} - sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-6.0.la + sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la ''; meta = { -- GitLab From 560674ae83defcb69965129a787191c30f934b29 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 23 Sep 2015 22:07:35 -0500 Subject: [PATCH 251/553] s6 2.1.3.0 -> 2.2.1.0 --- pkgs/servers/s6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 10d4520d912..5e29c20339c 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.3.0"; + version = "2.2.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3"; + sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9"; }; dontDisableStatic = true; -- GitLab From 71025243a12419a0bc519dcf998b66c6608e7f8f Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 23 Sep 2015 22:08:17 -0500 Subject: [PATCH 252/553] s6-portable-utils 2.0.5.0 -> 2.0.5.2 --- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 2f0a647f343..0ca0774989d 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.5.0"; + version = "2.0.5.2"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "099c7isi5vynis4iaiz362rvr73w4rvjhv3c2f7ddxgfyvd2331l"; + sha256 = "0d5dvqz61abr4m2n10by8hccvw51jdvyckvpbbq0c57viri54jzm"; }; dontDisableStatic = true; -- GitLab From dacc96be28eb5c821d701f8c2c8ba9cfb21f02ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Sep 2015 17:19:28 +0200 Subject: [PATCH 253/553] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/eaa43c65b3dbe002880d1c823e636b471c9b70f3 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/c048a402d3e71ab8d3af72799f148923d21ce661 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/c7012a704b558556ca067861eb156f9916aa2afb - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a74568b5547db646674ce2771943ccba35e34129 --- .../haskell-modules/configuration-lts-0.0.nix | 6 + .../haskell-modules/configuration-lts-0.1.nix | 6 + .../haskell-modules/configuration-lts-0.2.nix | 6 + .../haskell-modules/configuration-lts-0.3.nix | 6 + .../haskell-modules/configuration-lts-0.4.nix | 6 + .../haskell-modules/configuration-lts-0.5.nix | 6 + .../haskell-modules/configuration-lts-0.6.nix | 6 + .../haskell-modules/configuration-lts-0.7.nix | 6 + .../haskell-modules/configuration-lts-1.0.nix | 6 + .../haskell-modules/configuration-lts-1.1.nix | 6 + .../configuration-lts-1.10.nix | 7 + .../configuration-lts-1.11.nix | 7 + .../configuration-lts-1.12.nix | 7 + .../configuration-lts-1.13.nix | 7 + .../configuration-lts-1.14.nix | 7 + .../configuration-lts-1.15.nix | 7 + .../haskell-modules/configuration-lts-1.2.nix | 6 + .../haskell-modules/configuration-lts-1.4.nix | 7 + .../haskell-modules/configuration-lts-1.5.nix | 7 + .../haskell-modules/configuration-lts-1.7.nix | 7 + .../haskell-modules/configuration-lts-1.8.nix | 7 + .../haskell-modules/configuration-lts-1.9.nix | 7 + .../haskell-modules/configuration-lts-2.0.nix | 8 + .../haskell-modules/configuration-lts-2.1.nix | 8 + .../configuration-lts-2.10.nix | 9 + .../configuration-lts-2.11.nix | 9 + .../configuration-lts-2.12.nix | 9 + .../configuration-lts-2.13.nix | 9 + .../configuration-lts-2.14.nix | 9 + .../configuration-lts-2.15.nix | 10 + .../configuration-lts-2.16.nix | 10 + .../configuration-lts-2.17.nix | 10 + .../configuration-lts-2.18.nix | 10 + .../configuration-lts-2.19.nix | 10 + .../haskell-modules/configuration-lts-2.2.nix | 8 + .../configuration-lts-2.20.nix | 10 + .../configuration-lts-2.21.nix | 10 + .../configuration-lts-2.22.nix | 10 + .../haskell-modules/configuration-lts-2.3.nix | 8 + .../haskell-modules/configuration-lts-2.4.nix | 8 + .../haskell-modules/configuration-lts-2.5.nix | 8 + .../haskell-modules/configuration-lts-2.6.nix | 9 + .../haskell-modules/configuration-lts-2.7.nix | 9 + .../haskell-modules/configuration-lts-2.8.nix | 9 + .../haskell-modules/configuration-lts-2.9.nix | 9 + .../haskell-modules/configuration-lts-3.0.nix | 21 + .../haskell-modules/configuration-lts-3.1.nix | 22 + .../haskell-modules/configuration-lts-3.2.nix | 22 + .../haskell-modules/configuration-lts-3.3.nix | 31 + .../haskell-modules/configuration-lts-3.4.nix | 31 + .../haskell-modules/configuration-lts-3.5.nix | 34 + .../haskell-modules/configuration-lts-3.6.nix | 36 + .../haskell-modules/hackage-packages.nix | 1171 ++++++++++++----- 53 files changed, 1358 insertions(+), 362 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index d921561a796..9c2a5ed9691 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2276,6 +2278,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3926,6 +3929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6094,6 +6098,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7304,6 +7309,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index ab29b6397d7..90d358e7e8a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3925,6 +3928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6093,6 +6097,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7303,6 +7308,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 392daa1edf4..a5d72fed900 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3925,6 +3928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6093,6 +6097,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7303,6 +7308,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 9c990e43430..d9b34f0dbde 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3925,6 +3928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6093,6 +6097,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7303,6 +7308,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 9f7d29835d9..dcffcfd6124 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3922,6 +3925,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6090,6 +6094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7298,6 +7303,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 6aaccab73b2..c1c48f8380b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_6"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3922,6 +3925,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6090,6 +6094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7298,6 +7303,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index c19a016642c..62d922d2175 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2090,6 +2091,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2272,6 +2274,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_6"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3918,6 +3921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6085,6 +6089,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7292,6 +7297,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 88d241d3341..02f95e3a373 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2090,6 +2091,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2272,6 +2274,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_6"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3918,6 +3921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6085,6 +6089,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7292,6 +7297,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 34b00b03846..3f4684f542e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -637,6 +637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2082,6 +2083,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2264,6 +2266,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_7"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-pubkey-types" = doDistribute super."crypto-pubkey-types_0_4_2_3"; @@ -3901,6 +3904,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6066,6 +6070,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7270,6 +7275,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index db60388b0e6..f96e772d26d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -637,6 +637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2078,6 +2079,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2259,6 +2261,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_7"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; @@ -3892,6 +3895,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6052,6 +6056,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7254,6 +7259,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index ec11903b6da..a5380c3a3c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2560,6 +2563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3877,6 +3881,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6020,6 +6025,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7218,6 +7224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 963aec2889b..29b57c83498 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2560,6 +2563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3876,6 +3880,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6016,6 +6021,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7212,6 +7218,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 49882800183..60b6d40b7c5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2560,6 +2563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3875,6 +3879,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6015,6 +6020,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7210,6 +7216,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 549ca45a4c6..113ea14326a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2559,6 +2562,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3873,6 +3877,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6012,6 +6017,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7207,6 +7213,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 9247ad53615..c69491b6edb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -635,6 +635,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2070,6 +2071,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2251,6 +2253,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2556,6 +2559,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3869,6 +3873,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6005,6 +6010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7198,6 +7204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index ea209b42326..78c4dee6dce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -634,6 +634,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2067,6 +2068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2247,6 +2249,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2551,6 +2554,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3862,6 +3866,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5996,6 +6001,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7185,6 +7191,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 0a55c99859e..f45d8387fce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -637,6 +637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2077,6 +2078,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2258,6 +2260,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -3889,6 +3892,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6048,6 +6052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7248,6 +7253,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index e11a53d66a4..c7f3548ebb3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2076,6 +2077,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2257,6 +2259,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2564,6 +2567,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3885,6 +3889,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6041,6 +6046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7241,6 +7247,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index d287859de56..a3221e8e315 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2075,6 +2076,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2256,6 +2258,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2563,6 +2566,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3884,6 +3888,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6039,6 +6044,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7239,6 +7245,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 95d66b44ba5..caecbb3ba6d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2074,6 +2075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2255,6 +2257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2562,6 +2565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3883,6 +3887,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6032,6 +6037,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7232,6 +7238,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 547ba511273..38d8175b9eb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2074,6 +2075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2255,6 +2257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2562,6 +2565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3880,6 +3884,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6027,6 +6032,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7227,6 +7233,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index d76e4898be9..ae4c546b77b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2074,6 +2075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2255,6 +2257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2562,6 +2565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3879,6 +3883,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6023,6 +6028,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7223,6 +7229,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 7ae2e87b2de..7b6d12ce7b9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2049,6 +2050,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2226,6 +2228,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2529,6 +2532,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3830,6 +3834,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5053,6 +5058,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5925,6 +5931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7106,6 +7113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index f2d467b09b7..cb81e63cc6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2048,6 +2049,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2225,6 +2227,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2528,6 +2531,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3828,6 +3832,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5051,6 +5056,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5923,6 +5929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7104,6 +7111,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 7e571832448..6251ae42cb4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1334,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2032,6 +2034,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2207,6 +2210,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2508,6 +2512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3798,6 +3803,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5004,6 +5010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5867,6 +5874,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7031,6 +7039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index ee4d3dff5a8..e360af200b0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1333,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2031,6 +2033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2206,6 +2209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2507,6 +2511,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3795,6 +3800,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4997,6 +5003,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5858,6 +5865,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7020,6 +7028,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 6164b7f58a5..98a88419684 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1333,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2031,6 +2033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2206,6 +2209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2507,6 +2511,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3795,6 +3800,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4997,6 +5003,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5858,6 +5865,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7019,6 +7027,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 0fbe54367a2..904c8a592c7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1333,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2031,6 +2033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2206,6 +2209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2507,6 +2511,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3794,6 +3799,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4995,6 +5001,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5855,6 +5862,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7015,6 +7023,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 1085c9d1353..b698ca9b988 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1332,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2030,6 +2032,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2205,6 +2208,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2506,6 +2510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3792,6 +3797,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4992,6 +4998,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5852,6 +5859,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7010,6 +7018,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 4a83050a9d1..df87e6beb8a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1332,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2030,6 +2032,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2205,6 +2208,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2506,6 +2510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3789,6 +3794,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4989,6 +4995,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5728,6 +5735,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5845,6 +5853,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7002,6 +7011,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index a7d090ec36a..5804e6b5115 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -623,6 +623,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1330,6 +1331,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2027,6 +2029,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2201,6 +2204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2501,6 +2505,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3779,6 +3784,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4978,6 +4984,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5716,6 +5723,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5833,6 +5841,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6988,6 +6997,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 631cf76ca52..ca5d663200b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -623,6 +623,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1329,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2024,6 +2026,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2198,6 +2201,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2498,6 +2502,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3771,6 +3776,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4970,6 +4976,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5706,6 +5713,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5823,6 +5831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6976,6 +6985,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 86cf33685bc..af4c80ca678 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2019,6 +2021,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2193,6 +2196,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2493,6 +2497,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3763,6 +3768,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4962,6 +4968,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5696,6 +5703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5812,6 +5820,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6964,6 +6973,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 71e429d0749..5ed948039ca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2019,6 +2021,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2193,6 +2196,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2493,6 +2497,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3762,6 +3767,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4961,6 +4967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5693,6 +5700,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5809,6 +5817,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6959,6 +6968,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 516d30ac378..afc3887349c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2045,6 +2046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2222,6 +2224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2525,6 +2528,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3824,6 +3828,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5047,6 +5052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5918,6 +5924,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7099,6 +7106,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index c2b00edaebb..ca5a26d7215 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2018,6 +2020,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2190,6 +2193,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2490,6 +2494,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3757,6 +3762,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4956,6 +4962,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5688,6 +5695,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5803,6 +5811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6952,6 +6961,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 71bf24dcb03..54920ae4951 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2017,6 +2019,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2189,6 +2192,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2489,6 +2493,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3755,6 +3760,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4953,6 +4959,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5685,6 +5692,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5798,6 +5806,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6945,6 +6954,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 73f903022f5..5eec2c8256f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1326,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2016,6 +2018,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2188,6 +2191,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2488,6 +2492,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3754,6 +3759,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4950,6 +4956,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5681,6 +5688,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5794,6 +5802,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6941,6 +6950,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 5660aee1eed..2cd7d80315a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2045,6 +2046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2222,6 +2224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2525,6 +2528,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3822,6 +3826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5044,6 +5049,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5915,6 +5921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7095,6 +7102,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 2dde8fb4a0e..69c9268730e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2044,6 +2045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2221,6 +2223,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2524,6 +2527,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3820,6 +3824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5042,6 +5047,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5910,6 +5916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7088,6 +7095,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 1302aaeebee..d4b8e215392 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2044,6 +2045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2220,6 +2222,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2522,6 +2525,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3818,6 +3822,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5039,6 +5044,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5907,6 +5913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7084,6 +7091,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index cb01a3ab274..2c7523f006b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1337,6 +1338,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2039,6 +2041,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2215,6 +2218,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2517,6 +2521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3811,6 +3816,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5032,6 +5038,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5899,6 +5906,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7076,6 +7084,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 44648738255..7f4e246beb7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1335,6 +1336,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2037,6 +2039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2213,6 +2216,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2515,6 +2519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3809,6 +3814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5030,6 +5036,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5897,6 +5904,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7074,6 +7082,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 1c0294f8e04..8b868d8a092 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1334,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2036,6 +2038,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2211,6 +2214,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2513,6 +2517,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3806,6 +3811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5025,6 +5031,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5892,6 +5899,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7065,6 +7073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 72761449f4c..3630f0112ec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1334,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2033,6 +2035,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2208,6 +2211,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2510,6 +2514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3800,6 +3805,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5016,6 +5022,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5880,6 +5887,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7050,6 +7058,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index a4a309a141e..12ddb5dbd84 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -605,6 +606,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1281,6 +1283,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1938,6 +1941,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2103,6 +2107,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2334,18 +2339,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2380,6 +2391,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3601,6 +3613,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4436,6 +4449,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4728,6 +4742,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5424,6 +5439,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5529,6 +5545,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_4_1"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5674,6 +5691,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5764,6 +5782,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6634,6 +6653,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6916,6 +6936,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; "tls" = doDistribute super."tls_1_3_1"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index f4705ae236b..d0194ab4c90 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -605,6 +606,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1279,6 +1281,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1935,6 +1938,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2100,6 +2104,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2331,18 +2336,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2377,6 +2388,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3594,6 +3606,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4429,6 +4442,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4720,6 +4734,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5415,6 +5430,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5519,6 +5535,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_4_1"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5664,6 +5681,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5754,6 +5772,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6623,6 +6642,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6905,6 +6925,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; "tls" = doDistribute super."tls_1_3_1"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7357,6 +7378,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index a6b4ffa8b86..4b05c6ffe95 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -602,6 +603,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1275,6 +1277,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1931,6 +1934,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2096,6 +2100,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2327,18 +2332,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2373,6 +2384,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3587,6 +3599,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4420,6 +4433,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4710,6 +4724,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5405,6 +5420,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5508,6 +5524,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5653,6 +5670,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5742,6 +5760,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6606,6 +6625,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6886,6 +6906,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; "tls" = doDistribute super."tls_1_3_1"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7336,6 +7357,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index dac1d68ca46..23dfe503b05 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1273,6 +1275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1835,6 +1838,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1924,6 +1930,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2087,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2318,18 +2326,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2364,6 +2378,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3577,6 +3592,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4408,6 +4424,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4698,6 +4715,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5390,6 +5408,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5493,6 +5512,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5638,6 +5658,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5726,6 +5747,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6139,16 +6161,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6583,6 +6610,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6861,6 +6889,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7310,6 +7340,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 624c48a0542..d080421d95d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1273,6 +1275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1834,6 +1837,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1923,6 +1929,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2086,6 +2093,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2317,18 +2325,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2363,6 +2377,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3576,6 +3591,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4407,6 +4423,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4697,6 +4714,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5388,6 +5406,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5491,6 +5510,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5636,6 +5656,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5724,6 +5745,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6136,16 +6158,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6578,6 +6605,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6856,6 +6884,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7304,6 +7334,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 69854c8a3ab..8b4aee0bc1e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1271,6 +1273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1831,6 +1834,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1920,6 +1926,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2082,6 +2089,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2313,18 +2321,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_5"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2359,6 +2373,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3568,6 +3583,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4394,6 +4410,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4683,6 +4700,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5371,6 +5389,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5472,6 +5491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "polimorf" = dontDistribute super."polimorf"; "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5615,6 +5635,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5703,6 +5724,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6114,16 +6136,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; @@ -6436,6 +6463,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "stable-maps" = dontDistribute super."stable-maps"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_4_1"; "stack-prism" = dontDistribute super."stack-prism"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -6553,6 +6581,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6827,6 +6856,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7274,6 +7305,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; @@ -7350,7 +7382,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "x-dsp" = dontDistribute super."x-dsp"; "x11-xim" = dontDistribute super."x11-xim"; "x11-xinput" = dontDistribute super."x11-xinput"; + "x509" = doDistribute super."x509_1_6_1"; "x509-util" = dontDistribute super."x509-util"; + "x509-validation" = doDistribute super."x509-validation_1_6_2"; "xattr" = dontDistribute super."xattr"; "xbattbar" = dontDistribute super."xbattbar"; "xcb-types" = dontDistribute super."xcb-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f4b25c6283c..13a5d10c6c1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1269,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1827,6 +1830,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1916,6 +1922,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2078,6 +2085,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2309,15 +2317,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2352,6 +2366,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3553,6 +3568,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -3939,6 +3955,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_23"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4373,6 +4390,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4660,6 +4678,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5345,6 +5364,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5445,6 +5465,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "polimorf" = dontDistribute super."polimorf"; "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5586,6 +5607,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5674,6 +5696,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -5863,6 +5886,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -6084,16 +6108,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; @@ -6405,6 +6434,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "stable-maps" = dontDistribute super."stable-maps"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_4_1"; "stack-prism" = dontDistribute super."stack-prism"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -6522,6 +6552,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6796,6 +6827,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7239,6 +7272,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; @@ -7315,7 +7349,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "x-dsp" = dontDistribute super."x-dsp"; "x11-xim" = dontDistribute super."x11-xim"; "x11-xinput" = dontDistribute super."x11-xinput"; + "x509" = doDistribute super."x509_1_6_1"; "x509-util" = dontDistribute super."x509-util"; + "x509-validation" = doDistribute super."x509-validation_1_6_2"; "xattr" = dontDistribute super."xattr"; "xbattbar" = dontDistribute super."xbattbar"; "xcb-types" = dontDistribute super."xcb-types"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01cc139665a..d91f8153e20 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -461,6 +461,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -1666,7 +1667,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "BlogLiterately" = callPackage + "BlogLiterately_0_8_1_1" = callPackage ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc @@ -1689,9 +1690,10 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "BlogLiterately_0_8_1_2" = callPackage + "BlogLiterately" = callPackage ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc @@ -1714,7 +1716,6 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams_0_1_4_3" = callPackage @@ -5137,6 +5138,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -5153,6 +5155,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTPLine" = callPackage @@ -6125,8 +6128,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.0.2"; - sha256 = "e84c2c8eaa22b87277ce700972989b249825fe21a439bebc727e3e90ac7b9378"; + version = "2.1"; + sha256 = "610f42cc26b6bffc168df9f681e532aea4f6cb94c6b705a512cd2a0f23186d17"; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear transformers @@ -6174,8 +6177,8 @@ self: { ({ mkDerivation, base, GLFW-b, GPipe, transformers }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.0"; - sha256 = "1d5fbf132f11a5378d19ac31361a0783d0e3dd4324809df4fa0fbabcdbb34b5c"; + version = "1.1"; + sha256 = "23905c46a7894ce2cb2ab66d02ccdb70324e4e4aae9f45b2ce748ef5a94a3c1a"; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; @@ -6271,8 +6274,8 @@ self: { ({ mkDerivation, array, base, directory, random, wx, wxcore }: mkDerivation { pname = "GeBoP"; - version = "1.7.4.1"; - sha256 = "c5f5ae69613026e6666f753b94d0440f97ffd6df2c87aba1a7545c2366968d32"; + version = "1.7.5"; + sha256 = "fdf0a97c6c81fbb88973e20167535959bbe0e781af69380ec1c44dc78b665093"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -7251,6 +7254,7 @@ self: { homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGL" = callPackage @@ -7927,6 +7931,7 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) opencv;}; "HPDF" = callPackage @@ -11743,6 +11748,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MTGBuilder" = callPackage + ({ mkDerivation, base, containers, mtl, parsec }: + mkDerivation { + pname = "MTGBuilder"; + version = "0.1.0.2"; + sha256 = "a676309a7f5a6f6797c3edb8f9fbf8b1f7b17f38d3be68011b24827629ba63ed"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base containers mtl parsec ]; + description = "Builds decks out of a meta"; + license = stdenv.lib.licenses.mit; + }) {}; + "MagicHaskeller" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , ghc, ghc-paths, haskell-src, html, mtl, network, old-time, pretty @@ -13352,6 +13370,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -14211,6 +14230,7 @@ self: { homepage = "http://haskell.org/haskellwiki/PortMidi"; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -14888,6 +14908,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -15443,6 +15464,7 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL-mpeg" = callPackage @@ -17899,20 +17921,19 @@ self: { ({ mkDerivation, aeson, base, bimap, bytestring, containers, curl , curlhs, directory, failure, filepath, mtl, optparse-applicative , parsec, pretty-show, regexpr, safe, split, tagsoup - , tagsoup-parsec, template-haskell, text, time, transformers - , utf8-string, vector + , template-haskell, text, time, transformers, utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "0.5.4"; - sha256 = "ef7ebc7432cb5954f1f63cc458e8c6401422ecbfdff61cb9a6170785abe94118"; + version = "0.5.5"; + sha256 = "7c7e8d1b89c2fb53f8c382939f49249ee13a188c21907bcd4cebc9b21e01948d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bimap bytestring containers curlhs directory failure filepath mtl optparse-applicative parsec pretty-show regexpr safe - split tagsoup tagsoup-parsec template-haskell text time - transformers utf8-string vector + split tagsoup template-haskell text time transformers utf8-string + vector ]; executableSystemDepends = [ curl ]; homepage = "http://github.com/grwlf/vkhs"; @@ -21601,6 +21622,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "alarmclock_0_2_0_5" = callPackage @@ -22010,6 +22032,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -22029,6 +22052,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "alsa-midi" = callPackage @@ -22065,6 +22089,7 @@ self: { homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -22085,6 +22110,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -22120,6 +22146,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -27013,35 +27040,6 @@ self: { }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 - }: - mkDerivation { - pname = "arbtt"; - version = "0.9.0.6"; - sha256 = "f5f066f471761ed48388b3a80beff4ae3deaa7845666a513fa30dadf7dc4d5ad"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 - ]; - executableSystemDepends = [ libXScrnSaver ]; - testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec - pcre-light process-extras tasty tasty-golden tasty-hunit time - transformers unix utf8-string - ]; - homepage = "http://arbtt.nomeata.de/"; - description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - }) {inherit (pkgs.xorg) libXScrnSaver;}; - - "arbtt_0_9_0_7" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -27068,7 +27066,6 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -27891,7 +27888,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-parse" = callPackage + "asn1-parse_0_9_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, mtl }: mkDerivation { @@ -27904,9 +27901,10 @@ self: { homepage = "https://github.com/vincenthz/hs-asn1"; description = "Simple monadic parser for ASN1 stream types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-parse_0_9_4" = callPackage + "asn1-parse" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: mkDerivation { pname = "asn1-parse"; @@ -27918,7 +27916,6 @@ self: { homepage = "https://github.com/vincenthz/hs-asn1"; description = "Simple monadic parser for ASN1 stream types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-types_0_3_0" = callPackage @@ -32714,6 +32711,7 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -33010,6 +33008,7 @@ self: { homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -33145,6 +33144,7 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage @@ -37093,40 +37093,6 @@ self: { }) {}; "cabal-debian" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal - , containers, data-default, debian, deepseq, Diff, directory - , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl - , network-uri, newtype-generics, optparse-applicative, parsec - , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix - , Unixutils, utf8-string - }: - mkDerivation { - pname = "cabal-debian"; - version = "4.31.4"; - sha256 = "f700f3fef9d6ec3e95468cfe65c7b77b4ec560668ec876aeed01d833804c18bd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base bifunctors Cabal containers data-default debian - deepseq Diff directory exceptions filepath hsemail HUnit lens - memoize mtl network-uri newtype-generics optparse-applicative - parsec pretty process pureMD5 regex-tdfa set-extra syb text unix - Unixutils utf8-string - ]; - executableHaskellDepends = [ - base Cabal debian lens mtl pretty Unixutils - ]; - testHaskellDepends = [ - base Cabal containers debian Diff directory filepath hsemail HUnit - lens pretty process text - ]; - doCheck = false; - homepage = "https://github.com/ddssff/cabal-debian"; - description = "Create a Debianization for a Cabal package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-debian_4_31_6" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bifunctors, bytestring , bzlib, Cabal, containers, data-default, deepseq, Diff, directory , exceptions, filepath, HaXml, hsemail, HUnit, lens, ListLike @@ -37156,10 +37122,10 @@ self: { base Cabal containers Diff directory filepath hsemail HUnit lens pretty process text ]; + doCheck = false; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -38989,8 +38955,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.3.0.1"; - sha256 = "98c0c4c823753eb64cb4d11a0850fdb5c30e2e3dd17f689f642eabcf292126a8"; + version = "2.4.1.0"; + sha256 = "a7c0cfdf11abca898a0aa6ecd2258311a3b29f68063a1aaf971aa3dcab4b0a68"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear vector vector-binary-instances @@ -39021,12 +38987,16 @@ self: { }) {casadi_control = null;}; "casadi-bindings-core" = callPackage - ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }: + ({ mkDerivation, base, casadi, casadi-bindings-internal, containers + , vector + }: mkDerivation { pname = "casadi-bindings-core"; - version = "2.3.0.1"; - sha256 = "a770ccd0491f1d0eab06bd03b36115122a781e4106906a8489d18d85d7a8ff29"; - libraryHaskellDepends = [ base casadi-bindings-internal vector ]; + version = "2.4.1.0"; + sha256 = "f35fdfc2d8d33c5455d3e7dccce341332c0620db0445f99386f1e7920e053b6c"; + libraryHaskellDepends = [ + base casadi-bindings-internal containers vector + ]; libraryPkgconfigDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; license = stdenv.lib.licenses.gpl3; @@ -39034,12 +39004,12 @@ self: { }) {casadi = null;}; "casadi-bindings-internal" = callPackage - ({ mkDerivation, base, casadi, vector }: + ({ mkDerivation, base, casadi, containers, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.3.0"; - sha256 = "00b8ba1df8dd1cb2facc4ca4685cd4687c2af60b3ed8369fa1abf97b3bf25fcd"; - libraryHaskellDepends = [ base vector ]; + version = "0.1.3.1"; + sha256 = "7170eebb779a1e0dc18dc26edd55e7136978a1e24624c9953ddc5aee60f1e3a0"; + libraryHaskellDepends = [ base containers vector ]; libraryPkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; description = "low level bindings to CasADi"; @@ -40445,23 +40415,25 @@ self: { }) {}; "chatter" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom - , parsec, QuickCheck, quickcheck-instances, random-shuffle - , regex-tdfa, regex-tdfa-text, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, text, tokenize, transformers, zlib + ({ mkDerivation, array, base, bytestring, cereal, cereal-text + , containers, deepseq, directory, filepath, fullstop, hashable + , HUnit, mbox, MonadRandom, parsec, QuickCheck + , quickcheck-instances, random-shuffle, regex-tdfa, regex-tdfa-text + , tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck, text + , tokenize, transformers, unordered-containers, zlib }: mkDerivation { pname = "chatter"; - version = "0.5.2.0"; - sha256 = "1af1be554513a4fbbcdf385fba89b78cfc977575228423f2c62fce112e27a904"; + version = "0.6.0.0"; + sha256 = "71e2b8df7d7ecc0d771077f130b27460e982594491b39812ce2cd210fafb5e6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring cereal containers deepseq directory filepath - fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances - random-shuffle regex-tdfa regex-tdfa-text text tokenize - transformers zlib + array base bytestring cereal cereal-text containers deepseq + directory filepath fullstop hashable mbox MonadRandom parsec + QuickCheck quickcheck-instances random-shuffle regex-tdfa + regex-tdfa-text text tokenize transformers unordered-containers + zlib ]; executableHaskellDepends = [ base bytestring cereal containers filepath text @@ -41362,6 +41334,8 @@ self: { pname = "clafer"; version = "0.4.1"; sha256 = "e3015519a90073e986ed67ba753384b536d9d02652c34aa1195adb6f7e12c0d0"; + revision = "1"; + editedCabalFile = "177981f500b77d9bf9b941da7693d895357d4a7cc1181e4ca85561ca5d2e0f1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42171,7 +42145,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude" = callPackage + "classy-prelude_0_12_3" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl @@ -42196,6 +42170,34 @@ self: { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude" = callPackage + ({ mkDerivation, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, dlist, enclosed-exceptions, exceptions + , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, unordered-containers + , vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "0.12.4"; + sha256 = "503064f5574a7786c860395d4c22676e2339021d311daeb327795e35a98fa43b"; + libraryHaskellDepends = [ + base basic-prelude bifunctors bytestring chunked-data containers + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base + mono-traversable mtl mutable-containers primitive semigroups stm + text time time-locale-compat transformers unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; }) {}; "classy-prelude-conduit_0_10_2" = callPackage @@ -42340,7 +42342,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-conduit" = callPackage + "classy-prelude-conduit_0_12_3" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -42356,6 +42358,29 @@ self: { testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "conduit instances for classy-prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-conduit" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "0.12.4"; + sha256 = "71878fa293f8276c9989f889b73de24777e147183279c733351d32e9a784da61"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "conduit instances for classy-prelude"; license = stdenv.lib.licenses.mit; @@ -42487,7 +42512,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-yesod" = callPackage + "classy-prelude-yesod_0_12_3" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -42501,6 +42526,27 @@ self: { http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-yesod" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "0.12.4"; + sha256 = "6c434a6524206849ee11657b14d0350961c63be1b8260d50abec09e2a8da675f"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; @@ -44023,13 +44069,13 @@ self: { ({ mkDerivation, array, base, containers, random, transformers }: mkDerivation { pname = "combinat"; - version = "0.2.7.0"; - sha256 = "5f4ac7bc353888231472f2d95c7dc35eb2704b2cdae3ca456ef53d0de62d90e5"; + version = "0.2.7.1"; + sha256 = "690588b4cbfb9d92053fed70be71732bcb2b43b3cb091a0209565ec7d3d766f8"; libraryHaskellDepends = [ array base containers random transformers ]; homepage = "http://code.haskell.org/~bkomuves/"; - description = "Generation of various combinatorial objects"; + description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -44485,6 +44531,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compactmap" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: + mkDerivation { + pname = "compactmap"; + version = "0.1.1"; + sha256 = "da3304bb30ef354d10c731589ac8c3086b91d2fe72fb1828ed17ce02de85c192"; + revision = "1"; + editedCabalFile = "a303fff361ce77f12115c193fd2fa82e9ebcc1c12e2c99977e540b2841e10cf8"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "A read-only memory-efficient key-value store"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compare-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47850,13 +47910,13 @@ self: { }) {}; "coverage" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, hspec, HUnit, QuickCheck }: mkDerivation { pname = "coverage"; - version = "0.1.0.2"; - sha256 = "ba99dccf43de1021322a870e03fc74b9a46bc5bdffde302859f19870065e6df0"; + version = "0.1.0.3"; + sha256 = "2ea9ea4f529fb99fde5d47814cf0ccf0450c70e03bbfb8275ce30a51f9f72830"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base hspec HUnit QuickCheck ]; jailbreak = true; homepage = "https://github.com/nicodelpiano/coverage"; description = "Exhaustivity Checking Library"; @@ -48981,6 +49041,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma" = callPackage + ({ mkDerivation, base, containers, MissingH, split }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.1.3"; + sha256 = "aba1a8fed1636faa3ff89cbe8114ecc399f6f28985fcb2f3327731dc1e907bc3"; + libraryHaskellDepends = [ base containers MissingH split ]; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crypto-numbers_0_2_3" = callPackage ({ mkDerivation, base, byteable, bytestring, crypto-random, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -50198,6 +50269,7 @@ self: { ]; description = "Functional Combinators for Computer Vision"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cyclotomic" = callPackage @@ -52728,35 +52800,6 @@ self: { }) {}; "debian" = callPackage - ({ mkDerivation, base, bytestring, bzlib, containers, directory - , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl - , network, network-uri, old-locale, parsec, pretty, process - , process-extras, pureMD5, regex-compat, regex-tdfa - , template-haskell, text, time, unix, Unixutils, utf8-string, zlib - }: - mkDerivation { - pname = "debian"; - version = "3.88.1"; - sha256 = "89451e4c95f798f887edace812ed6bd7418e771dd79097eafb6a1f2015a03ed9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring bzlib containers directory either exceptions - filepath HaXml HUnit ListLike mtl network network-uri old-locale - parsec pretty process process-extras pureMD5 regex-compat - regex-tdfa template-haskell text time unix Unixutils utf8-string - zlib - ]; - executableHaskellDepends = [ - base directory filepath HaXml pretty process unix - ]; - testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ]; - homepage = "https://github.com/ddssff/debian-haskell"; - description = "Modules for working with the Debian package system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "debian_3_89" = callPackage ({ mkDerivation, base, bytestring, bzlib, containers, directory , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl , network, network-uri, old-locale, parsec, pretty, process @@ -52783,7 +52826,6 @@ self: { homepage = "https://github.com/ddssff/debian-haskell"; description = "Modules for working with the Debian package system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debian-binary" = callPackage @@ -52805,8 +52847,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.8.0.0"; - sha256 = "07887be08bd4521fc76e272ed9c418a7c517c57360f07529206ea2b46ace52ad"; + version = "0.9.0.0"; + sha256 = "7199e8a97005bce57cf9e3f157f3923d08891981006353eaf5af226b0a56f601"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54117,7 +54159,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder" = callPackage + "diagrams-builder_0_7_1_1" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -54143,9 +54185,10 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder_0_7_2_0" = callPackage + "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -54171,7 +54214,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo_1_2_0_4" = callPackage @@ -54744,7 +54786,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-haddock" = callPackage + "diagrams-haddock_0_3_0_6" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -54775,9 +54817,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-haddock_0_3_0_7" = callPackage + "diagrams-haddock" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -54804,10 +54847,10 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; + doCheck = false; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -54825,9 +54868,10 @@ self: { homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "diagrams-html5" = callPackage + "diagrams-html5_1_3_0_2" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -54844,9 +54888,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-html5_1_3_0_3" = callPackage + "diagrams-html5" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -54863,7 +54908,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib_1_2_0_7" = callPackage @@ -55111,7 +55155,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-postscript" = callPackage + "diagrams-postscript_1_3_0_2" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens , monoid-extras, mtl, semigroups, split, statestack @@ -55128,9 +55172,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-postscript_1_3_0_3" = callPackage + "diagrams-postscript" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens , monoid-extras, mtl, semigroups, split, statestack @@ -55147,7 +55192,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -55213,7 +55257,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-rasterific" = callPackage + "diagrams-rasterific_1_3_1_3" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split @@ -55231,9 +55275,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-rasterific_1_3_1_4" = callPackage + "diagrams-rasterific" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split @@ -55251,7 +55296,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-rubiks-cube" = callPackage @@ -55351,7 +55395,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-svg" = callPackage + "diagrams-svg_1_3_1_4" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl @@ -55371,9 +55415,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-svg_1_3_1_5" = callPackage + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl @@ -55393,7 +55438,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -56206,7 +56250,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "direct-sqlite" = callPackage + "direct-sqlite_2_3_15" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, text }: @@ -56221,6 +56265,24 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "direct-sqlite" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.16"; + sha256 = "10592458a5a90ae84c7005849924576c31a90422349b4b7ac762a230a056816f"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; }) {}; "directed-cubical" = callPackage @@ -57781,6 +57843,7 @@ self: { homepage = "http://github.com/toothbrush/dotfs"; description = "Filesystem to manage and parse dotfiles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dotgen" = callPackage @@ -58893,26 +58956,27 @@ self: { }: mkDerivation { pname = "dynobud"; - version = "1.7.1.0"; - sha256 = "a3233e3e5bac04f34a6799c7c2ae2bf478074c0c0dd1b6012b625ad05f1f6717"; + version = "1.8.0.0"; + sha256 = "8851495866fdaecc175c9e795d7accd8c1dd8423b29b2f1e139ca8c36f1f74e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary casadi-bindings casadi-bindings-core cereal - containers directory distributive generic-accessors hmatrix - hmatrix-gsl jacobi-roots linear mtl Plot-ho-matic process - reflection spatial-math time vector vector-binary-instances + containers data-default-class directory distributive + generic-accessors hmatrix hmatrix-gsl jacobi-roots linear mtl + Plot-ho-matic process reflection spatial-math time vector + vector-binary-instances ]; executableHaskellDepends = [ base bytestring casadi-bindings casadi-bindings-core cereal Chart Chart-gtk cmdargs colour containers data-default-class generic-accessors lens linear mtl not-gloss Plot-ho-matic - semigroups stm unordered-containers vector zeromq4-haskell + semigroups stm time unordered-containers vector zeromq4-haskell ]; testHaskellDepends = [ - base binary casadi-bindings cereal doctest hmatrix hmatrix-gsl - HUnit linear QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector + base binary casadi-bindings cereal containers doctest hmatrix + hmatrix-gsl HUnit linear QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector ]; jailbreak = true; description = "your dynamic optimization buddy"; @@ -61154,8 +61218,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "0.3.0.1"; - sha256 = "fd3bd8e418ce351edb1a259e5f43d195efe5e1695fa47496a4901b5020b53fe3"; + version = "0.3.0.2"; + sha256 = "b8aaf779fefd85d8836f9cb2dd98abe6cb79391e889f02d4a9851517fe64f280"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -63896,8 +63960,8 @@ self: { pname = "fay"; version = "0.23.1.8"; sha256 = "66bf327322a2342ce7dee9b981c5e8bd2876935acb1cbc847e0c1635717be29c"; - revision = "2"; - editedCabalFile = "e4c9ff4e2d4684879802958fe2cef7250a88d65827c027a81c5a5b329d47d8c7"; + revision = "3"; + editedCabalFile = "24868a2aec45456bf440513be87e996ff14bc7ed9a10c5959bc831a8e1fd1420"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65469,8 +65533,8 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.2.8"; - sha256 = "8e1e14710d68d091b17871105a8cc7b9e38e36299408d63ff7ede19684946d36"; + version = "0.2.9"; + sha256 = "02e6cd64adeeab38b7f6425905332deb8f03824cb4f47a8b8855b846e195dd81"; libraryHaskellDepends = [ base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers @@ -68215,6 +68279,7 @@ self: { homepage = "https://github.com/chrisdone/freenect"; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freenect; freenect_sync = null;}; "freenect_1_2_1" = callPackage @@ -69762,8 +69827,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.7"; sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b"; - revision = "1"; - editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd"; + revision = "2"; + editedCabalFile = "df42343fb6f45e0577832e4964fd96c34d25ff42bf15df65c8c73beaa4f949fc"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -70315,13 +70380,12 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.1.0.1"; - sha256 = "2f3f18df09069076ca407bd96b636b3d80f69ffad716c9862133b0d9ef8ed140"; + version = "0.1.0.2"; + sha256 = "7b2edbe6619e5da2ac9be1b980134813a04312bac88b68780f62ad7374270532"; libraryHaskellDepends = [ base binary bytestring bytestring-mmap containers iproute reinterpret-cast text ]; - jailbreak = true; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70567,8 +70631,8 @@ self: { }: mkDerivation { pname = "ghc-events-analyze"; - version = "0.2.1"; - sha256 = "44727566abcbcd824ba54fa39ede8876a8d1225ba4c3b23a0c4d482eee30c051"; + version = "0.2.2"; + sha256 = "0cbcf66eae454ea672bec6f23b97b295fe9a7312c33f7e6b0272c270a7e8e0f3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70576,7 +70640,6 @@ self: { mtl optparse-applicative parsec SVGFonts template-haskell th-lift transformers ]; - jailbreak = true; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73770,8 +73833,8 @@ self: { }: mkDerivation { pname = "google-translate"; - version = "0.1.1.1"; - sha256 = "027aaa32a67fb9ee346a09c8b3786e6df20e34dc3f356464908258ea125b74ac"; + version = "0.1.1.2"; + sha256 = "cf5f09f94fe6b938390a4e48865b15bf47aba4d6a03071631666b81c162c5cdc"; libraryHaskellDepends = [ aeson base bytestring either servant servant-client text ]; @@ -74438,6 +74501,7 @@ self: { homepage = "http://github.com/luqui/graphics-drawingcombinators"; description = "A functional interface to 2D drawing in OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "graphics-formats-collada" = callPackage @@ -74799,6 +74863,7 @@ self: { ]; description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "grm" = callPackage @@ -77553,8 +77618,8 @@ self: { }: mkDerivation { pname = "hackernews"; - version = "0.5.0.0"; - sha256 = "7a2121d9559d2386322cd37a43f96e2fcc7361d2d2fbf86fab4f35516ee448fa"; + version = "0.5.0.1"; + sha256 = "dfef879e6256945f2348996dc0c8b8db0d69887e55ef99cae93a46e14c79720e"; libraryHaskellDepends = [ aeson attoparsec base bytestring either HsOpenSSL http-streams io-streams text time transformers @@ -78937,26 +79002,22 @@ self: { "hapistrano" = callPackage ({ mkDerivation, base, base-compat, directory, either, filepath - , hspec, mtl, old-locale, process, temporary, time - , time-locale-compat, transformers + , hspec, mtl, process, temporary, time, time-locale-compat + , transformers }: mkDerivation { pname = "hapistrano"; - version = "0.2.0.2"; - sha256 = "81c6985053f60dd54201ffd8ed4134aab2e2e34a11e0729fc2c6717e163f83af"; + version = "0.2.1.1"; + sha256 = "dc4c5c8f68ef3ff8eb32f33d9600f4a1478abc0f48a5e75589744ff92e34c5cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat either filepath mtl old-locale process time - time-locale-compat transformers - ]; - executableHaskellDepends = [ - base base-compat either filepath mtl old-locale process time - time-locale-compat transformers + base either filepath mtl process time time-locale-compat + transformers ]; + executableHaskellDepends = [ base base-compat ]; testHaskellDepends = [ - base base-compat directory either filepath hspec mtl old-locale - process temporary time time-locale-compat transformers + base directory either filepath hspec mtl process temporary ]; homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; @@ -80522,6 +80583,7 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -80541,6 +80603,7 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haskarrow" = callPackage @@ -84167,6 +84230,7 @@ self: { homepage = "https://github.com/ivanperez-keera/hcwiid"; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize_0_5_0_0" = callPackage @@ -86276,6 +86340,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hgrev" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , process, template-haskell + }: + mkDerivation { + pname = "hgrev"; + version = "0.1.0.0"; + sha256 = "235e13ae4a5d4f28d4297daaf6685941eac72977db5dd88e51e1b814585cf860"; + revision = "1"; + editedCabalFile = "bf4e264db654def79fe433313df6d0918a85cd851a8f1c063ee138d4e60128fe"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath process template-haskell + ]; + homepage = "https://github.com/LukeHoersten/hgrev"; + description = "Template Haskell splices for including the current Mercurial revision info in code"; + license = stdenv.lib.licenses.mit; + }) {}; + "hgrib" = callPackage ({ mkDerivation, base, c2hs, directory, grib_api, hspec }: mkDerivation { @@ -86402,6 +86484,7 @@ self: { homepage = "https://github.com/phaazon/hid"; description = "Interface to hidapi library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hidapi;}; "hidapi" = callPackage @@ -86415,6 +86498,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "hieraclus" = callPackage @@ -88274,6 +88358,7 @@ self: { homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage @@ -89716,6 +89801,7 @@ self: { base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; @@ -89750,6 +89836,7 @@ self: { base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; @@ -89784,6 +89871,7 @@ self: { base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; @@ -95310,6 +95398,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -95379,6 +95468,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsqml-demo-samples" = callPackage @@ -96289,6 +96379,7 @@ self: { network streaming-commons text time transformers zlib ]; jailbreak = true; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96321,6 +96412,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96351,6 +96443,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96381,6 +96474,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96411,6 +96505,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96441,6 +96536,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96471,6 +96567,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96501,6 +96598,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96531,6 +96629,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96561,6 +96660,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96590,6 +96690,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96619,6 +96720,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96648,6 +96750,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96678,6 +96781,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96708,6 +96812,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96738,6 +96843,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96768,6 +96874,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96798,6 +96905,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96828,6 +96936,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96858,6 +96967,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96888,13 +96998,14 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client" = callPackage + "http-client_0_4_23" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, exceptions, filepath @@ -96918,6 +97029,38 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-client" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.24"; + sha256 = "93e4182ef9d3e8b45b75cca0f63b20457823e5aeaba46f6a16de47d7e618e177"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -97096,6 +97239,7 @@ self: { text time transformers utf8-string wai wai-conduit warp warp-tls ]; jailbreak = true; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97125,6 +97269,7 @@ self: { text time transformers utf8-string wai wai-conduit warp warp-tls ]; jailbreak = true; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97153,6 +97298,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97181,6 +97327,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97211,6 +97358,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97794,6 +97942,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , bytestring-builder, containers, directory, doctest, filepath + , Glob, hex, hspec, mwc-random, stm, text, unordered-containers + , vector, word8 + }: + mkDerivation { + pname = "http2"; + version = "1.1.0"; + sha256 = "1860d3e63b418cedd440c496fa813eadc14325a1e3dbb68e49221b2e04e3c996"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring bytestring-builder containers mwc-random stm + unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + containers directory filepath hex text unordered-containers vector + word8 + ]; + testHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + containers directory doctest filepath Glob hex hspec mwc-random stm + text unordered-containers vector word8 + ]; + description = "HTTP/2.0 library including frames and HPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "httpd-shed" = callPackage ({ mkDerivation, base, network, network-uri }: mkDerivation { @@ -100781,6 +100960,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_8_2_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, cmdargs, containers, directory, filepath, ghc + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, http-client, http-client-tls, HUnit, ipython-kernel, mtl + , parsec, process, random, setenv, shelly, split, stm, strict + , system-argv0, text, transformers, unix, unordered-containers + , utf8-string, uuid, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.8.2.0"; + sha256 = "46ded8d9b827c7e3e0eb40379fbf8bc8bbfa85a1c0feacf463c4673c342d9ba4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts here hlint http-client http-client-tls + ipython-kernel mtl parsec process random shelly split stm strict + system-argv0 text transformers unix unordered-containers + utf8-string uuid vector + ]; + executableHaskellDepends = [ + aeson base bin-package-db bytestring containers directory ghc here + ipython-kernel process strict text transformers unix + ]; + testHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts here hlint hspec http-client + http-client-tls HUnit ipython-kernel mtl parsec process random + setenv shelly split stm strict system-argv0 text transformers unix + unordered-containers utf8-string uuid vector + ]; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -101002,8 +101222,8 @@ self: { }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.0.0"; - sha256 = "b9980311e06991122e46cf7cb4dbd697175876b6f4452e09e72d4320827f2cc2"; + version = "0.2.2.0"; + sha256 = "38340ba45242b1088cd651e404a0c385b4379cefaa4b989e76f4bd87bd9f806a"; libraryHaskellDepends = [ aeson base containers ihaskell ipython-kernel nats scientific singletons text unix unordered-containers vector vinyl @@ -103146,6 +103366,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_8_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , directory, filepath, mtl, parsec, process, SHA, temporary, text + , transformers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.8.2.0"; + sha256 = "0b028b9910f90aee9c3b4adb8e59b79aed37ab307501c92158594d28c29ca122"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cereal containers directory filepath mtl + process SHA temporary text transformers uuid zeromq4-haskell + ]; + executableHaskellDepends = [ + base filepath mtl parsec text transformers + ]; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -104790,6 +105034,7 @@ self: { sha256 = "0da1183c74326d8c3f2ced74e6a1a659e91c7364d2f02fb2551611a6fbcd904c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; + doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; @@ -104804,6 +105049,7 @@ self: { sha256 = "2204d8830f4cae60110a596e53516c1e7e86e9d7a24d338c898045f7c67fbf69"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; + doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; @@ -104818,6 +105064,7 @@ self: { sha256 = "3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; + doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; @@ -105318,8 +105565,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.2.1.0"; - sha256 = "3ad6d73b9e554dbeab0ca8b96ad55e5f270b4144c8a20ad85e5939b6a0da45d5"; + version = "0.2.2.0"; + sha256 = "370fb8122243ada541060a4ea201d54f19d3031b7a524ec5176545a31be72740"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105343,8 +105590,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.2.1.0"; - sha256 = "593c0d9185c5ff8fd983b7abb01061a5f1a659ffca163fdfe9e3d121ad4275e5"; + version = "0.2.2.0"; + sha256 = "49eefc830aa7164662ea2a6263e9ea5d2379ebe21de6c6eaa463847e4c4ce33c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105572,8 +105819,8 @@ self: { pname = "json-schema"; version = "0.7.4.0"; sha256 = "c549fa4b199efcd885334538cfa15cc77226a1c9c9afa30f5867d75b79d2701c"; - revision = "1"; - editedCabalFile = "9b2252abe33f7c8a3edc99a2583bd1399605908f86116d5475b5d27a0ab5110e"; + revision = "2"; + editedCabalFile = "7c40fcd8bc0386dde997f9b635d1f0c8d8251f38ce7b83c161235861fdb06e04"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -108653,7 +108900,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote" = callPackage + "language-c-quote_0_11" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -108677,6 +108924,33 @@ self: { homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "language-c-quote" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.11.0.1"; + sha256 = "ca65065a9c5cea2cf02c58398d6352fcf29d9294d1286efa6058bf4ebd0e1dd8"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + doCheck = false; + homepage = "http://www.cs.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-cil" = callPackage @@ -109188,7 +109462,6 @@ self: { testHaskellDepends = [ base base-compat Cabal deepseq doctest lens pretty QuickCheck ]; - doCheck = false; homepage = "https://github.com/peti/language-nix#readme"; description = "Data types and useful functions to represent and manipulate the Nix language"; license = stdenv.lib.licenses.bsd3; @@ -111444,6 +111717,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -114055,6 +114329,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "logic-TPTP" = callPackage @@ -114824,8 +115099,8 @@ self: { }: mkDerivation { pname = "luminance"; - version = "0.1"; - sha256 = "1bd7bb005ed35d876c2c6703a9bcb6402b6a2d379b55b0a78344fafef97bb217"; + version = "0.1.1"; + sha256 = "eb8e92603e9cb92ff682f3f50e35f79f966aeb1f0930ca556b3898f63fd79154"; libraryHaskellDepends = [ base contravariant gl mtl resourcet semigroups transformers void ]; @@ -114960,6 +115235,7 @@ self: { homepage = "https://github.com/fizruk/lxc"; description = "High level Haskell bindings to LXC (Linux containers)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lye" = callPackage @@ -115771,7 +116047,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "managed" = callPackage + "managed_1_0_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -115780,9 +116056,10 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "managed_1_0_1" = callPackage + "managed" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -115791,7 +116068,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee" = callPackage @@ -118376,6 +118652,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -118432,6 +118709,7 @@ self: { homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midisurface" = callPackage @@ -121917,6 +122195,7 @@ self: { executableHaskellDepends = [ base bytestring hid split ]; description = "A command line tool to change backlit colors of your MSI keyboards"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mstate" = callPackage @@ -123754,6 +124033,7 @@ self: { jailbreak = true; description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage @@ -129752,6 +130032,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) pam;}; "panda" = callPackage @@ -130119,6 +130400,7 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; + doHaddock = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130285,8 +130567,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.6"; - sha256 = "fbb67e345f17dd706f4500d600a8ec75fbce57b14276eb9b2483585fd3cfacea"; + version = "1.12.4.7"; + sha256 = "560ca3291b5558cf810b17f3bee40b17a4aee1671d38cf468c42aab666081681"; libraryHaskellDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; @@ -131732,8 +132014,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.5"; - sha256 = "c9d01a8e8fe37496009334bb037b17bceb94263bc0fc148f9dc564a3a91ed62c"; + version = "0.1.6"; + sha256 = "d2b36b8221dd10146cb2b01565b0b4affef2d8ef8263fc7d074e86ade1b2954b"; libraryHaskellDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -133601,7 +133883,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template" = callPackage + "persistent-template_2_1_3_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ghc-prim , hspec, monad-control, monad-logger, path-pieces, persistent , QuickCheck, tagged, template-haskell, text, transformers @@ -133622,6 +133904,31 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent-template" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, ghc-prim + , hspec, monad-control, monad-logger, path-pieces, persistent + , QuickCheck, tagged, template-haskell, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.1.3.5"; + sha256 = "578d3a3243f46382d61dcc53bae771d7bae8927660104364f4a3ef782e877799"; + libraryHaskellDepends = [ + aeson base bytestring containers ghc-prim monad-control + monad-logger path-pieces persistent tagged template-haskell text + transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136172,6 +136479,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polymap" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "polymap"; + version = "0.1.1.0"; + sha256 = "9cda6cf03591ac30fdd8bd6796f87016e45dfa10a720d091622e02036fe809b7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Polygonal maps"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "polynomial" = callPackage ({ mkDerivation, base, deepseq, pretty, vector, vector-space , vector-th-unbox @@ -138214,6 +138533,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/printxosd"; description = "Simple tool to display some text on an on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "priority-queue" = callPackage @@ -139080,8 +139400,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.7.3"; - sha256 = "0309899702da827d8fa3184c08e2de664cb0ba8df007b66caedd66894e85d151"; + version = "2.8.0"; + sha256 = "fb4d796502f24ee0453d3150bbdc27d8bfada5950ccc467dab6d58c065f579f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139186,6 +139506,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "A wrapper for the proteaaudio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "protobuf" = callPackage @@ -139471,30 +139792,6 @@ self: { }) {}; "psc-ide" = callPackage - ({ mkDerivation, aeson, base, containers, directory, filepath - , hspec, lens, lens-aeson, mtl, network, optparse-applicative - , parsec, regex-tdfa, text, wreq - }: - mkDerivation { - pname = "psc-ide"; - version = "0.1.0.0"; - sha256 = "787d26ce0d50409f41a34ad72e857d19d2e346b75e072da6396195e960f8145d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers directory filepath lens lens-aeson mtl parsec - regex-tdfa text wreq - ]; - executableHaskellDepends = [ - base directory mtl network optparse-applicative text - ]; - testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/kRITZCREEK/psc-ide"; - description = "Language support for the PureScript programming language"; - license = stdenv.lib.licenses.mit; - }) {}; - - "psc-ide_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, containers, directory, either , filepath, hspec, lens, lens-aeson, mtl, network , optparse-applicative, parsec, regex-tdfa, text, wreq @@ -139516,7 +139813,6 @@ self: { homepage = "http://github.com/kRITZCREEK/psc-ide"; description = "Language support for the PureScript programming language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pseudo-boolean" = callPackage @@ -139563,7 +139859,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "psqueues" = callPackage + "psqueues_0_2_0_2" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -139579,6 +139875,25 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "psqueues" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.0.3"; + sha256 = "ac8a60de9979f80948d0becfb35cdafe7e1fdfce062c0468e4e2abced9a85c69"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; }) {}; "pub" = callPackage @@ -141533,7 +141848,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rainbox" = callPackage + "rainbox_0_18_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, lens, QuickCheck , rainbow, tasty, tasty-quickcheck, text }: @@ -141551,6 +141866,27 @@ self: { homepage = "http://www.github.com/massysett/rainbox"; description = "Two-dimensional box pretty printing, with colors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rainbox" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "rainbox"; + version = "0.18.0.4"; + sha256 = "f8efeb3f81ee5b7d9765f427d9c592e15cb732334ac8330464fe545d301525a1"; + libraryHaskellDepends = [ + base bytestring containers lens rainbow text + ]; + testHaskellDepends = [ + base bytestring containers lens QuickCheck rainbow tasty + tasty-quickcheck text + ]; + homepage = "http://www.github.com/massysett/rainbox"; + description = "Two-dimensional box pretty printing, with colors"; + license = stdenv.lib.licenses.bsd3; }) {}; "rake" = callPackage @@ -143723,8 +144059,8 @@ self: { }: mkDerivation { pname = "regex-genex"; - version = "0.6.2"; - sha256 = "3826c6ab88bd2819c67f2f84959e906ccbc970dc02872bf7f4bdae0069fd26a0"; + version = "0.7.0"; + sha256 = "70d4028bfdafaaffc95d82d38d54949e9c0b102578ecd73a8a00a2669c55e4cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145777,6 +146113,8 @@ self: { pname = "rest-core"; version = "0.36.0.6"; sha256 = "c4863ccdd2deee9f790136d5ac53a464682f6b85276aeaff48426832d90e9215"; + revision = "1"; + editedCabalFile = "c04e636b2c6ad925592a1a19e081a11b8c7c4d0e74a34b95856af866e8975e52"; libraryHaskellDepends = [ aeson aeson-utils base bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random @@ -146129,7 +146467,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-gen" = callPackage + "rest-gen_0_17_1_3" = callPackage ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process @@ -146153,9 +146491,10 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-gen_0_18_0_0" = callPackage + "rest-gen" = callPackage ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process @@ -146167,6 +146506,8 @@ self: { pname = "rest-gen"; version = "0.18.0.0"; sha256 = "bca52143478e12a5fc91630c0df7f2206f8f60639d3a6cc568e4772696e92787"; + revision = "1"; + editedCabalFile = "8199543b3839b7b8e3fa7c6e768a2e6a9bc80ba520ec89db41865435be5cb666"; libraryHaskellDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -146179,7 +146520,6 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-happstack_0_2_10_3" = callPackage @@ -146370,6 +146710,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; + revision = "1"; + editedCabalFile = "a814dde006adf0a6f3b0c98956060b4e9759b47da046ca6faaa8eb0e3272e246"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -148037,6 +148379,7 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage @@ -148093,6 +148436,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -150415,6 +150759,7 @@ self: { homepage = "https://github.com/adamwalker/sdr"; description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "seacat" = callPackage @@ -151605,7 +151950,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant" = callPackage + "servant_0_4_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-media, http-types, network-uri @@ -151629,9 +151974,10 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant_0_4_4_3" = callPackage + "servant" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-media, http-types, network-uri @@ -151640,8 +151986,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.4.3"; - sha256 = "13ca10419a1826a8ecd4b8cf762e58ed25ae31adaf4bdeb8d36c71dfa5869dc1"; + version = "0.4.4.4"; + sha256 = "182842071c4905a3429c1ccbff020af255b6abfd1e7a6473253713c0da80f280"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -151655,7 +152001,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels_0_1_0_0" = callPackage @@ -151705,8 +152050,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4.3"; - sha256 = "8fca95f4325e10a290d6835c72bd31c69e22327548fcb2bc1094c66d3c3a5287"; + version = "0.4.4.4"; + sha256 = "58e3d5922b9031559aebc7ae99e52712d6a208cb2c0164da5baffb4cd55cafa1"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -151766,7 +152111,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-client" = callPackage + "servant-client_0_4_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , either, exceptions, hspec, http-client, http-client-tls , http-media, http-types, HUnit, network, network-uri, QuickCheck @@ -151790,9 +152135,10 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-client_0_4_4_3" = callPackage + "servant-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , either, exceptions, hspec, http-client, http-client-tls , http-media, http-types, HUnit, network, network-uri, QuickCheck @@ -151801,8 +152147,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.4.3"; - sha256 = "e83b581ebdabd8d81173605fa40da1acc31f2115cd633188402ca5a5938854f6"; + version = "0.4.4.4"; + sha256 = "650e5aa48c060238a25328e9b9193d20102010359946f7b1979ef328eb1c4134"; libraryHaskellDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -151816,7 +152162,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs_0_3_1" = callPackage @@ -151871,7 +152216,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-docs" = callPackage + "servant-docs_0_4_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , case-insensitive, hashable, hspec, http-media, http-types, lens , servant, string-conversions, text, unordered-containers @@ -151897,17 +152242,18 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-docs_0_4_4_3" = callPackage + "servant-docs" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , case-insensitive, hashable, hspec, http-media, http-types, lens , servant, string-conversions, text, unordered-containers }: mkDerivation { pname = "servant-docs"; - version = "0.4.4.3"; - sha256 = "ca87fe6949cdda55e4745aa3c4863cd68ff3a3904d61a0d9baa556e2f364e89f"; + version = "0.4.4.4"; + sha256 = "9a854eafd12e7707764899f16a0868f712eb022eb0fa2f9eeeaaea8bea4bc4f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151925,7 +152271,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -151960,8 +152305,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4.3"; - sha256 = "7ccdf278c8f5da6b3630040ec4eba3111eeedd2465d5047034f10372defcb760"; + version = "0.4.4.4"; + sha256 = "e180ff93d58ebb467097b337e00f77b42e9780880627ab52a2b8d69363fc7de4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151970,6 +152315,7 @@ self: { servant-lucid servant-server text time transformers wai wai-extra warp ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; @@ -152020,7 +152366,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-jquery" = callPackage + "servant-jquery_0_4_4_2" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-server, stm, text, transformers, warp @@ -152041,17 +152387,18 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-jquery_0_4_4_3" = callPackage + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-server, stm, text, transformers, warp }: mkDerivation { pname = "servant-jquery"; - version = "0.4.4.3"; - sha256 = "1ec131e7b48673c8c7d99f0422d287a34e81f55f6fb2b142377d8e5b4d9288f8"; + version = "0.4.4.4"; + sha256 = "66fbe8414ac6bf6e17fd12b31d6a1fa766ea91f3a2932c22c3accf048e8f7076"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; @@ -152064,15 +152411,14 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4.3"; - sha256 = "6d6b836794f1f5bda94c15d4f7950913db3396a6f9d233fd88e43e4fdcb100d2"; + version = "0.4.4.4"; + sha256 = "c42702b20da1f8daea4c2a633e777214e524a2afac96c0b559209351f1f1cd0d"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -152085,8 +152431,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.4.4.3"; - sha256 = "bef08a756d600298f8762a73bf2b25ceed2377a970c4eb69273cd7f7981753ef"; + version = "0.4.4.4"; + sha256 = "1df192ac10aea342cffd5da509f9c5eca40b659fa3c7b77aad87ec0bbb82f35c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152285,7 +152631,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-server" = callPackage + "servant-server_0_4_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, directory, doctest, either, exceptions , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl @@ -152314,9 +152660,10 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-server_0_4_4_3" = callPackage + "servant-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, directory, doctest, either, exceptions , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl @@ -152326,8 +152673,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.4.3"; - sha256 = "552ccb848fbb99c471f950412c12fe7a6081507678a4108d195299ecdc987fa0"; + version = "0.4.4.4"; + sha256 = "056947b96664674f1a6c65af30001e9e2343357efa96e153198ec0f833f3fdd0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152345,7 +152692,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -152550,8 +152896,8 @@ self: { }: mkDerivation { pname = "ses-html"; - version = "0.3.0.0"; - sha256 = "1e6a6a172f2379b7c86f63ac304dfe03b907302197a92544462b5def27118eb2"; + version = "0.3.0.1"; + sha256 = "07ce0cc9777d9fac050cb2546de72c56625a47769a046e49b9d11f74c9c8bccf"; libraryHaskellDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time @@ -152859,6 +153205,7 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -153781,21 +154128,21 @@ self: { "shelduck" = callPackage ({ mkDerivation, aeson, async, base, bytestring, hastache, hspec , lens, lens-aeson, rainbow, random, regex-compat, shelly, Spock - , stm, text, transformers, wreq + , stm, text, time, transformers, uuid, wreq }: mkDerivation { pname = "shelduck"; - version = "0.1.2.0"; - sha256 = "3a62ab82b4311c05785e53dba0169122b6d61fd1087110785eecd779f2794e67"; + version = "0.1.3.0"; + sha256 = "a9190676dc9e3b8266ea97a8d9034015a9242c7f1ed9e226423ad14fdec61769"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring hastache lens lens-aeson rainbow random - shelly Spock stm text transformers wreq + shelly Spock stm text time transformers uuid wreq ]; executableHaskellDepends = [ aeson async base bytestring hastache lens lens-aeson rainbow random - shelly Spock stm text transformers wreq + shelly Spock stm text time transformers uuid wreq ]; testHaskellDepends = [ aeson base hspec lens regex-compat stm text transformers wreq @@ -160218,7 +160565,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_0_1_4_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, binary, blaze-builder, byteable , bytestring, Cabal, conduit, conduit-combinators, conduit-extra @@ -160281,6 +160628,73 @@ self: { homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + + "stack" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , base64-bytestring, bifunctors, binary, binary-tagged + , blaze-builder, byteable, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, containers, cryptohash + , cryptohash-conduit, deepseq, directory, either + , enclosed-exceptions, exceptions, extra, fast-logger, file-embed + , filelock, filepath, fsnotify, gitrev, hashable, hastache, hspec + , http-client, http-client-tls, http-conduit, http-types, ignore + , lifted-base, monad-control, monad-logger, monad-loops, mtl + , old-locale, optparse-applicative, optparse-simple, path + , persistent, persistent-sqlite, persistent-template, pretty + , process, project-template, QuickCheck, resourcet, retry, safe + , split, stm, streaming-commons, tar, template-haskell, temporary + , text, time, transformers, transformers-base, unix, unix-compat + , unordered-containers, vector, vector-binary-instances, void + , word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "0.1.5.0"; + sha256 = "40a26de423f070fc6c742a77c76e90ffd25d6ff08c6a651b3683f16f63a03e25"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base base16-bytestring base64-bytestring + bifunctors binary binary-tagged blaze-builder byteable bytestring + Cabal conduit conduit-combinators conduit-extra containers + cryptohash cryptohash-conduit deepseq directory enclosed-exceptions + exceptions extra fast-logger file-embed filelock filepath fsnotify + gitrev hashable hastache http-client http-client-tls http-conduit + http-types ignore lifted-base monad-control monad-logger + monad-loops mtl old-locale optparse-applicative optparse-simple + path persistent persistent-sqlite persistent-template pretty + process project-template resourcet retry safe split stm + streaming-commons tar template-haskell temporary text time + transformers transformers-base unix unix-compat + unordered-containers vector vector-binary-instances void word8 yaml + zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers + ]; + testHaskellDepends = [ + async base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger optparse-applicative path process QuickCheck resourcet + retry temporary text transformers unix-compat + ]; + doCheck = false; + enableSharedExecutables = false; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "https://github.com/commercialhaskell/stack"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -161050,8 +161464,8 @@ self: { }: mkDerivation { pname = "stateWriter"; - version = "0.2.3"; - sha256 = "1430eabaeb8b553c08857287bbd1ddda16492db355e31081cc7ed29a069d30a7"; + version = "0.2.4"; + sha256 = "b0cb37427724398c3297a9e2ae1e59e8b490b34bd993352ff1020ff2dbbae29b"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; description = "A faster variant of the RWS monad transformers"; @@ -163072,8 +163486,8 @@ self: { }: mkDerivation { pname = "stripe-haskell"; - version = "0.1.4.2"; - sha256 = "58d289423a8cc5dc227e451845afcc5da154740010d4cc7bf794759d043319b6"; + version = "0.1.4.3"; + sha256 = "f99ba8cd8097678d09df43301dca054ec573b8ecf9844bea62985178902d101f"; libraryHaskellDepends = [ aeson base bytestring either HsOpenSSL http-streams io-streams mtl random text time transformers unordered-containers @@ -163696,6 +164110,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "super-user-spark" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring + , directory, filepath, HTF, HUnit, mtl, optparse-applicative + , parsec, process, shelly, text, transformers, unix, zlib + }: + mkDerivation { + pname = "super-user-spark"; + version = "0.2.0.3"; + sha256 = "0fa3189dcf517a50abab5b83eee5d706ea13cbaaa780e6d14fb38679d924beb7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + mtl optparse-applicative parsec process shelly text transformers + unix zlib + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + HUnit mtl optparse-applicative parsec process shelly text + transformers unix zlib + ]; + jailbreak = true; + description = "Configure your dotfile deployment with a DSL"; + license = stdenv.lib.licenses.mit; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -166038,6 +166478,8 @@ self: { pname = "tar"; version = "0.4.2.1"; sha256 = "2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080"; + revision = "1"; + editedCabalFile = "4b0749397f9f6aac3506e07c9043371ac8a2c5605dc4370501904f38c1a3c3b4"; libraryHaskellDepends = [ array base bytestring directory filepath time ]; @@ -169424,26 +169866,26 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, base, bifunctors, containers, mtl, profunctors - , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck - , transformers, vector + ({ mkDerivation, base, bifunctors, containers, data-default-class + , hashable, mtl, profunctors, QuickCheck, quickcheck-instances + , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "these"; - version = "0.6.0.0"; - sha256 = "c8e94f28561e87a1c51498a8529a74983fe68d785b250c118d02a9a25d1b9383"; - revision = "3"; - editedCabalFile = "c65f6b008c1cc77cc3aa788f31c831c0fb64de22ec9ebccf6179cb9654d0697e"; + version = "0.6.1.0"; + sha256 = "a8e9e677b72ab4ea4e922b860abdd5f61ac69cb66e7c9f060f08ac94110f2d0d"; libraryHaskellDepends = [ - base bifunctors containers mtl profunctors semigroupoids semigroups - transformers vector + base bifunctors containers data-default-class hashable mtl + profunctors semigroupoids semigroups transformers + transformers-compat unordered-containers vector ]; testHaskellDepends = [ - base bifunctors QuickCheck tasty tasty-quickcheck transformers - vector + base bifunctors containers hashable QuickCheck quickcheck-instances + tasty tasty-quickcheck transformers unordered-containers vector ]; homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -169925,6 +170367,7 @@ self: { homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tidal-vis" = callPackage @@ -170962,7 +171405,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls" = callPackage + "tls_1_3_2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, hourglass, memory, mtl , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 @@ -170984,9 +171427,10 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls_1_3_3" = callPackage + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, hourglass, memory, mtl , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 @@ -171005,11 +171449,9 @@ self: { base bytestring cereal cryptonite data-default-class hourglass mtl QuickCheck tasty tasty-quickcheck x509 x509-validation ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-debug_0_3_4" = callPackage @@ -171034,7 +171476,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls-debug" = callPackage + "tls-debug_0_4_0" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-system, x509-validation }: @@ -171051,9 +171493,10 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls-debug_0_4_1" = callPackage + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system , x509-validation @@ -171071,7 +171514,6 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-extra" = callPackage @@ -171328,6 +171770,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -171341,6 +171784,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "toml" = callPackage @@ -172761,6 +173205,7 @@ self: { executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "turkish-deasciifier" = callPackage @@ -178278,6 +178723,7 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -180512,33 +180958,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.9.0"; - sha256 = "67a287a1a2347ce4239bce87ecf4b8845866b52493981a58ea4f48654d9ebd8e"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive containers - cookie data-default-class filepath http-types mime-types - monad-loops mtl path-pieces random template-haskell text wai - wai-app-static wai-extra - ]; - testHaskellDepends = [ - aeson base hspec hspec-wai hspec-wai-json wai wai-app-static - ]; - homepage = "https://ajnsit.github.io/wai-routes/"; - description = "Typesafe URLs for Wai applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-routes_0_9_1" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, data-default-class - , filepath, hspec, hspec-wai, hspec-wai-json, http-types - , mime-types, monad-loops, mtl, path-pieces, random - , template-haskell, text, wai, wai-app-static, wai-extra - }: - mkDerivation { - pname = "wai-routes"; - version = "0.9.1"; - sha256 = "156c4c065fc94da10d6af66abf3c14d0dafb25b785d7b6d953347da6fd17dcd3"; + version = "0.9.2"; + sha256 = "5d7d4868d25e3feeeb2ab85dcf950a5f5fbbd24caf8cc5832edd47cdfbc72ccf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -180551,7 +180972,6 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routing" = callPackage @@ -182479,7 +182899,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "webdriver" = callPackage + "webdriver_0_6_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree , exceptions, filepath, http-client, http-types, lifted-base @@ -182503,6 +182923,33 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "webdriver" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, cond, data-default, directory, directory-tree + , exceptions, filepath, http-client, http-types, lifted-base + , monad-control, mtl, network, network-uri, parallel, scientific + , temporary, text, time, transformers, transformers-base + , unordered-containers, vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.6.3.1"; + sha256 = "69af96c4739d9d189cf8bc75a4b33a1fa525e16a062d3e8f95c578c3f35244c3"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring cond + data-default directory directory-tree exceptions filepath + http-client http-types lifted-base monad-control mtl network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + testHaskellDepends = [ base parallel text ]; + doCheck = false; + homepage = "https://github.com/kallisti-dev/hs-webdriver"; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = stdenv.lib.licenses.bsd3; }) {}; "webdriver-angular" = callPackage @@ -184191,8 +184638,8 @@ self: { ({ mkDerivation, base, directory, random, wx, wxcore }: mkDerivation { pname = "wxAsteroids"; - version = "1.1"; - sha256 = "91fa3fe53f24d28fbbdfd6af0431471baf4b76cc77447366457829522d615d42"; + version = "1.1.0.1"; + sha256 = "45143005f69843633246948d5070e346324718d7387faf58af8df57828ee319b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random wx wxcore ]; @@ -184469,7 +184916,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509" = callPackage + "x509_1_6_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -184489,9 +184936,10 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509_1_6_3" = callPackage + "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -184508,11 +184956,9 @@ self: { asn1-types base bytestring cryptonite hourglass mtl tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-store_1_5_0" = callPackage @@ -184640,7 +185086,6 @@ self: { asn1-encoding asn1-types base bytestring cryptonite directory pem x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; @@ -184714,7 +185159,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509-validation" = callPackage + "x509-validation_1_6_2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, byteable , bytestring, containers, cryptonite, data-default-class, hourglass , memory, mtl, pem, x509, x509-store @@ -184731,9 +185176,10 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 Certificate and CRL validation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509-validation_1_6_3" = callPackage + "x509-validation" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, byteable , bytestring, containers, cryptonite, data-default-class, hourglass , memory, mtl, pem, x509, x509-store @@ -184750,7 +185196,6 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 Certificate and CRL validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xattr" = callPackage @@ -186128,6 +186573,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {Xrender = null; inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; @@ -186384,6 +186830,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/xosd"; description = "A binding to the X on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) xosd;}; "xournal-builder" = callPackage -- GitLab From d6805a820d50624519607a80ca165612e48373d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Sep 2015 08:17:08 +0200 Subject: [PATCH 254/553] Drop obsolete Haskell overrides. These overrides are now hard-coded directly in hackage2nix. --- .../haskell-modules/configuration-common.nix | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f7a18fa2da..5ee7fbd603c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -305,40 +305,7 @@ self: super: { hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - holy-project = dontCheck super.holy-project; # http://hydra.cryp.to/build/502002/nixlog/1/raw - holy-project_0_1_1_1 = dontCheck super.holy-project_0_1_1_1; - holy-project_0_2_0_0 = dontCheck super.holy-project_0_2_0_0 ; hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; }); - http-client_0_4_11_1 = dontCheck super.http-client_0_4_11_1; - http-client_0_4_11_2 = dontCheck super.http-client_0_4_11_2; - http-client_0_4_11_3 = dontCheck super.http-client_0_4_11_3; - http-client_0_4_11 = dontCheck super.http-client_0_4_11; - http-client_0_4_12 = dontCheck super.http-client_0_4_12; - http-client_0_4_13 = dontCheck super.http-client_0_4_13; - http-client_0_4_15 = dontCheck super.http-client_0_4_15; - http-client_0_4_16 = dontCheck super.http-client_0_4_16; - http-client_0_4_18_1 = dontCheck super.http-client_0_4_18_1; - http-client_0_4_19 = dontCheck super.http-client_0_4_19; - http-client_0_4_20 = dontCheck super.http-client_0_4_20; - http-client_0_4_21 = dontCheck super.http-client_0_4_21; - http-client_0_4_22 = dontCheck super.http-client_0_4_22; - http-client_0_4_6_1 = dontCheck super.http-client_0_4_6_1; - http-client_0_4_6_2 = dontCheck super.http-client_0_4_6_2; - http-client_0_4_6 = dontCheck super.http-client_0_4_6; - http-client_0_4_7_1 = dontCheck super.http-client_0_4_7_1; - http-client_0_4_7 = dontCheck super.http-client_0_4_7; - http-client_0_4_8_1 = dontCheck super.http-client_0_4_8_1; - http-client_0_4_8 = dontCheck super.http-client_0_4_8; - http-client_0_4_9 = dontCheck super.http-client_0_4_9; - http-client = dontCheck super.http-client; # http://hydra.cryp.to/build/501430/nixlog/1/raw - http-conduit_2_1_5_1 = dontCheck super.http-conduit_2_1_5_1; - http-conduit_2_1_5 = dontCheck super.http-conduit_2_1_5; - http-conduit_2_1_7_1 = dontCheck super.http-conduit_2_1_7_1; - http-conduit_2_1_7_2 = dontCheck super.http-conduit_2_1_7_2; - http-conduit = dontCheck super.http-conduit; # http://hydra.cryp.to/build/501966/nixlog/1/raw - js-jquery_1_11_1 = dontCheck super.js-jquery_1_11_1; - js-jquery_1_11_2 = dontCheck super.js-jquery_1_11_2; - js-jquery = dontCheck super.js-jquery; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 -- GitLab From f546d389b60d011e3d471817578409fddd8a7873 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Wed, 23 Sep 2015 00:49:47 -0300 Subject: [PATCH 255/553] bump ghcjs-dom --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 3a689105c1c..59fb8b285bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -78,6 +78,13 @@ self: super: { ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; + libraryHaskellDepends = [ ]; + src = pkgs.fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs-dom"; + rev = "8d77202b46cbf0aed77bb1f1e8d827f27dee90d7"; + sha256 = "01npi286mwg7yr3h9qhxnylnjzbjb4lg5235v5lqfwy76hmmb9lp"; + }; }); ghc-paths = overrideCabal super.ghc-paths (drv: { -- GitLab From 431507d11a29a02176b7d21deb2d9e2b3b1d4e50 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Thu, 24 Sep 2015 16:11:29 -0300 Subject: [PATCH 256/553] ghcjs packages: reflex, reflex-dom, dependent-sum_0_2_0_1, dependent-map_0_1_1_3, dependent-sum-template --- .../haskell-modules/configuration-ghcjs.nix | 73 +++++++++++++++++-- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 59fb8b285bb..7e45edabc4a 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -91,12 +91,75 @@ self: super: { patches = [ ./patches/ghc-paths-nix-ghcjs.patch ]; }); + # reflex 0.3, made compatible with the newest GHCJS. + reflex = overrideCabal super.reflex (drv: { + src = pkgs.fetchFromGitHub { + owner = "k0001"; + repo = "reflex"; + rev = "e9b2f777ad07875149614e8337507afd5b1a2466"; + sha256 = "005hr3s6y369pxfdlixi4wabgav0bb653j98788kq9q9ssgijlwn"; + }; + libraryHaskellDepends = [ + self.base self.containers self.dependent-map_0_1_1_3 + self.dependent-sum_0_2_0_1 self.exception-transformers self.mtl + self.primitive self.ref-tf self.semigroups self.template-haskell + self.these self.transformers self.transformers-compat + ]; + }); + + # reflex-dom 0.2, made compatible with the newest GHCJS. reflex-dom = overrideCabal super.reflex-dom (drv: { - buildDepends = [ - self.aeson self.base self.bytestring self.containers self.data-default - self.dependent-map self.dependent-sum self.ghcjs-dom self.lens self.mtl - self.ref-tf self.reflex self.safe self.semigroups self.text self.these - self.time self.transformers + src = pkgs.fetchFromGitHub { + owner = "k0001"; + repo = "reflex-dom"; + rev = "a117eae8e101198977611f87605a5cb2ae752fc7"; + sha256 = "18m8ng2fgsfbqdvx5jxy23ndyyhafnxflq8apg5psdz3aqkfimzh"; + }; + libraryHaskellDepends = [ + self.aeson self.base self.bifunctors self.bytestring self.containers + self.data-default self.dependent-map_0_1_1_3 self.dependent-sum_0_2_0_1 + self.dependent-sum-template self.directory + self.exception-transformers self.ghcjs-dom self.lens self.mtl self.ref-tf + self.reflex self.safe self.semigroups self.text self.these self.time + self.transformers ]; }); + + # required by reflex, reflex-dom + dependent-map_0_1_1_3 = self.callPackage ( + { mkDerivation, base, containers, dependent-sum_0_2_0_1, stdenv + }: + mkDerivation { + pname = "dependent-map"; + version = "0.1.1.3"; + sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4"; + libraryHaskellDepends = [ base containers dependent-sum_0_2_0_1 ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + } + ) {}; + + # required by reflex, reflex-dom + dependent-sum_0_2_0_1 = self.callPackage ( + { mkDerivation, base, stdenv + }: + mkDerivation { + pname = "dependent-sum"; + version = "0.2.1.0"; + sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + } + ) {}; + + # required by reflex-dom + dependent-sum-template = overrideCabal super.dependent-sum-template (drv: { + libraryHaskellDepends = [ + self.base self.dependent-sum_0_2_0_1 self.template-haskell self.th-extras + ]; + }); + } -- GitLab From 9e15068099a5b522660cbee3944a4022a436364a Mon Sep 17 00:00:00 2001 From: Robbin C Date: Mon, 21 Sep 2015 11:56:10 +0800 Subject: [PATCH 257/553] ctpp2: init at 2.8.3. This adds ctpp2, a high performance templating engine. --- pkgs/development/libraries/ctpp2/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/ctpp2/default.nix diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix new file mode 100644 index 00000000000..ab5cd2beff3 --- /dev/null +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, gcc48 }: + +stdenv.mkDerivation rec { + name = "ctpp2"; + version = "2.8.3"; + + src = fetchurl { + url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz"; + sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; + }; + + buildInputs = [ cmake gcc48 ]; + + patchPhase = '' + # include to fix undefined getcwd + sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp + ''; + + meta = { + description = "A high performance templating engine"; + homepage = http://ctpp.havoc.ru; + maintiainers = with stdenv.lib.maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8041eaf758f..6ca93f2c4f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6030,6 +6030,8 @@ let ctl = callPackage ../development/libraries/ctl { }; + ctpp2 = callPackage ../development/libraries/ctpp2 { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; cppunit = callPackage ../development/libraries/cppunit { }; -- GitLab From be5d0141c535074d08474527e57c2c702d155514 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sun, 20 Sep 2015 23:07:46 +1000 Subject: [PATCH 258/553] google-musicmanager: beta_1.0.182.3607-r0 -> beta_1.0.221.5230-r0 The previous version was 404 Also fixes i686 typo --- pkgs/applications/audio/google-musicmanager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 2edc1c00ce6..7c69a25eb04 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac , libvorbis }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; + sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; } else fetchurl { url = archUrl name "i386"; - sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; + sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; }; unpackPhase = '' -- GitLab From d06a172c1c3f820929344ff37cd37ac4c5eab737 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 21 Sep 2015 09:38:38 +0200 Subject: [PATCH 259/553] metis-prover: init at 2.3 --- .../science/logic/metis-prover/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/science/logic/metis-prover/default.nix diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix new file mode 100644 index 00000000000..0aa3d6e51c3 --- /dev/null +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, mlton }: + +stdenv.mkDerivation rec { + name = "metis-prover-${version}"; + version = "2.3"; + + src = fetchurl { + url = "http://www.gilith.com/software/metis/metis.tar.gz"; + sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ mlton ]; + + patchPhase = "patchShebangs scripts/mlpp"; + + buildPhase = "make mlton"; + + installPhase = '' + install -Dm0755 bin/mlton/metis $out/bin/metis + ''; + + meta = with stdenv.lib; { + description = "Automatic theorem prover for first-order logic with equality"; + homepage = http://www.gilith.com/research/metis/; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ca93f2c4f9..4891ec8d4ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14349,6 +14349,8 @@ let ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre; }); + metis-prover = callPackage ../applications/science/logic/metis-prover { }; + minisat = callPackage ../applications/science/logic/minisat {}; opensmt = callPackage ../applications/science/logic/opensmt { }; -- GitLab From 697d61ceabc9813d2ae5ac553dcb4aabf12903d9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 23 Sep 2015 11:46:02 +0200 Subject: [PATCH 260/553] maint script gnome.sh: update all packages --- maintainers/scripts/gnome.sh | 238 +++++++++++++++++++++-------------- 1 file changed, 147 insertions(+), 91 deletions(-) diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index cd2c5777403..9398331d0d6 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -4,28 +4,24 @@ set -o pipefail GNOME_FTP="ftp.gnome.org/pub/GNOME/sources" +# projects that don't follow the GNOME major versioning, or that we don't want to +# programmatically update +NO_GNOME_MAJOR="gtkhtml gdm" + usage() { - echo "Usage: $0 show|update project [major.minor]" >&2 + echo "Usage: $0 gnome_dir || [major.minor]" >&2 + echo "gnome_dir is for example pkgs/desktops/gnome-3/3.18" >&2 exit 0 } -if [ "$#" -lt 1 ]; then +if [ "$#" -lt 2 ]; then usage fi -action="$1" -project="$2" -majorVersion="$3" - -if [ "$action" != "show" ] && [ "$action" != "update" ]; then - echo "Unknown action $action" >&2 - usage -fi +GNOME_TOP="$1" +shift -if [ -z "$project" ]; then - echo "No project specified, exiting" - exit 1 -fi +action="$1" # curl -l ftp://... doesn't work from my office in HSE, and I don't want to have # any conversations with sysadmin. Somehow lftp works. @@ -39,79 +35,93 @@ else } fi -if [ -z "$majorVersion" ]; then - echo "Looking for available versions..." >&2 - available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` ) - if [ "$?" -ne "0" ]; then - echo "Project $project not found" >&2 - exit 1 +find_project() { + exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d $@ +} + +show_project() { + local project="$1" + local majorVersion="$2" + local version="" + + if [ -z "$majorVersion" ]; then + echo "Looking for available versions..." >&2 + local available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` ) + if [ "$?" -ne "0" ]; then + echo "Project $project not found" >&2 + return 1 + fi + + echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 + echo -en "Choose one of them: " >&2 + read majorVersion fi - echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 - echo -en "Choose one of them: " >&2 - read majorVersion -fi - -if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then - # not a major version - version="$majorVersion" - majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) -fi - -FTPDIR="${GNOME_FTP}/${project}/${majorVersion}" - -#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` -# gnome's LATEST-IS is broken. Do not trust it. - -if [ -z "$version" ]; then - files=$(ls_ftp "${FTPDIR}") - declare -A versions - - for f in $files; do - case $f in - (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): - ;; - ($project-*.*.9*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - echo "Ignored unstable version ${tmp}" >&2 - ;; - ($project-*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - versions[${tmp}]=1 - ;; - (*): - echo "UNKNOWN FILE $f" - ;; - esac - done - echo "Found versions ${!versions[@]}" >&2 - version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1` - echo "Latest version is: ${version}" >&2 -fi - -name=${project}-${version} -echo "Fetching .sha256 file" >&2 -sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum) - -if [ "$?" -ne "0" ]; then - echo "Version not found" >&2 - exit 1 -fi - -extensions=( "xz" "bz2" "gz" ) -echo "Choosing archive extension (known are ${extensions[@]})..." >&2 -for ext in ${extensions[@]}; do - if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then - ext_pref=$ext - sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ ) - break + if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then + # not a major version + version="$majorVersion" + majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) fi -done -echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 - -src="# Autogenerated by maintainers/scripts/gnome.sh update + + local FTPDIR="${GNOME_FTP}/${project}/${majorVersion}" + + #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` + # gnome's LATEST-IS is broken. Do not trust it. + + if [ -z "$version" ]; then + local files=$(ls_ftp "${FTPDIR}") + declare -A versions + + for f in $files; do + case $f in + (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): + ;; + ($project-*.*.9*.tar.*): + tmp=${f#$project-} + tmp=${tmp%.tar*} + echo "Ignored unstable version ${tmp}" >&2 + ;; + ($project-*.tar.*): + tmp=${f#$project-} + tmp=${tmp%.tar*} + versions[${tmp}]=1 + ;; + (*): + echo "UNKNOWN FILE $f" >&2 + ;; + esac + done + echo "Found versions ${!versions[@]}" >&2 + version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1` + if [ -z "$version" ]; then + echo "No version available for major $majorVersion" >&2 + return 1 + fi + + echo "Latest version is: ${version}" >&2 + fi + + local name=${project}-${version} + echo "Fetching .sha256 file" >&2 + local sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum) + + if [ "$?" -ne "0" ]; then + echo "Version not found" >&2 + return 1 + fi + + extensions=( "xz" "bz2" "gz" ) + echo "Choosing archive extension (known are ${extensions[@]})..." >&2 + for ext in ${extensions[@]}; do + if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then + ext_pref=$ext + sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ ) + break + fi + done + echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 + + echo "# Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { name = \"${project}-${version}\"; @@ -122,17 +132,63 @@ fetchurl: { }; }" -if [ "$action" == "update" ]; then + return 0 +} + +update_project() { + local project="$1" + local majorVersion="$2" + # find project in nixpkgs tree - GNOME_TOP=$(readlink -e $(dirname "${BASH_SOURCE[0]}")"/../../pkgs/desktops/gnome-3/") - projectPath=$(find "$GNOME_TOP" -name "$project" -print) + projectPath=$(find_project -name "$project" -print) if [ -z "$projectPath" ]; then echo "Project $project not found under $GNOME_TOP" exit 1 fi - echo "Updating $projectPath/src.nix" - echo -e "$src" > "$projectPath/src.nix" + src=$(show_project "$project" "$majorVersion") + + if [ "$?" -eq "0" ]; then + echo "Updating $projectPath/src.nix" >&2 + echo -e "$src" > "$projectPath/src.nix" + fi + + return 0 +} + +if [ "$action" == "update-all" ]; then + majorVersion="$2" + if [ -z "$majorVersion" ]; then + echo "No major version specified" >&2 + usage + fi + + # find projects + projects=$(find_project -exec basename '{}' \;) + for project in $projects; do + if echo "$NO_GNOME_MAJOR"|grep -q $project; then + echo "Skipping $project" + else + echo "= Updating $project to $majorVersion" >&2 + update_project $project $majorVersion + echo >&2 + fi + done else - echo -e "\n$src" -fi \ No newline at end of file + project="$2" + majorVersion="$3" + + if [ -z "$project" ]; then + echo "No project specified, exiting" >&2 + usage + fi + + if [ "$action" == "show" ]; then + show_project $project $majorVersion + elif [ "$action" == "update" ]; then + update_project $project $majorVersion + else + echo "Unknown action $action" >&2 + usage + fi +fi -- GitLab From b1f4a7ef3212919466dd97b087f6351c677a53ae Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:28:51 +0200 Subject: [PATCH 261/553] webkitgtk: 2.8.5 -> 2.10.0 --- pkgs/development/libraries/webkitgtk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 0e67f5d3d1a..d60fbca6141 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection +, pkgconfig, gettext, gobjectIntrospection, libnotify , gtk2, gtk3, wayland, libwebp, enchant , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs , enableGeoLocation ? true, geoclue2, sqlite @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.8.5"; + version = "2.10.0"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx"; + sha256 = "0vb8ca6dd9hxb5ycp54bdyykp10blbq5b6qkbak4yf9mxwi5ccj2"; }; patches = [ ./finding-harfbuzz-icu.patch ]; - cmakeFlags = [ "-DPORT=GTK" ]; + cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ]; # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 wayland libwebp enchant + gtk2 wayland libwebp enchant libnotify libxml2 libsecret libxslt harfbuzz libpthreadstubs gst-plugins-base ] ++ optional enableGeoLocation geoclue2; @@ -51,5 +51,5 @@ stdenv.mkDerivation rec { libsoup gtk3 ]; - enableParallelBuilding = true; # build problems on Hydra + enableParallelBuilding = true; } -- GitLab From 6bb4df642ec3e4f59124a49636d457dab7c33490 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:29:21 +0200 Subject: [PATCH 262/553] glib: 2.44.1 -> 2.46.0 --- pkgs/development/libraries/glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index fb9c361c530..137fe943637 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -39,8 +39,8 @@ let ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.44"; - ver_min = "1"; + ver_maj = "2.46"; + ver_min = "0"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "01yabrfp64i11mrks3p1gcks99lw0zm7f5vhkc53sl4amyndw4c8"; + sha256 = "b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; -- GitLab From 63ccbf55b2de793246e19502166f24c407e90ddc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:30:14 +0200 Subject: [PATCH 263/553] atk: 2.16.0 -> 2.18.0 --- pkgs/development/libraries/atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index d5e442c738c..dcb90aa16cd 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.16"; + ver_maj = "2.18"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9"; + sha256 = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b"; }; buildInputs = libintlOrEmpty; -- GitLab From 6858ca17db98846f1e541ac28ee9d5ec98d8c789 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:31:16 +0200 Subject: [PATCH 264/553] gobject-introspection: 1.44.0 -> 1.46.0 --- .../libraries/gobject-introspection/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 50fddd9da9f..f429e1dc6c3 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -5,7 +5,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.44"; + ver_maj = "1.46"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "1b972qg2yb51sdavfvb6kc19akwc15c1bwnbg81vadxamql2q33g"; + sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233"; }; buildInputs = [ flex bison pkgconfig python ] @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { # other dependencies). configureFlags = [ "--disable-tests" ]; + preConfigure = '' + sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in + ''; + postInstall = "rm -rf $out/share/gtk-doc"; setupHook = ./setup-hook.sh; -- GitLab From 8b3e6b5f62f0a6419e782187943d11fdc417409b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:31:59 +0200 Subject: [PATCH 265/553] at-spi2-core: 2.16.0 -> 2.18.0 --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 0fc28185501..7cf29aaca86 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -2,14 +2,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { - versionMajor = "2.16"; + versionMajor = "2.18"; versionMinor = "0"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw"; + sha256 = "1aeec77db6eb8087049af39a07f55756c55319f739d2998030fe6f4ced03ca76"; }; outputs = [ "out" "doc" ]; -- GitLab From 0688a56a49a548960e948a1ce54b80a7ea9c6fef Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:32:15 +0200 Subject: [PATCH 266/553] at-spi2-atk: 2.16.0 -> 2.18.0 --- pkgs/development/libraries/at-spi2-atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 940fc2bb6cc..4a018f0b405 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.16"; + versionMajor = "2.18"; versionMinor = "0"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"; + sha256 = "4a6db33453b6efd15fa7d84ef2a3421262a053f57f1df6e7a2536d02bacdf375"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi -- GitLab From 4c9b91b2a27964ce34c466ead0bad5d4b7b91ed9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:32:37 +0200 Subject: [PATCH 267/553] gdk-pixbuf: 2.31.6 -> 2.32.0 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 5f5a0496954..82fe45d25e4 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -2,15 +2,15 @@ , jasper, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.31"; - ver_min = "6"; + ver_maj = "2.32"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "062x2gqd7p6yxhxlib1ha4l3gk9ihcj080hrwwv9vmlmybb064hi"; + sha256 = "537655ec3635740e949457bafe61ae44ce0e5642a2529a9ef7ee0bcd5e911b67"; }; setupHook = ./setup-hook.sh; -- GitLab From 0a40884e3c589dfdeb42521076892b0d2f6180eb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:32:50 +0200 Subject: [PATCH 268/553] pango: 1.36.8 -> 1.38.0 --- pkgs/development/libraries/pango/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a92..12b38fd6db7 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -3,15 +3,15 @@ }: let - ver_maj = "1.36"; - ver_min = "8"; + ver_maj = "1.38"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"; + sha256 = "1d4e75974bad853ee9ac5fc5caee5e7ab235abbd945d51d01f3806e04e7c226c"; }; buildInputs = with stdenv.lib; [ gobjectIntrospection ] -- GitLab From 48ac26f51250c97fda720520d96505afa9dc53c8 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:33:07 +0200 Subject: [PATCH 269/553] gtk+: 3.16.6 -> 3.18.0 --- pkgs/development/libraries/gtk+/3.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 5fb70ac05ea..9bf95d015dd 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; let - ver_maj = "3.16"; - ver_min = "6"; + ver_maj = "3.18"; + ver_min = "0"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1gpzlnfrifc17yfk0zki6b2vmsfpf5cmrbh232s6iaan11np44jd"; + sha256 = "7fb8ae257403317d3852bad28d064d35f67e978b1fed8b71d5997e87204271b9"; }; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; -- GitLab From bb16eb8f9da042abd773a3696a05ad1981b12d62 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:34:03 +0200 Subject: [PATCH 270/553] cogl: init 1.22.0 --- pkgs/development/libraries/cogl/1.22.nix | 56 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/libraries/cogl/1.22.nix diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix new file mode 100644 index 00000000000..ce4fda5bd46 --- /dev/null +++ b/pkgs/development/libraries/cogl/1.22.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty +, pangoSupport ? true, pango, cairo, gobjectIntrospection +, gstreamerSupport ? true, gst_all_1 }: + +let + ver_maj = "1.22"; + ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "cogl-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; + sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = [ + "--enable-introspection" + "--enable-kms-egl-platform" + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; + + propagatedBuildInputs = with xorg; [ + glib gdk_pixbuf gobjectIntrospection + mesa_noglu libXrandr libXfixes libXcomposite libXdamage + ] + ++ libintlOrEmpty + ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; + + buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; + + COGL_PANGO_DEP_CFLAGS + = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) + "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + #doCheck = true; # all tests fail (no idea why) + + meta = with stdenv.lib; { + description = "A small open source library for using 3D graphics hardware for rendering"; + maintainers = with maintainers; [ lovek323 ]; + + longDescription = '' + Cogl is a small open source library for using 3D graphics hardware for + rendering. The API departs from the flat state machine style of OpenGL + and is designed to make it easy to write orthogonal components that can + render without stepping on each other's toes. + ''; + + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4891ec8d4ba..1eb556515b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6018,6 +6018,8 @@ let cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { }; + cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { }; + coin3d = callPackage ../development/libraries/coin3d { }; CoinMP = callPackage ../development/libraries/CoinMP { }; -- GitLab From 41fc49ed7e94d9a0aef044a6ea34c142e376d3f7 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:34:25 +0200 Subject: [PATCH 271/553] clutter: init 1.24.0 --- pkgs/development/libraries/clutter/1.24.nix | 52 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/clutter/1.24.nix diff --git a/pkgs/development/libraries/clutter/1.24.nix b/pkgs/development/libraries/clutter/1.24.nix new file mode 100644 index 00000000000..b9d45b6c62b --- /dev/null +++ b/pkgs/development/libraries/clutter/1.24.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes +, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, +gobjectIntrospection +}: + +let + ver_maj = "1.24"; + ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "clutter-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; + sha256 = "85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6"; + }; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = + [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango + atk json_glib gobjectIntrospection + ]; + + configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK + + #doCheck = true; # no tests possible without a display + + meta = { + description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; + + longDescription = + '' Clutter is free software library for creating fast, compelling, + portable, and dynamic graphical user interfaces. It is a core part + of MeeGo, and is supported by the open source community. Its + development is sponsored by Intel. + + Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use + on mobile and embedded platforms), but wraps an easy to use, + efficient, flexible API around GL's complexity. + + Clutter enforces no particular user interface style, but provides a + rich, generic foundation for higher-level toolkits tailored to + specific needs. + ''; + + license = stdenv.lib.licenses.lgpl2Plus; + homepage = http://www.clutter-project.org/; + + maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1eb556515b7..56fadb5ce10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6000,6 +6000,10 @@ let cogl = cogl_1_20; }; + clutter_1_24 = callPackage ../development/libraries/clutter/1.24.nix { + cogl = cogl_1_22; + }; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { -- GitLab From 26aea8b1aa798fa4cae5cf45953f8e3f3b7dbea9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 10:36:01 +0200 Subject: [PATCH 272/553] gnome3: init 3.18 --- nixos/tests/gnome3_18.nix | 36 ++ .../gnome-3/3.18/apps/accerciser/default.nix | 28 ++ .../gnome-3/3.18/apps/bijiben/default.nix | 36 ++ .../gnome-3/3.18/apps/bijiben/src.nix | 10 + .../gnome-3/3.18/apps/cheese/default.nix | 25 ++ .../desktops/gnome-3/3.18/apps/cheese/src.nix | 10 + .../gnome-3/3.18/apps/evolution/default.nix | 49 +++ .../gnome-3/3.18/apps/evolution/src.nix | 10 + .../gnome-3/3.18/apps/file-roller/default.nix | 25 ++ .../gnome-3/3.18/apps/file-roller/src.nix | 10 + .../gnome-3/3.18/apps/gedit/default.nix | 33 ++ pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix | 10 + .../gnome-3/3.18/apps/glade/default.nix | 30 ++ pkgs/desktops/gnome-3/3.18/apps/glade/src.nix | 10 + .../gnome-3/3.18/apps/gnome-boxes/default.nix | 42 ++ .../gnome-3/3.18/apps/gnome-boxes/src.nix | 10 + .../3.18/apps/gnome-calendar/default.nix | 22 + .../gnome-3/3.18/apps/gnome-calendar/src.nix | 10 + .../3.18/apps/gnome-characters/default.nix | 19 + .../3.18/apps/gnome-characters/src.nix | 10 + .../3.18/apps/gnome-clocks/default.nix | 27 ++ .../gnome-3/3.18/apps/gnome-clocks/src.nix | 10 + .../3.18/apps/gnome-documents/default.nix | 39 ++ .../gnome-3/3.18/apps/gnome-documents/src.nix | 10 + .../gnome-getting-started-docs/default.nix | 15 + .../apps/gnome-getting-started-docs/src.nix | 10 + .../gnome-3/3.18/apps/gnome-logs/default.nix | 21 + .../gnome-3/3.18/apps/gnome-logs/src.nix | 10 + .../gnome-3/3.18/apps/gnome-maps/default.nix | 25 ++ .../gnome-3/3.18/apps/gnome-maps/soup.patch | 10 + .../gnome-3/3.18/apps/gnome-maps/src.nix | 10 + .../gnome-3/3.18/apps/gnome-music/default.nix | 30 ++ .../gnome-3/3.18/apps/gnome-music/src.nix | 10 + .../3.18/apps/gnome-nettool/default.nix | 26 ++ .../3.18/apps/gnome-photos/default.nix | 31 ++ .../gnome-3/3.18/apps/gnome-photos/src.nix | 10 + .../3.18/apps/gnome-weather/default.nix | 19 + .../gnome-3/3.18/apps/gnome-weather/src.nix | 10 + .../3.18/apps/nautilus-sendto/default.nix | 22 + .../gnome-3/3.18/apps/polari/default.nix | 22 + .../desktops/gnome-3/3.18/apps/polari/src.nix | 10 + .../gnome-3/3.18/apps/seahorse/default.nix | 35 ++ .../gnome-3/3.18/apps/seahorse/src.nix | 10 + .../gnome-3/3.18/apps/vinagre/default.nix | 21 + .../gnome-3/3.18/apps/vinagre/src.nix | 10 + .../3.18/core/adwaita-icon-theme/default.nix | 21 + .../3.18/core/adwaita-icon-theme/src.nix | 10 + .../gnome-3/3.18/core/baobab/default.nix | 32 ++ .../desktops/gnome-3/3.18/core/baobab/src.nix | 10 + .../gnome-3/3.18/core/caribou/default.nix | 31 ++ .../3.18/core/dconf-editor/default.nix | 19 + .../gnome-3/3.18/core/dconf-editor/src.nix | 10 + .../gnome-3/3.18/core/dconf/default.nix | 23 + .../gnome-3/3.18/core/empathy/default.nix | 57 +++ .../gnome-3/3.18/core/eog/default.nix | 25 ++ pkgs/desktops/gnome-3/3.18/core/eog/src.nix | 10 + .../gnome-3/3.18/core/epiphany/default.nix | 42 ++ .../3.18/core/epiphany/libxml_depend.patch | 10 + .../gnome-3/3.18/core/epiphany/src.nix | 10 + .../gnome-3/3.18/core/evince/default.nix | 64 +++ .../desktops/gnome-3/3.18/core/evince/src.nix | 10 + .../core/evolution-data-server/default.nix | 30 ++ .../3.18/core/evolution-data-server/src.nix | 10 + .../gnome-3/3.18/core/folks/default.nix | 43 ++ .../gnome-3/3.18/core/gconf/default.nix | 32 ++ .../gnome-3/3.18/core/gcr/default.nix | 28 ++ pkgs/desktops/gnome-3/3.18/core/gcr/src.nix | 10 + .../3.18/core/gdm/3.16-wip/default.nix | 41 ++ .../3.16-wip/disable_x_access_control.patch | 15 + .../3.18/core/gdm/3.16-wip/sessions_dir.patch | 17 + .../3.18/core/gdm/3.16-wip/xserver_path.patch | 83 ++++ .../gnome-3/3.18/core/gdm/default.nix | 41 ++ .../core/gdm/disable_x_access_control.patch | 13 + .../3.18/core/gdm/no-dbus-launch.patch | 20 + .../gnome-3/3.18/core/gdm/sessions_dir.patch | 17 + pkgs/desktops/gnome-3/3.18/core/gdm/src.nix | 10 + .../gnome-3/3.18/core/gdm/xserver_path.patch | 15 + .../3.18/core/geocode-glib/default.nix | 14 + .../gnome-3/3.18/core/geocode-glib/src.nix | 10 + .../gnome-3/3.18/core/gjs/default.nix | 28 ++ .../3.18/core/gnome-backgrounds/default.nix | 12 + .../3.18/core/gnome-backgrounds/src.nix | 10 + .../3.18/core/gnome-bluetooth/default.nix | 23 + .../gnome-3/3.18/core/gnome-bluetooth/src.nix | 10 + .../3.18/core/gnome-calculator/default.nix | 30 ++ .../3.18/core/gnome-calculator/src.nix | 10 + .../3.18/core/gnome-common/default.nix | 17 + .../gnome-3/3.18/core/gnome-common/src.nix | 10 + .../3.18/core/gnome-contacts/default.nix | 47 +++ .../3.18/core/gnome-contacts/gio_unix.patch | 10 + .../gnome-3/3.18/core/gnome-contacts/src.nix | 10 + .../core/gnome-control-center/default.nix | 59 +++ .../3.18/core/gnome-control-center/src.nix | 10 + .../vpn_plugins_path.patch | 19 + .../3.18/core/gnome-desktop/default.nix | 24 ++ .../gnome-3/3.18/core/gnome-desktop/src.nix | 10 + .../3.18/core/gnome-dictionary/default.nix | 32 ++ .../3.18/core/gnome-dictionary/src.nix | 10 + .../3.18/core/gnome-disk-utility/default.nix | 35 ++ .../3.18/core/gnome-disk-utility/src.nix | 10 + .../3.18/core/gnome-font-viewer/default.nix | 31 ++ .../3.18/core/gnome-font-viewer/src.nix | 10 + .../3.18/core/gnome-keyring/default.nix | 34 ++ .../gnome-3/3.18/core/gnome-keyring/src.nix | 10 + .../gnome-3/3.18/core/gnome-menus/default.nix | 22 + .../core/gnome-online-accounts/default.nix | 33 ++ .../3.18/core/gnome-online-accounts/src.nix | 10 + .../3.18/core/gnome-online-miners/default.nix | 37 ++ .../3.18/core/gnome-screenshot/default.nix | 31 ++ .../3.18/core/gnome-screenshot/src.nix | 10 + .../3.18/core/gnome-session/default.nix | 25 ++ .../gnome-3/3.18/core/gnome-session/src.nix | 10 + .../core/gnome-settings-daemon/default.nix | 31 ++ .../3.18/core/gnome-settings-daemon/src.nix | 10 + .../core/gnome-shell-extensions/default.nix | 19 + .../3.18/core/gnome-shell-extensions/src.nix | 10 + .../gnome-3/3.18/core/gnome-shell/default.nix | 57 +++ .../gnome-3/3.18/core/gnome-shell/src.nix | 10 + .../3.18/core/gnome-system-log/default.nix | 36 ++ .../core/gnome-system-monitor/default.nix | 32 ++ .../3.18/core/gnome-system-monitor/src.nix | 10 + .../3.18/core/gnome-terminal/default.nix | 28 ++ .../gnome-3/3.18/core/gnome-terminal/src.nix | 10 + .../core/gnome-themes-standard/default.nix | 14 + .../3.18/core/gnome-themes-standard/src.nix | 10 + .../3.18/core/gnome-user-docs/default.nix | 15 + .../gnome-3/3.18/core/gnome-user-docs/src.nix | 10 + .../3.18/core/gnome-user-share/default.nix | 45 ++ .../3.18/core/gnome-user-share/src.nix | 10 + .../3.18/core/grilo-plugins/default.nix | 27 ++ .../gnome-3/3.18/core/grilo/default.nix | 33 ++ .../gnome-3/3.18/core/grilo/setup-hook.sh | 7 + .../gsettings-desktop-schemas/default.nix | 22 + .../core/gsettings-desktop-schemas/src.nix | 10 + .../gnome-3/3.18/core/gsound/default.nix | 22 + .../3.18/core/gtksourceview/default.nix | 22 + .../core/gtksourceview/nix_share_path.patch | 11 + .../gnome-3/3.18/core/gtksourceview/src.nix | 10 + .../gnome-3/3.18/core/gucharmap/default.nix | 33 ++ .../gnome-3/3.18/core/gucharmap/src.nix | 10 + .../gnome-3/3.18/core/libcroco/default.nix | 20 + .../gnome-3/3.18/core/libgdata/default.nix | 33 ++ .../gnome-3/3.18/core/libgee/default.nix | 26 ++ .../core/libgee/fix_introspection_paths.patch | 13 + .../3.18/core/libgnome-keyring/default.nix | 26 ++ .../gnome-3/3.18/core/libgnomekbd/default.nix | 24 ++ .../gnome-3/3.18/core/libgweather/default.nix | 17 + .../gnome-3/3.18/core/libgweather/src.nix | 10 + .../gnome-3/3.18/core/libgxps/default.nix | 20 + .../gnome-3/3.18/core/libpeas/default.nix | 20 + .../gnome-3/3.18/core/libpeas/src.nix | 10 + .../gnome-3/3.18/core/libzapojit/default.nix | 16 + .../gnome-3/3.18/core/mutter/default.nix | 31 ++ .../gnome-3/3.18/core/mutter/math.patch | 10 + .../desktops/gnome-3/3.18/core/mutter/src.nix | 10 + .../gnome-3/3.18/core/mutter/x86.patch | 20 + .../gnome-3/3.18/core/nautilus/default.nix | 25 ++ .../3.18/core/nautilus/extension_dir.patch | 24 ++ .../gnome-3/3.18/core/nautilus/src.nix | 10 + .../gnome-3/3.18/core/rest/default.nix | 19 + .../gnome-3/3.18/core/sushi/default.nix | 33 ++ pkgs/desktops/gnome-3/3.18/core/sushi/src.nix | 10 + .../3.18/core/totem-pl-parser/default.nix | 20 + .../gnome-3/3.18/core/totem/default.nix | 42 ++ pkgs/desktops/gnome-3/3.18/core/totem/src.nix | 10 + .../gnome-3/3.18/core/tracker/default.nix | 55 +++ .../gnome-3/3.18/core/vino/default.nix | 25 ++ pkgs/desktops/gnome-3/3.18/core/vino/src.nix | 10 + pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix | 40 ++ .../gnome-3/3.18/core/vte/default.nix | 39 ++ .../core/vte/expose_select_text.0.40.0.patch | 226 ++++++++++ pkgs/desktops/gnome-3/3.18/core/vte/src.nix | 10 + .../gnome-3/3.18/core/yelp-tools/default.nix | 17 + .../gnome-3/3.18/core/yelp-tools/src.nix | 10 + .../gnome-3/3.18/core/yelp-xsl/default.nix | 18 + .../gnome-3/3.18/core/yelp-xsl/src.nix | 10 + .../gnome-3/3.18/core/yelp/default.nix | 26 ++ pkgs/desktops/gnome-3/3.18/core/yelp/src.nix | 10 + .../gnome-3/3.18/core/zenity/default.nix | 19 + .../desktops/gnome-3/3.18/core/zenity/src.nix | 10 + pkgs/desktops/gnome-3/3.18/default.nix | 394 ++++++++++++++++++ .../gnome-3/3.18/desktop/rarian/default.nix | 16 + .../gnome-3/3.18/devtools/anjuta/default.nix | 24 ++ .../gnome-3/3.18/devtools/anjuta/src.nix | 10 + .../gnome-3/3.18/devtools/devhelp/default.nix | 18 + .../gnome-3/3.18/devtools/devhelp/src.nix | 10 + .../gnome-3/3.18/devtools/gdl/default.nix | 15 + .../gnome-3/3.18/devtools/gdl/src.nix | 10 + .../devtools/gnome-devel-docs/default.nix | 15 + .../3.18/devtools/gnome-devel-docs/src.nix | 10 + .../gnome-3/3.18/games/aisleriot/default.nix | 20 + .../gnome-3/3.18/games/aisleriot/src.nix | 10 + .../3.18/games/five-or-more/default.nix | 19 + .../gnome-3/3.18/games/five-or-more/src.nix | 10 + .../3.18/games/four-in-a-row/default.nix | 19 + .../gnome-3/3.18/games/four-in-a-row/src.nix | 10 + .../3.18/games/gnome-chess/default.nix | 19 + .../gnome-3/3.18/games/gnome-chess/src.nix | 10 + .../3.18/games/gnome-klotski/default.nix | 19 + .../gnome-3/3.18/games/gnome-klotski/src.nix | 10 + .../3.18/games/gnome-mahjongg/default.nix | 19 + .../gnome-3/3.18/games/gnome-mahjongg/src.nix | 10 + .../3.18/games/gnome-mines/default.nix | 19 + .../gnome-3/3.18/games/gnome-mines/src.nix | 10 + .../3.18/games/gnome-nibbles/default.nix | 20 + .../gnome-3/3.18/games/gnome-nibbles/src.nix | 10 + .../3.18/games/gnome-robots/default.nix | 19 + .../gnome-3/3.18/games/gnome-robots/src.nix | 10 + .../3.18/games/gnome-sudoku/default.nix | 17 + .../gnome-3/3.18/games/gnome-sudoku/src.nix | 10 + .../3.18/games/gnome-taquin/default.nix | 19 + .../gnome-3/3.18/games/gnome-taquin/src.nix | 10 + .../3.18/games/gnome-tetravex/default.nix | 18 + .../gnome-3/3.18/games/gnome-tetravex/src.nix | 10 + .../gnome-3/3.18/games/hitori/default.nix | 24 ++ .../gnome-3/3.18/games/iagno/default.nix | 19 + .../desktops/gnome-3/3.18/games/iagno/src.nix | 10 + .../gnome-3/3.18/games/lightsoff/default.nix | 19 + .../gnome-3/3.18/games/lightsoff/src.nix | 10 + .../3.18/games/quadrapassel/default.nix | 21 + .../gnome-3/3.18/games/quadrapassel/src.nix | 10 + .../gnome-3/3.18/games/swell-foop/default.nix | 19 + .../gnome-3/3.18/games/swell-foop/src.nix | 10 + .../gnome-3/3.18/games/tali/default.nix | 19 + pkgs/desktops/gnome-3/3.18/games/tali/src.nix | 10 + ...d-with-evolution-data-server-3.13.90.patch | 39 ++ .../gnome-3/3.18/misc/california/default.nix | 39 ++ .../gnome-3/3.18/misc/geary/default.nix | 52 +++ .../3.18/misc/geary/disable_valadoc.patch | 24 ++ .../gnome-3/3.18/misc/gexiv2/default.nix | 28 ++ .../gnome-3/3.18/misc/gfbgraph/default.nix | 23 + .../gnome-3/3.18/misc/gitg/default.nix | 39 ++ pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix | 10 + ...themes-and-icons-in-system-data-dirs.patch | 123 ++++++ ...-multiple-entries-for-a-single-theme.patch | 103 +++++ ...reate-config-dir-if-it-doesn-t-exist.patch | 29 ++ .../3.18/misc/gnome-tweak-tool/default.nix | 44 ++ .../gnome-tweak-tool/find_gsettings.patch | 22 + .../3.18/misc/gnome-tweak-tool/src.nix | 10 + .../3.18/misc/gnome-video-effects/default.nix | 20 + .../gnome-3/3.18/misc/gpaste/default.nix | 44 ++ .../gnome-3/3.18/misc/gtkhtml/default.nix | 16 + .../gnome-3/3.18/misc/gtkhtml/src.nix | 10 + .../gnome-3/3.18/misc/libgda/default.nix | 30 ++ .../3.18/misc/libgit2-glib/default.nix | 21 + .../gnome-3/3.18/misc/libmediaart/default.nix | 22 + .../gnome-3/3.18/misc/pomodoro/default.nix | 50 +++ pkgs/top-level/all-packages.nix | 2 + 248 files changed, 5838 insertions(+) create mode 100644 nixos/tests/gnome3_18.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/glade/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/glade/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/polari/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/polari/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/baobab/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/baobab/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/caribou/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/dconf/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/empathy/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/eog/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/eog/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/evince/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/evince/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/folks/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gconf/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gcr/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gcr/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gjs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/grilo/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh create mode 100644 pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gsound/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgee/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/mutter/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/mutter/math.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/mutter/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/rest/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/sushi/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/sushi/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/totem/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/totem/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/tracker/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/vino/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/vino/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/vte/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch create mode 100644 pkgs/desktops/gnome-3/3.18/core/vte/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/yelp/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/yelp/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/zenity/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/core/zenity/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/hitori/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/iagno/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/iagno/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/tali/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/games/tali/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch create mode 100644 pkgs/desktops/gnome-3/3.18/misc/california/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/geary/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix create mode 100644 pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix diff --git a/nixos/tests/gnome3_18.nix b/nixos/tests/gnome3_18.nix new file mode 100644 index 00000000000..971fd48b186 --- /dev/null +++ b/nixos/tests/gnome3_18.nix @@ -0,0 +1,36 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "gnome3"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ iElectric eelco chaoflow lethalman ]; + }; + + machine = + { config, pkgs, ... }: + + { imports = [ ./common/user-account.nix ]; + + services.xserver.enable = true; + + services.xserver.displayManager.auto.enable = true; + services.xserver.displayManager.auto.user = "alice"; + services.xserver.desktopManager.gnome3.enable = true; + + environment.gnome3.packageSet = pkgs.gnome3_18; + + virtualisation.memorySize = 512; + }; + + testScript = + '' + $machine->waitForX; + $machine->sleep(15); + + # Check that logging in has given the user ownership of devices. + $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + + $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); + $machine->waitForWindow(qr/Terminal/); + $machine->sleep(20); + $machine->screenshot("screen"); + ''; +}) diff --git a/pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix new file mode 100644 index 00000000000..a2813e0581b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core +, dbus, intltool, libwnck3 }: + +stdenv.mkDerivation rec { + name = "accerciser-3.14.0"; + + src = fetchurl { + url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz"; + sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm"; + }; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi + python3Packages.pygobject3 python3Packages.ipython + at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme + ]; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Accerciser; + description = "Interactive Python accessibility explorer"; + maintainers = gnome3.maintainers; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix new file mode 100644 index 00000000000..00895f9a2bb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix @@ -0,0 +1,36 @@ +{ stdenv, intltool, fetchurl, pkgconfig, glib +, evolution_data_server, evolution, sqlite +, makeWrapper, itstool, desktop_file_utils +, clutter_gtk, libuuid, webkitgtk, zeitgeist +, gnome3, librsvg, gdk_pixbuf, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig glib intltool itstool libxml2 + clutter_gtk libuuid webkitgtk gnome3.tracker + gnome3.gnome_online_accounts zeitgeist desktop_file_utils + gnome3.gsettings_desktop_schemas makeWrapper + gdk_pixbuf gnome3.defaultIconTheme librsvg + evolution_data_server evolution sqlite ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/bijiben" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Bijiben; + description = "Note editor designed to remain simple to use"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix new file mode 100644 index 00000000000..9eb11c0e379 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "bijiben-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/bijiben/3.18/bijiben-3.18.0.tar.xz; + sha256 = "3e933eae3776ae50a639f0866b5c11279961b5ebdaa83a621509dfe31c218fea"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix new file mode 100644 index 00000000000..ed5bbf6ca22 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix @@ -0,0 +1,25 @@ +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 +, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool +, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool + gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop + gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2 + libcanberra_gtk3 ]; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Cheese; + description = "Take photos and videos with your webcam, with fun graphical effects"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix new file mode 100644 index 00000000000..7e47c2c4950 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "cheese-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/cheese/3.18/cheese-3.18.0.tar.xz; + sha256 = "65ba4a60be51b9fc5537e5c1cdb6605b3098145982fae75a08ace94b965aeb0b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix new file mode 100644 index 00000000000..a9bb87d4ddd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix @@ -0,0 +1,49 @@ +{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight +, pkgconfig, gtk3, glib, libnotify, gtkspell3 +, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite +, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: + +let + majVer = gnome3.version; +in stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + propagatedBuildInputs = [ gnome3.gtkhtml ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + gdk_pixbuf gnome3.defaultIconTheme librsvg db icu + gnome3.evolution_data_server libsecret libical gcr + webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 + libcanberra_gtk3 bogofilter gnome3.libgdata sqlite + gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit + nss nspr libnotify procps highlight gnome3.libgweather + gnome3.gsettings_desktop_schemas makeWrapper ]; + + configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" + "--disable-libcryptui" ]; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Evolution; + description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix new file mode 100644 index 00000000000..46af1c8b8bb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evolution-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/evolution/3.18/evolution-3.18.0.tar.xz; + sha256 = "a3efe42a861200c0463476e0a02e566fde74a0d4a699d8cc6514c031d5cad410"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix new file mode 100644 index 00000000000..4e35676f3cb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive +, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # TODO: support nautilus + # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so + + buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive + gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg + makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/file-roller" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/FileRoller; + description = "Archive manager for the GNOME desktop environment"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix new file mode 100644 index 00000000000..3e166f996e9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "file-roller-3.16.4"; + + src = fetchurl { + url = mirror://gnome/sources/file-roller/3.16/file-roller-3.16.4.tar.xz; + sha256 = "5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix new file mode 100644 index 00000000000..6cff4bdee48 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix @@ -0,0 +1,33 @@ +{ stdenv, intltool, fetchurl, enchant, isocodes +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, libsoup, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes + gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup + gnome3.libpeas gnome3.gtksourceview libxml2 + gnome3.gsettings_desktop_schemas makeWrapper file ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/gedit" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Gedit; + description = "Official text editor of the GNOME desktop environment"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix new file mode 100644 index 00000000000..ff427fdfb90 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gedit-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gedit/3.18/gedit-3.18.0.tar.xz; + sha256 = "9abd4f1478385f8b6c983298206f4ab1a25c682b9c87fb00d759b7db5b949533"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.18/apps/glade/default.nix new file mode 100644 index 00000000000..a0f8d966955 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/glade/default.nix @@ -0,0 +1,30 @@ +{ stdenv, intltool, fetchurl, python +, pkgconfig, gtk3, glib +, makeWrapper, itstool, libxml2, docbook_xsl +, gnome3, librsvg, gdk_pixbuf, libxslt }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python + gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl + gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram "$out/bin/glade" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Glade; + description = "User interface designer for GTK+ applications"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.18/apps/glade/src.nix new file mode 100644 index 00000000000..aaa913babea --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/glade/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "glade-3.18.3"; + + src = fetchurl { + url = mirror://gnome/sources/glade/3.18/glade-3.18.3.tar.xz; + sha256 = "ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix new file mode 100644 index 00000000000..90955bd3ccf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk +, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala +, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg +, desktop_file_utils, mtools, cdrkit, libcdio +, libusb, libarchive, acl +}: + +# TODO: ovirt (optional) + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + enableParallelBuilding = true; + + doCheck = true; + + buildInputs = [ + makeWrapper pkgconfig intltool itstool libvirt-glib glib + gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol + libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp + gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive + librsvg desktop_file_utils acl + ]; + + preFixup = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" + done + ''; + + meta = with stdenv.lib; { + description = "Simple GNOME 3 application to access remote or virtual systems"; + homepage = https://wiki.gnome.org/action/show/Apps/Boxes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix new file mode 100644 index 00000000000..06543540e76 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-boxes-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-boxes/3.18/gnome-boxes-3.18.0.tar.xz; + sha256 = "ed2b442fc676bdfa47d6b6326836238c2c98af9725a91eb023784a3e692ae749"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix new file mode 100644 index 00000000000..cbd5a84bdb5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, evolution_data_server, sqlite, libxml2, libsoup +, glib, gnome_online_accounts }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server + sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Calendar; + description = "Simple and beautiful calendar application for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix new file mode 100644 index 00000000000..6b941b592e5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-calendar-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-calendar/3.18/gnome-calendar-3.18.0.tar.xz; + sha256 = "f7d50fe8d5d3dcc574f0034dba6a64cbb9b3f842faab5978c9d02b38548f355b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix new file mode 100644 index 00000000000..4571a5d50e8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, gjs, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + librsvg gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; + description = "Simple utility application to find and insert unusual characters"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix new file mode 100644 index 00000000000..a957aa91d75 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-characters-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-characters/3.18/gnome-characters-3.18.0.tar.xz; + sha256 = "e068b2275a08639565a88b096d378a4ac2abf90301ff43056bb5157dff54ce08"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix new file mode 100644 index 00000000000..e39614e765d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix @@ -0,0 +1,27 @@ +{ stdenv, intltool, fetchurl, libgweather, libnotify +, pkgconfig, gtk3, glib, gsound +, makeWrapper, itstool, libcanberra_gtk3, libtool +, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + gnome3.gsettings_desktop_schemas makeWrapper + gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gnome_desktop gnome3.geocode_glib geoclue2 + libgweather libnotify libtool gsound + wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Clocks; + description = "Clock application designed for GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix new file mode 100644 index 00000000000..9f0be0ede98 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-clocks-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-clocks/3.18/gnome-clocks-3.18.0.tar.xz; + sha256 = "ca0818ec89e3539201da6b5388365e3d66df815198beccc90e2be44c7822baa0"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix new file mode 100644 index 00000000000..7f1f70114b7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix @@ -0,0 +1,39 @@ +{ stdenv, intltool, fetchurl, evince, gjs +, pkgconfig, gtk3, glib +, makeWrapper, itstool, libxslt, webkitgtk +, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl +, gobjectIntrospection, json_glib, inkscape, poppler_utils +, gmp, desktop_file_utils, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + configureFlags = [ "--enable-getting-started" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt + docbook_xsl desktop_file_utils inkscape poppler_utils + gnome3.gsettings_desktop_schemas makeWrapper gmp + gdk_pixbuf gnome3.defaultIconTheme librsvg evince + libsoup webkitgtk gjs gobjectIntrospection gnome3.rest + gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts + gnome3.gnome_desktop gnome3.libzapojit json_glib + wrapGAppsHook ]; + + enableParallelBuilding = true; + + preFixup = '' + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" + + gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Documents; + description = "Document manager application designed to work with GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix new file mode 100644 index 00000000000..5906bade1ef --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-documents-3.18.0.1"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-documents/3.18/gnome-documents-3.18.0.1.tar.xz; + sha256 = "0b19593e949276de71cb7292bb77520eb3cd915ac8c71d27a8d05f79b9e86816"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix new file mode 100644 index 00000000000..0c75ebd7c78 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://live.gnome.org/DocumentationProject; + description = "Help a new user get started in GNOME"; + maintainers = gnome3.maintainers; + license = licenses.cc-by-sa-30; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix new file mode 100644 index 00000000000..a4ed1d6b909 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-getting-started-docs-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-getting-started-docs/3.18/gnome-getting-started-docs-3.18.0.tar.xz; + sha256 = "5ef0373c5a864fefdecb17bffdfc2cca00fb2abf93756b1df9062e12208925d6"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix new file mode 100644 index 00000000000..d4135fdb1ba --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, itstool, libxml2, systemd }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = [ "--disable-tests" ]; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + systemd gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Logs; + description = "A log viewer for the systemd journal"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix new file mode 100644 index 00000000000..b077f8cee4d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-logs-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-logs/3.18/gnome-logs-3.18.0.tar.xz; + sha256 = "7602b55d47b5d889be7547869a0a48f03f6b22a1c872b86ed70049695d06d699"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix new file mode 100644 index 00000000000..b9aac0539ae --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 +, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook + gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph + gnome3.geocode_glib libchamplain file libsoup + gdk_pixbuf librsvg autoreconfHook + gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; + + patches = [ ./soup.patch ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Maps; + description = "A map application for GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch new file mode 100644 index 00000000000..e7e86ba76c7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch @@ -0,0 +1,10 @@ +--- gnome-maps-3.18.0/configure.ac.orig 2015-09-24 18:38:31.912498368 +0200 ++++ gnome-maps-3.18.0/configure.ac 2015-09-24 18:38:40.783320413 +0200 +@@ -50,6 +50,7 @@ + folks >= $FOLKS_MIN_VERSION + geocode-glib-1.0 >= $GEOCODE_MIN_VERSION + champlain-0.12 >= $CHAMPLAIN_MIN_VERSION ++ libsoup-2.4 + ]) + AC_SUBST(GNOME_MAPS_LIB_CFLAGS) + AC_SUBST(GNOME_MAPS_LIB_LIBS) diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix new file mode 100644 index 00000000000..9d33216480d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-maps-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-maps/3.18/gnome-maps-3.18.0.tar.xz; + sha256 = "242f70346a1527ba0d9a664bd863b02e2227f9f0f0f577b9b0c00dc3075eb85e"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix new file mode 100644 index 00000000000..bb89ef84202 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix @@ -0,0 +1,30 @@ +{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker +, python3, libxml2, python3Packages, libnotify, wrapGAppsHook +, pkgconfig, gtk3, glib, cairo +, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart + gdk_pixbuf gnome3.defaultIconTheme librsvg python3 + gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify + python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser + gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gnome3.gsettings_desktop_schemas makeWrapper tracker ]; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Music; + description = "Music player and management application for the GNOME desktop environment"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix new file mode 100644 index 00000000000..de2cf605486 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-music-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.0.tar.xz; + sha256 = "e2e4b99a57c7b5c83ce3deccd38880cbafb875b423ab276204af523bc648d69c"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix new file mode 100644 index 00000000000..4c152777f2c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, libgtop, intltool, itstool, libxml2, nmap, inetutils }: + +stdenv.mkDerivation rec { + name = "gnome-nettool-3.8.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz"; + sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; + }; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + propagatedUserEnvPkgs = [ nmap inetutils ]; + + meta = with stdenv.lib; { + homepage = http://projects.gnome.org/gnome-network; + description = "A collection of networking tools"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix new file mode 100644 index 00000000000..eaace044af0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, exempi, libxml2 +, pkgconfig, gtk3, glib +, makeWrapper, itstool, gegl, babl, lcms2 +, desktop_file_utils, gmp, libmediaart, wrapGAppsHook +, gnome3, librsvg, gdk_pixbuf, libexif }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata + gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart + gdk_pixbuf gnome3.defaultIconTheme librsvg exempi + gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo + gnome3.gnome_online_accounts gnome3.gnome_desktop + lcms2 libexif gnome3.tracker libxml2 desktop_file_utils + wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Photos; + description = "Photos is an application to access, organize and share your photos with GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix new file mode 100644 index 00000000000..1af6b71cdb9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-photos-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-photos/3.18/gnome-photos-3.18.0.tar.xz; + sha256 = "5ca74b33de33da125059918e2d7c665ff78ac1adfbc04c98b3378e705cc73a54"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix new file mode 100644 index 00000000000..f4d2c8ad0c1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs +, libgweather, intltool, itstool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook gjs intltool itstool + libgweather gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Weather; + description = "Access current weather conditions and forecasts"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix new file mode 100644 index 00000000000..b1dc538815d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-weather-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-weather/3.18/gnome-weather-3.18.0.tar.xz; + sha256 = "fa0c098bef351af7457abf0ef6bd0afb62d727f041a15107e02693c9c7bd48aa"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix new file mode 100644 index 00000000000..093900dcb7a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool +, gobjectIntrospection, makeWrapper }: + +stdenv.mkDerivation rec { + name = "nautilus-sendto-${version}"; + + version = "3.8.1"; + + src = fetchurl { + url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; + sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; + }; + + buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; + + meta = with stdenv.lib; { + description = "Integrates Evolution and Pidgin into the Nautilus file manager"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.18/apps/polari/default.nix new file mode 100644 index 00000000000..8efaa4e4aac --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/polari/default.nix @@ -0,0 +1,22 @@ +{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme +, telepathy_glib, gjs, itstool, telepathy_idle +, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ telepathy_idle ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook + telepathy_glib gjs gdk_pixbuf librsvg ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Polari; + description = "IRC chat client designed to integrate with the GNOME desktop"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix new file mode 100644 index 00000000000..9d7497b61c7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "polari-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/polari/3.18/polari-3.18.0.tar.xz; + sha256 = "7b98c820a1e9a25a0f3a927e8d4ba8400296041f783301a764e37840c7ef6018"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix new file mode 100644 index 00000000000..3b78babadd9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix @@ -0,0 +1,35 @@ +{ stdenv, intltool, fetchurl, vala +, pkgconfig, gtk3, glib +, makeWrapper, itstool, gnupg, libsoup +, gnome3, librsvg, gdk_pixbuf, gpgme +, libsecret, avahi, p11_kit, openssh }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr + gnome3.gsettings_desktop_schemas makeWrapper gnupg + gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme + libsecret avahi libsoup p11_kit vala gnome3.gcr + openssh ]; + + preFixup = '' + wrapProgram "$out/bin/seahorse" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Seahorse; + description = "Application for managing encryption keys and passwords in the GnomeKeyring"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix new file mode 100644 index 00000000000..1d790c81e4f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "seahorse-3.16.0"; + + src = fetchurl { + url = mirror://gnome/sources/seahorse/3.16/seahorse-3.16.0.tar.xz; + sha256 = "770a5f03b8745054ef04cef9923dd713b1fbf309169150bc8dd32d7e5f7ee131"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix new file mode 100644 index 00000000000..8b8b6248642 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool +, libsecret, itstool, makeWrapper, librsvg }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret + itstool makeWrapper gnome3.defaultIconTheme librsvg ]; + + preFixup = '' + wrapProgram "$out/bin/vinagre" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Vinagre; + description = "Remote desktop viewer for GNOME"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix new file mode 100644 index 00000000000..94b6d8a83e1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "vinagre-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/vinagre/3.18/vinagre-3.18.0.tar.xz; + sha256 = "77214384c03df985551a5094ea16fd3f42b74c708123128b29baff6458b2fef9"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix new file mode 100644 index 00000000000..3c3a05dc3af --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # For convenience, we can specify adwaita-icon-theme only in packages + propagatedBuildInputs = [ hicolor_icon_theme ]; + + buildInputs = [ gdk_pixbuf librsvg ]; + + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + + # remove a tree of dirs with no files within + postInstall = '' rm -rf "$out/locale" ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix new file mode 100644 index 00000000000..59fc291eb4e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "adwaita-icon-theme-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/adwaita-icon-theme/3.18/adwaita-icon-theme-3.18.0.tar.xz; + sha256 = "5e9ce726001fdd8ee93c394fdc3cdb9e1603bbed5b7c62df453ccf521ec50e58"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix new file mode 100644 index 00000000000..2ff85662bbb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix @@ -0,0 +1,32 @@ +{ stdenv, intltool, fetchurl, vala, libgtop +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + preFixup = '' + wrapProgram "$out/bin/baobab" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Baobab; + description = "Graphical application to analyse disk usage in any Gnome environment"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix new file mode 100644 index 00000000000..5032262f278 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "baobab-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/baobab/3.18/baobab-3.18.0.tar.xz; + sha256 = "75924c53dd0e94d97c2f0ec30270fa3ffc59adfab7e21aac3ed9c6c088760b5a"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.18/core/caribou/default.nix new file mode 100644 index 00000000000..c2cb6a661ab --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/caribou/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }: + +let + majorVersion = "0.4"; +in +stdenv.mkDerivation rec { + name = "caribou-${majorVersion}.18.1"; + + src = fetchurl { + url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; + sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf"; + }; + + buildInputs = with gnome3; + [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x + pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; + + propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + + preBuild = '' + patchShebangs . + substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix new file mode 100644 index 00000000000..5b2b055fe66 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; + + preFixup = '' + wrapProgram "$out/bin/dconf-editor" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix new file mode 100644 index 00000000000..eb15838bb48 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "dconf-editor-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/dconf-editor/3.18/dconf-editor-3.18.0.tar.xz; + sha256 = "6579b8b216b068acae7d8301b5e2d57054c85a3f147c92355ffa46a62c052534"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.18/core/dconf/default.nix new file mode 100644 index 00000000000..990e2007a23 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/dconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: + +let + majorVersion = "0.24"; +in +stdenv.mkDerivation rec { + name = "dconf-${version}"; + version = "${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; + sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2"; + }; + + buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + intltool docbook_xsl docbook_xsl_ns makeWrapper ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix new file mode 100644 index 00000000000..4c42c6c026d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix @@ -0,0 +1,57 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, gnome3, gdk_pixbuf +, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream +, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts +, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control +, telepathy_logger, libnotify, clutter, libsoup, gnutls +, evolution_data_server +, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info +, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: + +# TODO: enable more features + +let + majorVersion = "3.12"; +in +stdenv.mkDerivation rec { + name = "empathy-${majorVersion}.8"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; + sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard + gnome_online_accounts shared_mime_info ]; + propagatedBuildInputs = [ folks telepathy_logger evolution_data_server + telepathy_mission_control ]; + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + libxml2 libxslt icu file makeWrapper + telepathy_glib clutter_gtk clutter-gst cogl + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf + libnotify clutter libsoup gnutls libgee p11_kit + libcanberra_gtk3 telepathy_farstream farstream + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + file libtool librsvg ]; + + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" + "-I${dbus_libs}/include/dbus-1.0" + "-I${dbus_libs}/lib/dbus-1.0/include" ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Empathy; + description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; + maintainers = gnome3.maintainers; + # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/default.nix b/pkgs/desktops/gnome-3/3.18/core/eog/default.nix new file mode 100644 index 00000000000..fff901142dc --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/eog/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 +, shared_mime_info, makeWrapper, librsvg, libexif }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; + [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg + gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif ]; + + preFixup = '' + wrapProgram "$out/bin/eog" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.adwaita-icon-theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + platforms = platforms.linux; + description = "GNOME image viewer"; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix new file mode 100644 index 00000000000..154a02d7b43 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "eog-3.16.3"; + + src = fetchurl { + url = mirror://gnome/sources/eog/3.16/eog-3.16.3.tar.xz; + sha256 = "ee6d101f8e73aacc8d48256f06a780c6d0d5f3975990f375f58cd0e70816b766"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix new file mode 100644 index 00000000000..5a98770b663 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix @@ -0,0 +1,42 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu +, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool +, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, sqlite, gcr, avahi, nss, isocodes, itstool, file, which +, gdk_pixbuf, librsvg, gnome_common }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # Tests need an X display + configureFlags = [ "--disable-static --disable-tests" ]; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ pkgconfig file ]; + + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + webkitgtk libsoup libsecret gnome_desktop libnotify libtool + sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools + gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common + gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Epiphany; + description = "WebKit based web browser for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch new file mode 100644 index 00000000000..89e3694a02d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch @@ -0,0 +1,10 @@ +--- configure.ac.orig 2015-04-08 18:53:52.284580835 +0200 ++++ configure.ac 2015-04-08 18:55:55.697225280 +0200 +@@ -113,6 +113,7 @@ + PKG_CHECK_MODULES(WEB_EXTENSION, [ + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED ++ libxml-2.0 >= $LIBXML_REQUIRED + ]) + AC_SUBST(WEB_EXTENSION_CFLAGS) + AC_SUBST(WEB_EXTENSION_LIBS) diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix new file mode 100644 index 00000000000..2ecf2c98d19 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "epiphany-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/epiphany/3.18/epiphany-3.18.0.tar.xz; + sha256 = "d5ba67a8cd85c80b81e076862bcab3fc376ba51b0a1536ca7430608d1f50491d"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix new file mode 100644 index 00000000000..154182eef88 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -0,0 +1,64 @@ +{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 +, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 +, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper +, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number +, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig intltool perl perlXMLParser libxml2 + glib gtk3 pango atk gdk_pixbuf gobjectIntrospection + itstool gnome3.adwaita-icon-theme + gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + poppler ghostscriptX djvulibre libspectre + makeWrapper libsecret librsvg gnome3.adwaita-icon-theme + ]; + + configureFlags = [ + "--disable-nautilus" # Do not use nautilus + "--enable-introspection" + ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + preConfigure = with stdenv.lib; + optionalString doCheck '' + for file in test/*.py; do + echo "patching $file" + sed '1s,/usr,${python},' -i "$file" + done + '' + optionalString (recentListSize != null) '' + sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c + sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c + ''; + + preFixup = '' + # Tell Glib/GIO about the MIME info directory, which is used + # by `g_file_info_get_content_type ()'. + wrapProgram "$out/bin/evince" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + + ''; + + doCheck = false; # would need pythonPackages.dogTail, which is missing + + meta = with stdenv.lib; { + homepage = http://www.gnome.org/projects/evince/; + description = "GNOME's document viewer"; + + longDescription = '' + Evince is a document viewer for multiple document formats. It + currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal + of Evince is to replace the multiple document viewers that exist + on the GNOME Desktop with a single simple application. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/src.nix b/pkgs/desktops/gnome-3/3.18/core/evince/src.nix new file mode 100644 index 00000000000..392aeefb4e9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/evince/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evince-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/evince/3.18/evince-3.18.0.tar.xz; + sha256 = "96e8351f6a6fc5823bb8f51178cde1182bd66481af6fb09bf58a18b673cafa70"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix new file mode 100644 index 00000000000..fb3c8bdceab --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, python +, intltool, libsoup, libxml2, libsecret, icu, sqlite +, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts + gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] + ++ stdenv.lib.optional valaSupport vala; + + propagatedBuildInputs = [ libsecret nss nspr libical db ]; + + # uoa irrelevant for now + configureFlags = [ "--disable-uoa" ] + ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; + + preFixup = '' + for f in "$out/libexec/"*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix new file mode 100644 index 00000000000..876b2236ef5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evolution-data-server-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.0.tar.xz; + sha256 = "ca4273b888912cadc474c1c2aebd2f02639381a9ddfa516a46cf9abd3dbc11f7"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix new file mode 100644 index 00000000000..6e200bdb318 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool +, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, telepathy_glib, evolution_data_server, libsecret, db }: + +# TODO: enable more folks backends + +let + majorVersion = "0.11"; +in +stdenv.mkDerivation rec { + name = "folks-${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; + sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz"; + }; + + propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; + # dbus_daemon needed for tests + buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + vala libsecret libxml2 libsoup nspr nss intltool db ]; + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = "--disable-fatal-warnings"; + + NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" + "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + + enableParallelBuilding = true; + + postBuild = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "Folks"; + + homepage = https://wiki.gnome.org/Projects/Folks; + + license = stdenv.lib.licenses.lgpl2Plus; + + maintainers = gnome3.maintainers; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.18/core/gconf/default.nix new file mode 100644 index 00000000000..a4cb3e8c146 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gconf/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 +, intltool, polkit, orbit, withGtk ? false }: + +assert withGtk -> (gnome3 != null); + +stdenv.mkDerivation rec { + + versionMajor = "3.2"; + versionMinor = "6"; + moduleName = "GConf"; + + origName = "${moduleName}-${versionMajor}.${versionMinor}"; + + name = "gconf-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; + sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; + }; + + buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; + propagatedBuildInputs = [ glib dbus_glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + # ToDo: ldap reported as not found but afterwards reported as supported + + meta = with stdenv.lib; { + homepage = http://projects.gnome.org/gconf/; + description = "A system for storing application preferences"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.18/core/gcr/default.nix new file mode 100644 index 00000000000..e0e8d1e7338 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gcr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib +, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig intltool gnupg glib gobjectIntrospection libxslt + libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala + ]; + + propagatedBuildInputs = [ p11_kit ]; + + #doCheck = true; + + #enableParallelBuilding = true; issues on hydra + + preFixup = '' + wrapProgram "$out/bin/gcr-viewer" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix new file mode 100644 index 00000000000..e2b4ad195ff --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gcr-3.16.0"; + + src = fetchurl { + url = mirror://gnome/sources/gcr/3.16/gcr-3.16.0.tar.xz; + sha256 = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix new file mode 100644 index 00000000000..51b67afb01f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus +, intltool, accountsservice, libX11, gnome3, systemd, gnome_session +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gdm-${gnome3.version}.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; + sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3"; + }; + + preConfigure = '' + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' + substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' + substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' + sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in + ''; + + configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-initial-vt=10" ]; + + buildInputs = [ pkgconfig glib itstool libxml2 intltool + accountsservice gnome3.dconf systemd + gobjectIntrospection libX11 gtk + libcanberra_gtk3 pam libtool ]; + + #enableParallelBuilding = true; # problems compiling + + # Disable Access Control because our X does not support FamilyServerInterpreted yet + patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GDM; + description = "A program that manages graphical display servers and handles graphical user logins"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch new file mode 100644 index 00000000000..7691a9e86f0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch @@ -0,0 +1,15 @@ +--- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200 ++++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200 +@@ -1706,9 +1706,10 @@ + + gdm_error_trap_push (); + +- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { ++ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { + XAddHost (self->priv->x11_display, &host_entries[i]); +- } ++ }*/ ++ XDisableAccessControl(self->priv->x11_display); + + XSync (self->priv->x11_display, False); + if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch new file mode 100644 index 00000000000..b8fbad4d731 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch @@ -0,0 +1,17 @@ +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index f759d2d..d154716 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -373,9 +373,12 @@ get_system_session_dirs (void) + #ifdef ENABLE_WAYLAND_SUPPORT + DATADIR "/wayland-sessions/", + #endif ++ NULL, + NULL + }; + ++ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; ++ + return search_dirs; + } + diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch new file mode 100644 index 00000000000..b451d129391 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch @@ -0,0 +1,83 @@ +--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 ++++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 +@@ -322,7 +322,11 @@ + fallback: + #endif + +- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ if (g_getenv("GDM_X_SERVER") != NULL) { ++ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); ++ } else { ++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ } + } + + static gboolean +--- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200 ++++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200 +@@ -207,6 +207,8 @@ + char *display_fd_string = NULL; + char *vt_string = NULL; + char *display_number; ++ int nixos_argc = 0; ++ char **nixos_argv = NULL; + gsize display_number_size; + + auth_file = prepare_auth_file (); +@@ -236,7 +238,15 @@ + + display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); + +- g_ptr_array_add (arguments, X_SERVER); ++ if (g_getenv("GDM_X_SERVER") != NULL) { ++ int i = 0; ++ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL); ++ for (i = 0; i < nixos_argc; i++) { ++ g_ptr_array_add (arguments, nixos_argv[i]); ++ } ++ } else { ++ g_ptr_array_add (arguments, X_SERVER); ++ } + + if (vt_string != NULL) { + g_ptr_array_add (arguments, vt_string); +@@ -259,12 +269,12 @@ + g_ptr_array_add (arguments, "-noreset"); + g_ptr_array_add (arguments, "-keeptty"); + +- g_ptr_array_add (arguments, "-verbose"); ++ /*g_ptr_array_add (arguments, "-verbose"); + if (state->debug_enabled) { + g_ptr_array_add (arguments, "7"); + } else { + g_ptr_array_add (arguments, "3"); +- } ++ }*/ + + if (state->debug_enabled) { + g_ptr_array_add (arguments, "-core"); +@@ -275,6 +285,9 @@ + (const char * const *) arguments->pdata, + &error); + g_free (display_fd_string); ++ if (nixos_argv) { ++ g_strfreev (nixos_argv); ++ } + g_clear_object (&launcher); + g_ptr_array_free (arguments, TRUE); + +--- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200 ++++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200 +@@ -2359,6 +2359,12 @@ + gchar *desktop_names; + const char *locale; + ++ if (g_getenv ("GDM_X_SERVER") != NULL) { ++ gdm_session_set_environment_variable (self, ++ "GDM_X_SERVER", ++ g_getenv ("GDM_X_SERVER")); ++ } ++ + gdm_session_set_environment_variable (self, + "GDMSESSION", + get_session_name (self)); diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix new file mode 100644 index 00000000000..1db96965131 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus +, intltool, accountsservice, libX11, gnome3, systemd, gnome_session +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # Only needed to make it build + preConfigure = '' + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + ''; + + configureFlags = [ "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemd=yes" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + + buildInputs = [ pkgconfig glib itstool libxml2 intltool + accountsservice gnome3.dconf systemd + gobjectIntrospection libX11 gtk + libcanberra_gtk3 pam libtool ]; + + #enableParallelBuilding = true; # problems compiling + + preBuild = '' + substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' + ''; + + # Disable Access Control because our X does not support FamilyServerInterpreted yet + patches = [ ./xserver_path.patch ./sessions_dir.patch + ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GDM; + description = "A program that manages graphical display servers and handles graphical user logins"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch new file mode 100644 index 00000000000..e100e013b78 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch @@ -0,0 +1,13 @@ +--- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200 ++++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200 +@@ -369,8 +369,9 @@ + gdm_error_trap_push (); + + for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { +- XAddHost (slave->priv->server_display, &host_entries[i]); ++ //XAddHost (slave->priv->server_display, &host_entries[i]); + } ++ XDisableAccessControl(slave->priv->server_display); + + XSync (slave->priv->server_display, False); + if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch new file mode 100644 index 00000000000..c87554078c7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch @@ -0,0 +1,20 @@ +--- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000 ++++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000 +@@ -48,8 +48,6 @@ + #include "gdm-session-enum-types.h" + #include "gdm-launch-environment.h" + +-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session" +- + extern char **environ; + + #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate)) +@@ -512,7 +510,7 @@ + gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command); + } else { + /* wrap it in dbus-launch */ +- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command); ++ char *command = g_strdup (launch_environment->priv->command); + + gdm_session_select_program (launch_environment->priv->session, command); + g_free (command); diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch new file mode 100644 index 00000000000..b8fbad4d731 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch @@ -0,0 +1,17 @@ +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index f759d2d..d154716 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -373,9 +373,12 @@ get_system_session_dirs (void) + #ifdef ENABLE_WAYLAND_SUPPORT + DATADIR "/wayland-sessions/", + #endif ++ NULL, + NULL + }; + ++ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; ++ + return search_dirs; + } + diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/src.nix new file mode 100644 index 00000000000..acd46534e14 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gdm-3.14.2"; + + src = fetchurl { + url = mirror://gnome/sources/gdm/3.14/gdm-3.14.2.tar.xz; + sha256 = "e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch new file mode 100644 index 00000000000..412daee9f27 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch @@ -0,0 +1,15 @@ +--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 ++++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 +@@ -322,7 +322,11 @@ + fallback: + #endif + +- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ if (g_getenv("GDM_X_SERVER") != NULL) { ++ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); ++ } else { ++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ } + } + + static gboolean diff --git a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix new file mode 100644 index 00000000000..4d75bdc4996 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix @@ -0,0 +1,14 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; + [ intltool pkgconfig glib libsoup json_glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix new file mode 100644 index 00000000000..faaadf5bb91 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "geocode-glib-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.0.tar.xz; + sha256 = "8fb7f0d569e3e6696aaa1fdf275cb3094527ec5e9fa36fd88dd633dfec63495d"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix new file mode 100644 index 00000000000..792e34c7b14 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection +, spidermonkey_24, pango, readline, glib, libxml2 }: + +let + majorVersion = "1.43"; +in +stdenv.mkDerivation rec { + name = "gjs-${majorVersion}.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz"; + sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2"; + }; + + buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ]; + + propagatedBuildInputs = [ spidermonkey_24 ]; + + postInstall = '' + sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la + ''; + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix new file mode 100644 index 00000000000..32d6d6e7535 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix new file mode 100644 index 00000000000..b191826a2d0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-backgrounds-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-backgrounds/3.18/gnome-backgrounds-3.18.0.tar.xz; + sha256 = "aa560f0e5f12a308dd36aaac2fff32916abd61d42f47b4bc42c8c7011bf2a7b9"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix new file mode 100644 index 00000000000..7fae0b5c67f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib +, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme + makeWrapper gnome3.gsettings_desktop_schemas itstool + libnotify libcanberra_gtk3 ]; + + preFixup = '' + wrapProgram "$out/bin/bluetooth-sendto" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; + description = "Application that let you manage Bluetooth in the GNOME destkop"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix new file mode 100644 index 00000000000..eb5f6149976 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-bluetooth-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.0.tar.xz; + sha256 = "f5c0d43226c4ec6a545dddb86181adadbc2b5cf720b640026003b9660fba0b8f"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix new file mode 100644 index 00000000000..7ca66863d86 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix @@ -0,0 +1,30 @@ +{ stdenv, intltool, fetchurl, pkgconfig, libxml2 +, bash, gtk3, glib, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + libxml2 gnome3.gtksourceview mpfr gmp + gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-calculator" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/Calculator; + description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix new file mode 100644 index 00000000000..42fc4667087 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-calculator-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.0.tar.xz; + sha256 = "54dc40de68b118c06b443f9d8a56397425434a45dddbb2daba7b720b77b35672"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix new file mode 100644 index 00000000000..f9261e183ef --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, which, gnome3, autoconf, automake }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + patches = [(fetchurl { + name = "gnome-common-patch"; + url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; + sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; + })]; + + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix new file mode 100644 index 00000000000..8ffe7e20e1a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-common-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix new file mode 100644 index 00000000000..6ec3c7871bb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix @@ -0,0 +1,47 @@ +{ stdenv, intltool, fetchurl, evolution_data_server, db +, pkgconfig, gtk3, glib, libsecret +, libchamplain, clutter_gtk, geocode_glib +, bash, makeWrapper, itstool, folks, libnotify, libxml2 +, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss +, libsoup, vala, dbus_glib, automake115x, autoconf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; + + # force build from vala + preBuild = '' + touch src/*.vala + ''; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server + gnome3.gsettings_desktop_schemas makeWrapper file libnotify + folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib + libxml2 libsoup gnome3.gnome_online_accounts nspr nss + gdk_pixbuf gnome3.defaultIconTheme librsvg + libchamplain clutter_gtk geocode_glib + vala automake115x autoconf db ]; + + preFixup = '' + for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + patches = [ ./gio_unix.patch ]; + + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Contacts; + description = "Contacts is GNOME's integrated address book"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch new file mode 100644 index 00000000000..f1b3d3c94ac --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch @@ -0,0 +1,10 @@ +--- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 ++++ configure.ac 2015-04-09 18:45:59.744280137 +0200 +@@ -54,6 +54,7 @@ + champlain-0.12 + clutter-gtk-1.0 + geocode-glib-1.0 >= 3.15.3 ++ gio-unix-2.0 + " + PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) + diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix new file mode 100644 index 00000000000..94fcfb85fdf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-contacts-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-contacts/3.18/gnome-contacts-3.18.0.tar.xz; + sha256 = "c81ad739a1f554e4c89979564565e32ceaf1d2cc6c93a6a75d929d7d1fe8e287"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix new file mode 100644 index 00000000000..e7ed0c6bade --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix @@ -0,0 +1,59 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper +, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, gdk_pixbuf, librsvg, libxkbfile, libnotify +, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk +, cracklib, python, libkrb5, networkmanagerapplet, networkmanager +, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev +, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk +, fontconfig, sound-theme-freedesktop }: + +# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules +# TODO: bluetooth, wacom, printers + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = + [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; + + # https://bugzilla.gnome.org/show_bug.cgi?id=752596 + enableParallelBuilding = false; + + buildInputs = with gnome3; + [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas + libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus + gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo + gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk + gnome3.vino udev libcanberra_gtk3 + networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ]; + + preBuild = '' + substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" + substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" + + # hack to make test-endianess happy + mkdir -p $out/share/locale + substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" + ''; + + patches = [ ./vpn_plugins_path.patch ]; + + preFixup = with gnome3; '' + wrapProgram $out/bin/gnome-control-center \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + for i in $out/share/applications/*; do + substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" + done + ''; + + meta = with stdenv.lib; { + description = "Utilities to configure the GNOME desktop"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix new file mode 100644 index 00000000000..f87859fe51f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-control-center-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-control-center/3.18/gnome-control-center-3.18.0.tar.xz; + sha256 = "42648eda11fc1df0f717d7d3b385cb7c519fdd084ed4e3fad2e55fd11712fb52"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch new file mode 100644 index 00000000000..e25105a303f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch @@ -0,0 +1,19 @@ +diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c +index 7dc23c2..fcb1384 100644 +--- a/panels/network/connection-editor/vpn-helpers.c ++++ b/panels/network/connection-editor/vpn-helpers.c +@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) + if (!so_path) + goto next; + +- /* Remove any path and extension components, then reconstruct path +- * to the SO in LIBDIR +- */ +- so_name = g_path_get_basename (so_path); +- g_free (so_path); +- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); +- g_free (so_name); +- + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!module) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix new file mode 100644 index 00000000000..bf0ccd0224e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib +, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland +, gobjectIntrospection }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # this should probably be setuphook for glib + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 + xkeyboard_config isocodes itstool wayland + gtk3 glib intltool gnome_doc_utils libxkbfile + gobjectIntrospection ]; + + propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix new file mode 100644 index 00000000000..84fbb8ebdff --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-desktop-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-desktop/3.18/gnome-desktop-3.18.0.tar.xz; + sha256 = "44c806b16ea7d38bdc0e6343f2cb6be97afd7f64490f30c0cb5c3373e89a9d44"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix new file mode 100644 index 00000000000..1d1f9d18c56 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix @@ -0,0 +1,32 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-dictionary" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Dictionary; + description = "Dictionary is the GNOME application to look up definitions"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix new file mode 100644 index 00000000000..9e3660f207b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-dictionary-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.0.tar.xz; + sha256 = "5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix new file mode 100644 index 00000000000..3f9f653bdba --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix @@ -0,0 +1,35 @@ +{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +, bash, gtk3, glib, makeWrapper, cracklib, libnotify +, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python +, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + libxslt libtool libsecret libpwquality cracklib + libnotify libdvdread libcanberra_gtk3 docbook_xsl + gdk_pixbuf gnome3.defaultIconTheme + librsvg udisks2 gnome3.gnome_settings_daemon + gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-disks" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = http://en.wikipedia.org/wiki/GNOME_Disks; + description = "A udisks graphical front-end"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix new file mode 100644 index 00000000000..29589586625 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-disk-utility-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-disk-utility/3.18/gnome-disk-utility-3.18.0.tar.xz; + sha256 = "e7363107e40fb1e7fb9f65e37194c0e8da3928f9ec35a4b27a5c439c64e51686"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix new file mode 100644 index 00000000000..54767dbc4c5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool +, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop + gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-font-viewer" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Program that can preview fonts and create thumbnails for fonts"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix new file mode 100644 index 00000000000..256890e8079 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-font-viewer-3.16.2"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-font-viewer/3.16/gnome-font-viewer-3.16.2.tar.xz; + sha256 = "f5367417d926d1dbe175aceb8eb4d2733d723a237428f130edd4b4023c0dc1cf"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix new file mode 100644 index 00000000000..8e755383dd6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper +, docbook_xsl_ns, docbook_xsl, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; [ + dbus libgcrypt pam python gtk3 gconf libgnome_keyring + pango gcr gdk_pixbuf atk p11_kit makeWrapper + ]; + + propagatedBuildInputs = [ glib libtasn1 libxslt ]; + + nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; + + configureFlags = [ + "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" # NixOS hardcoded path + "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=$$out/lib/pkcs11/" + ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-keyring" \ + --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + wrapProgram "$out/bin/gnome-keyring-daemon" \ + --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix new file mode 100644 index 00000000000..ccd1488fd30 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-keyring-3.16.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-keyring/3.16/gnome-keyring-3.16.0.tar.xz; + sha256 = "15a3bb8c53855a4ff0dbbdfbe4ec3df206c32048f50bdc76a51f8e3e14ece1f5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix new file mode 100644 index 00000000000..90209634fbf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gnome-menus-${version}"; + version = "3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; + sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; + }; + + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + + buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; + + meta = { + homepage = "http://www.gnome.org"; + description = "Gnome menu specification"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix new file mode 100644 index 00000000000..d810fbb862b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper +, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common +, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook +, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + + enableParallelBuilding = true; + + preAutoreconf = '' + sed '/disable-settings/d' -i configure.ac + sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am + ''; + + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper + libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook + docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; + + preFixup = '' + for f in "$out/libexec/"*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix new file mode 100644 index 00000000000..3038209042e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-online-accounts-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-online-accounts/3.18/gnome-online-accounts-3.18.0.tar.xz; + sha256 = "fc2dac96551746576759bd14f9b322bae1dd0aeedc0e755065ddf5eaaefacd34"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix new file mode 100644 index 00000000000..4c879b75098 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 +, libsoup, json_glib, gmp, openssl, makeWrapper }: + +let + majVer = "3.14"; +in stdenv.mkDerivation rec { + name = "gnome-online-miners-${majVer}.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz"; + sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl"; + }; + + doCheck = true; + + buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl + gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins + gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart + gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; + + enableParallelBuilding = true; + + preFixup = '' + for f in $out/libexec/*; do + wrapProgram "$f" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; + description = "A set of crawlers that go through your online content and index them locally in Tracker"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix new file mode 100644 index 00000000000..763fc990bda --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 +, bash, gtk3, glib, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-screenshot" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; + description = "Utility used in the GNOME desktop environment for taking screenshots"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix new file mode 100644 index 00000000000..af6007fa233 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-screenshot-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-screenshot/3.18/gnome-screenshot-3.18.0.tar.xz; + sha256 = "eba64dbf4acf0ab8222fec549d0a4f2dd7dbd51c255e7978dedf1f5c06a98841"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix new file mode 100644 index 00000000000..dedad0729d1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower +, libxslt, intltool, makeWrapper, systemd, xorg }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = "--enable-systemd"; + + buildInputs = with gnome3; + [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt + gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme + gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-session" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix new file mode 100644 index 00000000000..211cc140a88 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-session-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-session/3.18/gnome-session-3.18.0.tar.xz; + sha256 = "ba23d0e41e90f238103835603eded0f30a7cc56506b68168899377785aec706f"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix new file mode 100644 index 00000000000..18a6bdf43bf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager +, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager + libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio + libcanberra_gtk3 upower colord libgweather xkeyboard_config + polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; + + preFixup = '' + wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PATH : "${glib}/bin" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix new file mode 100644 index 00000000000..d7b459ae0ea --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-settings-daemon-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-settings-daemon/3.18/gnome-settings-daemon-3.18.0.tar.xz; + sha256 = "8d3ef9c18538831ed89122fee0bdaca68b0e482a18b3c4388c4e672aba1b3cd5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix new file mode 100644 index 00000000000..e9eae87f14e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix @@ -0,0 +1,19 @@ +{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, gnome3, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool + makeWrapper file ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; + description = "Modify and extend GNOME Shell functionality and behavior"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix new file mode 100644 index 00000000000..ed51bc4b200 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-shell-extensions-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-shell-extensions/3.18/gnome-shell-extensions-3.18.0.tar.xz; + sha256 = "a5fb88004b021e4a16f4fa5eb3d7d6f0903db1288023c18c0f9825152fa0f5f7"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix new file mode 100644 index 00000000000..899efc5443b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix @@ -0,0 +1,57 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret +, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core +, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip +, sqlite, libgweather, libcanberra_gtk3 +, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: + +# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # Needed to find /etc/NetworkManager/VPN + configureFlags = [ "--sysconfdir=/etc" ]; + + buildInputs = with gnome3; + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice + libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg + clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns + libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm + libcanberra_gtk3 gnome_control_center + defaultIconTheme sqlite gnome3.gnome-bluetooth + libgweather # not declared at build time, but typelib is needed at runtime + gnome3.gnome-clocks # schemas needed + at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; + + installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; + + preBuild = '' + patchShebangs src/data-to-c.pl + substituteInPlace data/Makefile --replace " install-keysDATA" "" + ''; + + preFixup = with gnome3; '' + wrapProgram "$out/bin/gnome-shell" \ + --prefix PATH : "${unzip}/bin" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + + wrapProgram "$out/libexec/gnome-shell-calendar-server" \ + --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + + echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path + ''; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + }; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix new file mode 100644 index 00000000000..340a2e67252 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-shell-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-shell/3.18/gnome-shell-3.18.0.tar.xz; + sha256 = "1f0f276c45c0979c72700121cb0f711aea343c4393eb3d5ddd6b311d8dc83c99"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix new file mode 100644 index 00000000000..716f92a072d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix @@ -0,0 +1,36 @@ +{ stdenv, intltool, fetchurl, pkgconfig +, bash, gtk3, glib, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: + +stdenv.mkDerivation rec { + name = "gnome-system-log-3.9.90"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; + sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; + }; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-system-log" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-system-log/3.9/; + description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix new file mode 100644 index 00000000000..bdbdefecf22 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix @@ -0,0 +1,32 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 +, bash, gtk3, glib, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 + gtkmm3 libgtop makeWrapper + gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gsettings_desktop_schemas ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-system-monitor" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; + description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix new file mode 100644 index 00000000000..a4c87752e78 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-system-monitor-3.18.0.1"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-system-monitor/3.18/gnome-system-monitor-3.18.0.1.tar.xz; + sha256 = "71ff8db2fa3eb53d8f54ffd612c6679b231a9d69c13adb91cf63421425953b10"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix new file mode 100644 index 00000000000..3bbb25ca5c1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, libuuid, vala +, desktop_file_utils, itstool, makeWrapper, appdata-tools }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools + gnome3.dconf itstool makeWrapper gnome3.nautilus vala ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; + + # FIXME: enable for gnome3 + configureFlags = [ "--disable-search-provider" "--disable-migration" ]; + + preFixup = '' + for f in "$out/libexec/gnome-terminal-server"; do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + done + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix new file mode 100644 index 00000000000..dff213cc389 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-terminal-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-terminal/3.18/gnome-terminal-3.18.0.tar.xz; + sha256 = "776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix new file mode 100644 index 00000000000..a33252a934c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf + gnome3.defaultIconTheme ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix new file mode 100644 index 00000000000..c352242537a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-themes-standard-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-themes-standard/3.18/gnome-themes-standard-3.18.0.tar.xz; + sha256 = "e646eb04c225282b7df7fff65741adaad4cf9ed2c12616b7310e7edd27d2bacb"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix new file mode 100644 index 00000000000..4f02673e036 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; + + meta = with stdenv.lib; { + homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; + description = "User and system administration help for the GNOME desktop"; + maintainers = gnome3.maintainers; + license = licenses.cc-by-30; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix new file mode 100644 index 00000000000..0187516061b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-user-docs-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-user-docs/3.18/gnome-user-docs-3.18.0.tar.xz; + sha256 = "c515d2c8b051ffb05ec497e4231d1ceecec824dc4fca45425d21295bb592e952"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix new file mode 100644 index 00000000000..49ad40912c6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix @@ -0,0 +1,45 @@ +{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus +, pkgconfig, gtk3, glib, libxml2, gnused +, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd +, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + preConfigure = '' + sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf + ''; + + configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2}/modules" + "--disable-bluetooth" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg + nautilus libnotify libcanberra_gtk3 ]; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name + ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + ''; + + preFixup = '' + wrapProgram "$out/libexec/gnome-user-share-webdav" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-user-share/3.8; + description = "Service that exports the contents of the Public folder in your home directory on the local network"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix new file mode 100644 index 00000000000..e0a283d896d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-user-share-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.0.tar.xz; + sha256 = "feb3bed59193eafea31f563ed7eab5f066aa5f86d4a89f067b162653d168d3fc"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix new file mode 100644 index 00000000000..a236238c257 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av +, gmime, json_glib, avahi, tracker, itstool }: + +stdenv.mkDerivation rec { + name = "grilo-plugins-0.2.13"; + + src = fetchurl { + url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; + sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; + }; + + installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; + + buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts + gnome3.totem-pl-parser gnome3.rest gmime json_glib + avahi gnome3.libmediaart tracker intltool itstool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + description = "A collection of plugins for the Grilo framework"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix new file mode 100644 index 00000000000..16dfb638a24 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib +, libxml2, gnome3, gobjectIntrospection, libsoup }: + +stdenv.mkDerivation rec { + name = "grilo-0.2.12"; + + src = fetchurl { + url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; + sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m"; + }; + + setupHook = ./setup-hook.sh; + + configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; + + preConfigure = '' + for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do + substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" + substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" + done + ''; + + buildInputs = [ pkgconfig file intltool glib libxml2 libsoup + gnome3.totem-pl-parser gobjectIntrospection ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Grilo; + description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh new file mode 100644 index 00000000000..bc93dddec38 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh @@ -0,0 +1,7 @@ +make_grilo_find_plugins() { + if [ -d "$1"/lib/grilo-0.2 ]; then + addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2" + fi +} + +envHooks+=(make_grilo_find_plugins) diff --git a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix new file mode 100644 index 00000000000..5123cadbdaf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection + # just for passthru +, gnome3, gtk3, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + postPatch = '' + for file in "background" "screensaver"; do + substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ + --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" + done + ''; + + buildInputs = [ glib gobjectIntrospection ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix new file mode 100644 index 00000000000..047f014d2af --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gsettings-desktop-schemas-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gsettings-desktop-schemas/3.18/gsettings-desktop-schemas-3.18.0.tar.xz; + sha256 = "ba27337226a96d83f385c0ad192fdfe561c7e7882c61bb326c571be24e41eceb"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.18/core/gsound/default.nix new file mode 100644 index 00000000000..5f255743313 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gsound/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: + +let + majVer = "1.0"; +in stdenv.mkDerivation rec { + name = "gsound-${majVer}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; + sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; + }; + + buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GSound; + description = "Small library for playing system sounds"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix new file mode 100644 index 00000000000..ea95e39e5b2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango +, libxml2Python, perl, intltool, gettext, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedBuildInputs = [ gtk3 ]; + + buildInputs = [ pkgconfig atk cairo glib pango + libxml2Python perl intltool gettext ]; + + preBuild = '' + substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" + ''; + + patches = [ ./nix_share_path.patch ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch new file mode 100644 index 00000000000..c87350167c2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch @@ -0,0 +1,11 @@ +--- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 ++++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 +@@ -68,6 +68,8 @@ + basename, + NULL)); + ++ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); ++ + g_ptr_array_add (dirs, NULL); + + return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix new file mode 100644 index 00000000000..5bbd2c42474 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtksourceview-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.0.tar.xz; + sha256 = "54b111264e6985e26a878dec88ff94fd0a9ae0dc4cfcdf08f4a6b5f655d4b693"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix new file mode 100644 index 00000000000..a43d3c570ce --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix @@ -0,0 +1,33 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3 +, glib, desktop_file_utils, bash, appdata-tools +, makeWrapper, gnome3, file, itstool, libxml2 }: + +# TODO: icons and theme still does not work +# use packaged gnome3.adwaita-icon-theme + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools + gnome3.yelp_tools libxml2 file desktop_file_utils + gnome3.gsettings_desktop_schemas makeWrapper ]; + + preFixup = '' + wrapProgram "$out/bin/gucharmap" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Gucharmap; + description = "GNOME Character Map, based on the Unicode Character Database"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix new file mode 100644 index 00000000000..01eca1e367b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gucharmap-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.0.tar.xz; + sha256 = "121d2652f59a26c9426c96e7c6ca73295c45b675dd4ef0ccdb1b50bc0b4f3830"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix new file mode 100644 index 00000000000..e8ddf7096e6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, glib }: + +stdenv.mkDerivation rec { + name = "libcroco-0.6.8"; + + src = fetchurl { + url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; + sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; + }; + + outputs = [ "out" "doc" ]; + + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + buildInputs = [ pkgconfig libxml2 glib ]; + + meta = with stdenv.lib; { + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix new file mode 100644 index 00000000000..bedbbee2dfe --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib +, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: + +let + majorVersion = "0.16"; +in +stdenv.mkDerivation rec { + name = "libgdata-${majorVersion}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; + sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827"; + }; + + # TODO: need libuhttpmock + configureFlags = "--disable-tests"; + + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; + + buildInputs = with gnome3; + [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection + liboauth gcr gnome_online_accounts p11_kit openssl ]; + + propagatedBuildInputs = [ json_glib ]; + + meta = with stdenv.lib; { + description = "GData API library"; + maintainers = with maintainers; [ raskin lethalman ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgee/default.nix new file mode 100644 index 00000000000..4ff13295031 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgee/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: +let + ver_maj = "0.16"; + ver_min = "1"; +in +stdenv.mkDerivation rec { + name = "libgee-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5"; + }; + + doCheck = true; + + patches = [ ./fix_introspection_paths.patch ]; + + buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch new file mode 100644 index 00000000000..67003f45164 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch @@ -0,0 +1,13 @@ +--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 ++++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 +@@ -12085,8 +12085,8 @@ + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" ++ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix new file mode 100644 index 00000000000..c6c9323c010 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "libgnome-keyring-3.12.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; + sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; + }; + + propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = { + description = "Framework for managing passwords and other secrets"; + homepage = http://live.gnome.org/GnomeKeyring; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + inherit (glib.meta) platforms maintainers; + + longDescription = '' + gnome-keyring is a program that keeps password and other secrets for + users. The library libgnome-keyring is used by applications to integrate + with the gnome-keyring system. + ''; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix new file mode 100644 index 00000000000..4939a4ff728 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: + +stdenv.mkDerivation rec { + name = "libgnomekbd-3.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; + sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; + }; + + buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/gkbd-keyboard-display \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Keyboard management library"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix new file mode 100644 index 00000000000..79ede15df8f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf +, pango, gdk_pixbuf, atk, tzdata, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; + propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix new file mode 100644 index 00000000000..da56dc3361a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "libgweather-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/libgweather/3.18/libgweather-3.18.0.tar.xz; + sha256 = "8f4fda67f48c776f2bf955d384de4cc842aacb8d9b2ad87b42d83d0dc5a1cb1f"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix new file mode 100644 index 00000000000..72d307f4f1a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff +, openssl, bzip2, acl, attr +}: + +stdenv.mkDerivation rec { + name = "libgxps-0.2.2"; + + src = fetchurl { + url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; + sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; + }; + + buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; + + configureFlags = "--without-liblcms2"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix new file mode 100644 index 00000000000..8d40d977a80 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +, glib, gtk3, gobjectIntrospection, python, pygobject3 +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + description = "A GObject-based plugins engine"; + homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix new file mode 100644 index 00000000000..8a24097bbd6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "libpeas-1.16.0"; + + src = fetchurl { + url = mirror://gnome/sources/libpeas/1.16/libpeas-1.16.0.tar.xz; + sha256 = "b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix new file mode 100644 index 00000000000..5a8117528b6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: + +stdenv.mkDerivation rec { + name = "libzapojit-0.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; + sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; + }; + + buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix new file mode 100644 index 00000000000..dd08a96cc23 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 +, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; + + buildInputs = with gnome3; + [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower + gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra + gnome3.geocode_glib + libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; + + preFixup = '' + wrapProgram "$out/bin/mutter" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + patches = [ ./x86.patch ./math.patch ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.18/core/mutter/math.patch new file mode 100644 index 00000000000..dbdfd93f5e1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/mutter/math.patch @@ -0,0 +1,10 @@ +--- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200 ++++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200 +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + #include "meta-stage.h" + diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix new file mode 100644 index 00000000000..2f183d1a919 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "mutter-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/mutter/3.18/mutter-3.18.0.tar.xz; + sha256 = "9fb287976b9c65f0a2aca09d0e2c4c2748d3d2cfa5f38921dbeafe4cd1d541b1"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch new file mode 100644 index 00000000000..bc8829de42f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch @@ -0,0 +1,20 @@ +--- mutter-3.16.2/src/core/window.c.orig 2015-05-26 10:52:41.382834963 +0200 ++++ mutter-3.16.2/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 +@@ -3499,7 +3499,7 @@ + + static MetaMonitorInfo * + find_monitor_by_winsys_id (MetaWindow *window, +- guint winsys_id) ++ gint winsys_id) + { + int i; + +@@ -3618,7 +3618,7 @@ + */ + + gboolean did_placement; +- guint old_output_winsys_id; ++ gint old_output_winsys_id; + MetaRectangle unconstrained_rect; + MetaRectangle constrained_rect; + MetaMoveResizeResultFlags result = 0; diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix new file mode 100644 index 00000000000..f28e86d7bad --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif +, gtk, gnome3, libunique, intltool, gobjectIntrospection +, libnotify, makeWrapper, exempi, librsvg, tracker }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg + gnome3.gnome_desktop gnome3.adwaita-icon-theme + gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ]; + + preFixup = '' + wrapProgram "$out/bin/nautilus" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + patches = [ ./extension_dir.patch ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch new file mode 100644 index 00000000000..317b8257992 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch @@ -0,0 +1,24 @@ +diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c +index 6273a76..4adcc8a 100644 +--- a/libnautilus-private/nautilus-module.c ++++ b/libnautilus-private/nautilus-module.c +@@ -242,11 +242,17 @@ void + nautilus_module_setup (void) + { + static gboolean initialized = FALSE; ++ const gchar* extensiondir = NULL; + + if (!initialized) { + initialized = TRUE; +- +- load_module_dir (NAUTILUS_EXTENSIONDIR); ++ ++ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); ++ if (extensiondir == NULL) { ++ extensiondir = NAUTILUS_EXTENSIONDIR; ++ } ++ ++ load_module_dir (extensiondir); + + eel_debug_call_at_shutdown (free_module_objects); + } diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix new file mode 100644 index 00000000000..4e8c692bce4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "nautilus-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.0.tar.xz; + sha256 = "6914e5698c5ce865870086e4db9395d56a78eddf8002020458ce05db16a95a33"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix new file mode 100644 index 00000000000..eada9ab1993 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: + +stdenv.mkDerivation rec { + name = "rest-0.7.92"; + + src = fetchurl { + url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; + sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec"; + }; + + buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; + + configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.18/core/sushi/default.nix new file mode 100644 index 00000000000..17c37e89dec --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/sushi/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib +, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 +, gdk_pixbuf, librsvg, gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + + buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 + clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk + gnome3.evince icu makeWrapper ]; + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram $out/libexec/sushi-start \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; + description = "A quick previewer for Nautilus"; + maintainers = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.18/core/sushi/src.nix new file mode 100644 index 00000000000..5c852a0dc47 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/sushi/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "sushi-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/sushi/3.18/sushi-3.18.0.tar.xz; + sha256 = "7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix new file mode 100644 index 00000000000..63f36004bcd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: + +stdenv.mkDerivation rec { + name = "totem-pl-parser-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; + sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; + }; + + buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Videos; + description = "Simple GObject-based library to parse and save a host of playlist formats"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix new file mode 100644 index 00000000000..13665c72274 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix @@ -0,0 +1,42 @@ +{ stdenv, intltool, fetchurl, gst_all_1 +, clutter_gtk, clutter-gst, pygobject3, shared_mime_info +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, libxml2, dbus_glib +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo + clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gnome3.libpeas pygobject3 shared_mime_info dbus_glib + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop + gnome3.gsettings_desktop_schemas makeWrapper file ]; + + preFixup = '' + wrapProgram "$out/bin/totem" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Videos; + description = "Movie player for the GNOME desktop based on GStreamer"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/src.nix b/pkgs/desktops/gnome-3/3.18/core/totem/src.nix new file mode 100644 index 00000000000..92bf2c1f8a6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/totem/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "totem-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/totem/3.18/totem-3.18.0.tar.xz; + sha256 = "1b6a7e66414df4b2e2427a9c5f1fee5a5f286beb098fdbe0902e37e3663e3e89"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix new file mode 100644 index 00000000000..88e6da2ad2d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix @@ -0,0 +1,55 @@ +{ stdenv, intltool, fetchurl, libxml2, upower +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, vala, sqlite, libxslt +, gnome3, librsvg, gdk_pixbuf, file, libnotify +, evolution_data_server, gst_all_1, poppler +, icu, taglib, libjpeg, libtiff, giflib, libcue +, libvorbis, flac, exempi, networkmanager +, libpng, libexif, libgsf, libuuid, bzip2 }: + +let + majorVersion = "1.4"; +in +stdenv.mkDerivation rec { + name = "tracker-${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz"; + sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler"; + + enableParallelBuilding = true; + + buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 + bzip2 gnome3.totem-pl-parser libxslt + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite + upower libnotify evolution_data_server gnome3.libgee + gst_all_1.gstreamer gst_all_1.gst-plugins-base flac + poppler icu taglib libjpeg libtiff giflib libvorbis + exempi networkmanager libpng libexif libgsf libuuid ]; + + preConfigure = '' + substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" + ''; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tracker; + description = "Desktop-neutral user information store, search tool and indexer"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/vino/default.nix b/pkgs/desktops/gnome-3/3.18/core/vino/default.nix new file mode 100644 index 00000000000..7a015b4a010 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/vino/default.nix @@ -0,0 +1,25 @@ +{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper +, gnome3, libnotify, file, telepathy_glib, dbus_glib }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify + gnome3.defaultIconTheme dbus_glib telepathy_glib file + makeWrapper ]; + + preFixup = '' + wrapProgram "$out/libexec/vino-server" \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Vino; + description = "GNOME desktop sharing server"; + maintainers = with maintainers; [ lethalman iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/vino/src.nix b/pkgs/desktops/gnome-3/3.18/core/vino/src.nix new file mode 100644 index 00000000000..b2202c48733 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/vino/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "vino-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/vino/3.18/vino-3.18.0.tar.xz; + sha256 = "52be0b036389713eab224abf27f2ca2a067ba5bd1f6b526592703576005e0919"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix new file mode 100644 index 00000000000..5ccca36bcaa --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: + +stdenv.mkDerivation rec { + versionMajor = "0.36"; + versionMinor = "3"; + moduleName = "vte"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; + }; + + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; + + configureFlags = [ "--enable-introspection" ]; + + enableParallelBuilding = true; + + postInstall = '' + substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK+"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK+, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = licenses.lgpl2; + maintainers = with maintainers; [ astsmtl antono lethalman ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix new file mode 100644 index 00000000000..b47381cf61b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 +, gnutls, selectTextPatch ? false }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; + + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + gnome3.gtk3 ncurses vala libxml2 ]; + + propagatedBuildInputs = [ gnutls ]; + + preConfigure = "patchShebangs ."; + + configureFlags = [ "--enable-introspection" ]; + + enableParallelBuilding = true; + + postInstall = '' + substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK+"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK+, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = licenses.lgpl2; + maintainers = with maintainers; [ astsmtl antono lethalman ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch new file mode 100644 index 00000000000..c18f1b76b41 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch @@ -0,0 +1,226 @@ +Only in vte-0.40.0.new: .git +diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c +--- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400 ++++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400 +@@ -1444,7 +1444,7 @@ + *start_offset = offset_from_xy (priv, start_x, start_y); + _vte_terminal_get_end_selection (terminal, &end_x, &end_y); + *end_offset = offset_from_xy (priv, end_x, end_y); +- return _vte_terminal_get_selection (terminal); ++ return vte_terminal_get_selection (terminal); + } + + static gboolean +diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c +--- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400 ++++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400 +@@ -123,7 +123,6 @@ + gpointer data, + GArray *attributes, + gboolean include_trailing_spaces); +-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); + static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); + static void vte_terminal_stop_processing (VteTerminal *terminal); + +@@ -3344,9 +3343,10 @@ + _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); + terminal->pvt->pty_input_source = 0; + } +-static void +-_vte_terminal_connect_pty_read(VteTerminal *terminal) ++void ++vte_terminal_connect_pty_read(VteTerminal *terminal) + { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); + if (terminal->pvt->pty_channel == NULL) { + return; + } +@@ -3398,9 +3398,10 @@ + } + } + +-static void +-_vte_terminal_disconnect_pty_read(VteTerminal *terminal) ++void ++vte_terminal_disconnect_pty_read(VteTerminal *terminal) + { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); + if (terminal->pvt->pty_input_source != 0) { + _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); + g_source_remove(terminal->pvt->pty_input_source); +@@ -6302,6 +6303,28 @@ + } + } + ++/** ++ * vte_terminal_set_cursor_position: ++ * @terminal: a #VteTerminal ++ * @column: the new cursor column ++ * @row: the new cursor row ++ * ++ * Set the location of the cursor. ++ */ ++void ++vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ ++ _vte_invalidate_cursor_once(terminal, FALSE); ++ terminal->pvt->cursor.col = column; ++ terminal->pvt->cursor.row = row; ++ _vte_invalidate_cursor_once(terminal, FALSE); ++ _vte_check_cursor_blink(terminal); ++ vte_terminal_queue_cursor_moved(terminal); ++} ++ + static GtkClipboard * + vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) + { +@@ -6465,7 +6488,7 @@ + vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); + + /* Temporarily stop caring about input from the child. */ +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + } + + static gboolean +@@ -6482,7 +6505,7 @@ + terminal->pvt->selecting = FALSE; + + /* Reconnect to input from the child if we paused it. */ +- _vte_terminal_connect_pty_read(terminal); ++ vte_terminal_connect_pty_read(terminal); + + return TRUE; + } +@@ -6982,6 +7005,50 @@ + vte_terminal_deselect_all (terminal); + } + ++/** ++ * vte_terminal_get_selection_block_mode: ++ * @terminal: a #VteTerminal ++ * ++ * Checks whether or not block selection is enabled. ++ * ++ * Returns: %TRUE if block selection is enabled, %FALSE if not ++ */ ++gboolean ++vte_terminal_get_selection_block_mode(VteTerminal *terminal) { ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); ++ return terminal->pvt->selection_block_mode; ++} ++ ++/** ++ * vte_terminal_set_selection_block_mode: ++ * @terminal: a #VteTerminal ++ * @block_mode: whether block selection is enabled ++ * ++ * Sets whether or not block selection is enabled. ++ */ ++void ++vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ terminal->pvt->selection_block_mode = block_mode; ++} ++ ++/** ++ * vte_terminal_select_text: ++ * @terminal: a #VteTerminal ++ * @start_col: the starting column for the selection ++ * @start_row: the starting row for the selection ++ * @end_col: the end column for the selection ++ * @end_row: the end row for the selection ++ * ++ * Sets the current selection region. ++ */ ++void ++vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) { ++ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); ++} ++ + /* Autoscroll a bit. */ + static gboolean + vte_terminal_autoscroll(VteTerminal *terminal) +@@ -8631,7 +8698,7 @@ + #endif + kill(terminal->pvt->pty_pid, SIGHUP); + } +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + if (terminal->pvt->pty_channel != NULL) { + g_io_channel_unref (terminal->pvt->pty_channel); +@@ -12188,7 +12255,7 @@ + g_object_freeze_notify(object); + + if (pvt->pty != NULL) { +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + + if (terminal->pvt->pty_channel != NULL) { +@@ -12243,7 +12310,7 @@ + _vte_terminal_setup_utf8 (terminal); + + /* Open channels to listen for input on. */ +- _vte_terminal_connect_pty_read (terminal); ++ vte_terminal_connect_pty_read (terminal); + + g_object_notify(object, "pty"); + +@@ -12276,7 +12343,7 @@ + } + + char * +-_vte_terminal_get_selection(VteTerminal *terminal) ++vte_terminal_get_selection(VteTerminal *terminal) + { + g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); + +diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h +--- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400 ++++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400 +@@ -25,7 +25,6 @@ + G_BEGIN_DECLS + + void _vte_terminal_accessible_ref(VteTerminal *terminal); +-char* _vte_terminal_get_selection(VteTerminal *terminal); + void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); +diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h +--- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400 ++++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400 +@@ -169,6 +169,18 @@ + + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); ++void vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++ ++/* pause and unpause output */ ++void vte_terminal_disconnect_pty_read(VteTerminal *vte); ++void vte_terminal_connect_pty_read(VteTerminal *vte); + + /* By-word selection */ + void vte_terminal_set_word_char_exceptions(VteTerminal *terminal, +@@ -280,6 +292,8 @@ + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) _VTE_GNUC_NONNULL(1); + + /* Add a matching expression, returning the tag the widget assigns to that + * expression. */ diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/src.nix b/pkgs/desktops/gnome-3/3.18/core/vte/src.nix new file mode 100644 index 00000000000..ea6e39182fc --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/vte/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "vte-0.42.0"; + + src = fetchurl { + url = mirror://gnome/sources/vte/0.42/vte-0.42.0.tar.xz; + sha256 = "2168f79d2043cbbe6d4375d01e54cebda71bb6f5d9dc8ad658b9a1dc1052de04"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix new file mode 100644 index 00000000000..de708d48c5e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp/Tools; + description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; + maintainers = with maintainers; [ iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix new file mode 100644 index 00000000000..f03c6d1bc31 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "yelp-tools-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; + sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix new file mode 100644 index 00000000000..0a3976f35a1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix @@ -0,0 +1,18 @@ +{ stdenv, intltool, fetchurl, pkgconfig, bash +, itstool, libxml2, libxslt, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp's universal stylesheets for Mallard and DocBook"; + maintainers = gnome3.maintainers; + license = [licenses.gpl2 licenses.lgpl2]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix new file mode 100644 index 00000000000..a3343d2dfd1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "yelp-xsl-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/yelp-xsl/3.18/yelp-xsl-3.18.0.tar.xz; + sha256 = "893620857b72b3b43ee3b462281240b7ca4d80292f469552827f0597bf60d2b2"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.18/core/yelp/default.nix new file mode 100644 index 00000000000..13464137bd8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/yelp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, gnome3, gdk_pixbuf, sqlite +, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite + libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + librsvg gdk_pixbuf gnome3.defaultIconTheme + gnome3.gsettings_desktop_schemas wrapGAppsHook + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "The help viewer in Gnome"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix new file mode 100644 index 00000000000..cb25d3d30c6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "yelp-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/yelp/3.18/yelp-3.18.0.tar.xz; + sha256 = "a8c201e520c87832d017439492e4343e957a90da5c6d85060e8dd3b28ffee72e"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.18/core/zenity/default.nix new file mode 100644 index 00000000000..8f525945a6a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/zenity/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, itstool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + preBuild = '' + mkdir -p $out/include + ''; + + buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix new file mode 100644 index 00000000000..87f16156515 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "zenity-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/zenity/3.18/zenity-3.18.0.tar.xz; + sha256 = "0efafea95a830f3bf6eca805ff4a8008df760a6ad3e81181b9473dcf721c3a69"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix new file mode 100644 index 00000000000..a3ae8933e64 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/default.nix @@ -0,0 +1,394 @@ +{ pkgs }: + +let + + pkgsFun = overrides: + let + self = self_ // overrides; + self_ = with self; { + + overridePackages = f: + let newself = pkgsFun (f newself self); + in newself; + + callPackage = pkgs.newScope self; + + version = "3.18"; + maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; + + corePackages = with gnome3; [ + pkgs.desktop_file_utils pkgs.ibus + pkgs.shared_mime_info # for update-mime-database + glib # for gsettings + gtk3 # for gtk-update-icon-cache + glib_networking gvfs dconf gnome-backgrounds gnome_control_center + gnome-menus gnome_settings_daemon gnome_shell + gnome_themes_standard defaultIconTheme gnome-shell-extensions + pkgs.hicolor_icon_theme + ]; + + optionalPackages = with gnome3; [ baobab empathy eog epiphany evince + gucharmap nautilus totem vino yelp gnome-bluetooth + gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot + gnome-system-log gnome-system-monitor + gnome_terminal gnome-user-docs bijiben evolution file-roller gedit + gnome-clocks gnome-music gnome-tweak-tool gnome-photos + nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs + gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool + gnome-getting-started-docs + ]; + + gamesPackages = with gnome3; [ swell-foop lightsoff iagno + tali quadrapassel gnome-sudoku aisleriot five-or-more + four-in-a-row gnome-chess gnome-klotski gnome-mahjongg + gnome-mines gnome-nibbles gnome-robots gnome-tetravex + hitori gnome-taquin + ]; + + inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; + inherit (pkgs.gnome2) ORBit2; + libsoup = pkgs.libsoup.override { gnomeSupport = true; }; + libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; + orbit = ORBit2; + gnome3 = self // { recurseForDerivations = false; }; + clutter = pkgs.clutter_1_24; + clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; }; + clutter-gst_2 = pkgs.clutter-gst; + clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter cogl; }; + cogl = pkgs.cogl_1_22; + gtk = gtk3; + gtkmm = gtkmm3; + gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; + vala = pkgs.vala_0_26; + gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; + +# Simplify the nixos module and gnome packages + defaultIconTheme = adwaita-icon-theme; + +#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) + + adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; + + baobab = callPackage ./core/baobab { }; + + caribou = callPackage ./core/caribou { }; + + dconf = callPackage ./core/dconf { }; + dconf-editor = callPackage ./core/dconf-editor { }; + + empathy = callPackage ./core/empathy { + webkitgtk = webkitgtk24x; + clutter-gst = pkgs.clutter-gst; + }; + + epiphany = callPackage ./core/epiphany { }; + + evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests + + evolution_data_server = callPackage ./core/evolution-data-server { }; + + gconf = callPackage ./core/gconf { }; + + geocode_glib = callPackage ./core/geocode-glib { }; + + gcr = callPackage ./core/gcr { }; # ToDo: tests fail + + gdm = callPackage ./core/gdm { }; + + gjs = callPackage ./core/gjs { }; + + glib_networking = pkgs.glib_networking.override { + inherit gsettings_desktop_schemas; + }; + + gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; + + gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; + + gnome-contacts = callPackage ./core/gnome-contacts { }; + + gnome_control_center = callPackage ./core/gnome-control-center { }; + + gnome-calculator = callPackage ./core/gnome-calculator { }; + + gnome_common = callPackage ./core/gnome-common { }; + + gnome_desktop = callPackage ./core/gnome-desktop { }; + + gnome-dictionary = callPackage ./core/gnome-dictionary { }; + + gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; + + gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; + + gnome-menus = callPackage ./core/gnome-menus { }; + + gnome_keyring = callPackage ./core/gnome-keyring { }; + + libgnome_keyring = callPackage ./core/libgnome-keyring { }; + + libgnomekbd = callPackage ./core/libgnomekbd { }; + + folks = callPackage ./core/folks { }; + + gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + + gnome-online-miners = callPackage ./core/gnome-online-miners { }; + + gnome_session = callPackage ./core/gnome-session { }; + + gnome_shell = callPackage ./core/gnome-shell { }; + + gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; + + gnome-screenshot = callPackage ./core/gnome-screenshot { }; + + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + + gnome-system-log = callPackage ./core/gnome-system-log { }; + + gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; + + gnome_terminal = callPackage ./core/gnome-terminal { }; + + gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + + gnome-user-docs = callPackage ./core/gnome-user-docs { }; + + gnome-user-share = callPackage ./core/gnome-user-share { }; + + grilo = callPackage ./core/grilo { }; + + grilo-plugins = callPackage ./core/grilo-plugins { }; + + gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + + gsound = callPackage ./core/gsound { }; + + gtksourceview = callPackage ./core/gtksourceview { }; + + gucharmap = callPackage ./core/gucharmap { }; + + gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; + + eog = callPackage ./core/eog { }; + + libcroco = callPackage ./core/libcroco {}; + + libgee = callPackage ./core/libgee { }; + + libgdata = callPackage ./core/libgdata { }; + + libgxps = callPackage ./core/libgxps { }; + + libpeas = callPackage ./core/libpeas {}; + + libgweather = callPackage ./core/libgweather { }; + + libzapojit = callPackage ./core/libzapojit { }; + + mutter = callPackage ./core/mutter { }; + + nautilus = callPackage ./core/nautilus { }; + + networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + inherit gnome3; + }; + + networkmanager_pptp = pkgs.networkmanager_pptp.override { + inherit gnome3; + }; + + networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + inherit gnome3; + }; + + networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + inherit gnome3; + }; + + networkmanager_l2tp = pkgs.networkmanager_l2tp.override { + inherit gnome3; + }; + + networkmanagerapplet = pkgs.networkmanagerapplet.override { + inherit gnome3 gsettings_desktop_schemas glib_networking; + }; + + rest = callPackage ./core/rest { }; + + sushi = callPackage ./core/sushi { + clutter-gst = pkgs.clutter-gst; + }; + + totem = callPackage ./core/totem { }; + + totem-pl-parser = callPackage ./core/totem-pl-parser { }; + + tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; + + vte = callPackage ./core/vte { }; + + vte_290 = callPackage ./core/vte/2.90.nix { }; + + vte-select-text = vte.override { selectTextPatch = true; }; + + vino = callPackage ./core/vino { }; + + yelp = callPackage ./core/yelp { }; + + yelp_xsl = callPackage ./core/yelp-xsl { }; + + yelp_tools = callPackage ./core/yelp-tools { }; + + zenity = callPackage ./core/zenity { }; + + +#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) + + accerciser = callPackage ./apps/accerciser { }; + + bijiben = callPackage ./apps/bijiben { + webkitgtk = webkitgtk24x; + }; + + cheese = callPackage ./apps/cheese { }; + + evolution = callPackage ./apps/evolution { + webkitgtk = webkitgtk24x; + }; + + file-roller = callPackage ./apps/file-roller { }; + + gedit = callPackage ./apps/gedit { }; + + glade = callPackage ./apps/glade { }; + + gnome-boxes = callPackage ./apps/gnome-boxes { + gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; + spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; + }; + + gnome-calendar = callPackage ./apps/gnome-calendar { }; + + gnome-characters = callPackage ./apps/gnome-characters { }; + + gnome-clocks = callPackage ./apps/gnome-clocks { }; + + gnome-documents = callPackage ./apps/gnome-documents { }; + + gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; + + gnome-logs = callPackage ./apps/gnome-logs { }; + + gnome-maps = callPackage ./apps/gnome-maps { }; + + gnome-music = callPackage ./apps/gnome-music { }; + + gnome-nettool = callPackage ./apps/gnome-nettool { }; + + gnome-photos = callPackage ./apps/gnome-photos { + gegl = gegl_0_3; + }; + + gnome-weather = callPackage ./apps/gnome-weather { }; + + nautilus-sendto = callPackage ./apps/nautilus-sendto { }; + + polari = callPackage ./apps/polari { }; + + # scrollkeeper replacement + rarian = callPackage ./desktop/rarian { }; + + seahorse = callPackage ./apps/seahorse { }; + + vinagre = callPackage ./apps/vinagre { }; + +#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ + + anjuta = callPackage ./devtools/anjuta { }; + + devhelp = callPackage ./devtools/devhelp { + webkitgtk = webkitgtk24x; + }; + + gdl = callPackage ./devtools/gdl { }; + + gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; + +#### Games + + aisleriot = callPackage ./games/aisleriot { }; + + five-or-more = callPackage ./games/five-or-more { }; + + four-in-a-row = callPackage ./games/four-in-a-row { }; + + gnome-chess = callPackage ./games/gnome-chess { }; + + gnome-klotski = callPackage ./games/gnome-klotski { }; + + gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; + + gnome-mines = callPackage ./games/gnome-mines { }; + + gnome-nibbles = callPackage ./games/gnome-nibbles { }; + + gnome-robots = callPackage ./games/gnome-robots { }; + + gnome-sudoku = callPackage ./games/gnome-sudoku { }; + + gnome-taquin = callPackage ./games/gnome-taquin { }; + + gnome-tetravex = callPackage ./games/gnome-tetravex { }; + + hitori = callPackage ./games/hitori { }; + + iagno = callPackage ./games/iagno { }; + + lightsoff = callPackage ./games/lightsoff { }; + + swell-foop = callPackage ./games/swell-foop { }; + + tali = callPackage ./games/tali { }; + + quadrapassel = callPackage ./games/quadrapassel { }; + +#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + + california = callPackage ./misc/california { }; + + geary = callPackage ./misc/geary { + webkitgtk = webkitgtk24x; + }; + + gfbgraph = callPackage ./misc/gfbgraph { }; + + gitg = callPackage ./misc/gitg { + webkitgtk = webkitgtk24x; + }; + + libgda = callPackage ./misc/libgda { }; + + libgit2-glib = callPackage ./misc/libgit2-glib { + libgit2 = pkgs.libgit2.override { libssh2 = null; }; + }; + + libmediaart = callPackage ./misc/libmediaart { }; + + gexiv2 = callPackage ./misc/gexiv2 { }; + + gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; + + gpaste = callPackage ./misc/gpaste { }; + + gtkhtml = callPackage ./misc/gtkhtml { }; + + pomodoro = callPackage ./misc/pomodoro { }; + + gnome-video-effects = callPackage ./misc/gnome-video-effects { }; + + }; + in self; # pkgsFun + +in pkgsFun {} diff --git a/pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix new file mode 100644 index 00000000000..a1b38b21869 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: + +stdenv.mkDerivation rec { + name = "rarian-0.8.1"; + src = fetchurl { + url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; + sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; + }; + + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix new file mode 100644 index 00000000000..ef350e08684 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + itstool, python, makeWrapper }: + +in stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/anjuta \ + --prefix XDG_DATA_DIRS : \ + "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Software development studio"; + homepage = http://anjuta.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix new file mode 100644 index 00000000000..835024c3447 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "anjuta-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/anjuta/3.18/anjuta-3.18.0.tar.xz; + sha256 = "6a3fec0963f04bc62a9dfb951e577a3276d39c3414083ef73163c3fea8e741ba"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix new file mode 100644 index 00000000000..1cfae754cfe --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, webkitgtk, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://live.gnome.org/devhelp; + description = "API documentation browser for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix new file mode 100644 index 00000000000..8da63dc2685 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "devhelp-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/devhelp/3.18/devhelp-3.18.0.tar.xz; + sha256 = "2494af16fedc311d7bb50bc47c32a69035f7b95fd7995d9db4fe497926087fb5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix new file mode 100644 index 00000000000..156d91b3eae --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix new file mode 100644 index 00000000000..3fd39139799 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gdl-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gdl/3.18/gdl-3.18.0.tar.xz; + sha256 = "1499884e4fce375a963cf2b98b90e6724144f9b1f1ac8b84d765f4c85a2140b2"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix new file mode 100644 index 00000000000..50960f41a31 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/GNOME/gnome-devel-docs; + description = "Developer documentation for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.fdl12; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix new file mode 100644 index 00000000000..50a575945d7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-devel-docs-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-devel-docs/3.18/gnome-devel-docs-3.18.0.tar.xz; + sha256 = "f237fb8593ada0346ccc932ae17647a883cc9f7026f4cad16f084bb7420e0925"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix new file mode 100644 index 00000000000..e149a0b3126 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 +, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils +, guile, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = [ "--with-card-theme-formats=svg" ]; + + buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf + librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Aisleriot; + description = "A collection of patience games written in guile scheme"; + maintainers = gnome3.maintainers; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix new file mode 100644 index 00000000000..465fccd15b4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "aisleriot-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/aisleriot/3.18/aisleriot-3.18.0.tar.xz; + sha256 = "3421f7dabe482ddae2fd2a053a13a2a9549fe960fec5838ab4fe6d89cff054dd"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix new file mode 100644 index 00000000000..50a7d2906a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Five_or_more; + description = "Remove colored balls from the board by forming lines"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix new file mode 100644 index 00000000000..37d9794dc1b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "five-or-more-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/five-or-more/3.18/five-or-more-3.18.0.tar.xz; + sha256 = "e1e7cc81b1281382da9a6ab466d97f09561dbaf39031a9b93f0a45221234fe62"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix new file mode 100644 index 00000000000..68228750cd8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Four-in-a-row; + description = "Make lines of the same color to win"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix new file mode 100644 index 00000000000..dc24a4366e3 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "four-in-a-row-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/four-in-a-row/3.18/four-in-a-row-3.18.0.tar.xz; + sha256 = "a65fece60b66122fbf5fddf646ac2acffc58a802cf3e87e5985d5b962d53df48"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix new file mode 100644 index 00000000000..a96dae3c12c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, itstool, librsvg, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Chess; + description = "Play the classic two-player boardgame of chess"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix new file mode 100644 index 00000000000..5cbbb6c9025 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-chess-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-chess/3.18/gnome-chess-3.18.0.tar.xz; + sha256 = "c841198935d807618c3cecbf10ed24643390d504e17961717bac455f4e1b37ad"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix new file mode 100644 index 00000000000..b13bf8afbfa --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libxml2, intltool, itstool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Klotski; + description = "Slide blocks to solve the puzzle"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix new file mode 100644 index 00000000000..c772988198c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-klotski-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-klotski/3.18/gnome-klotski-3.18.0.tar.xz; + sha256 = "75ef9f7b3b09edf660165f62f8797f3850a49d6be4de0c258ee7d828e67820f2"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix new file mode 100644 index 00000000000..43db32e8857 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Mahjongg; + description = "Disassemble a pile of tiles by removing matching pairs"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix new file mode 100644 index 00000000000..214c4a7d6e0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-mahjongg-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-mahjongg/3.18/gnome-mahjongg-3.18.0.tar.xz; + sha256 = "7034428f5ac04bfd90689ee66894a6948a2ff1bfa2d2548f7559d2134b967405"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix new file mode 100644 index 00000000000..4d703bb37a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Mines; + description = "Clear hidden mines from a minefield"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix new file mode 100644 index 00000000000..e5099ac9575 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-mines-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-mines/3.18/gnome-mines-3.18.0.tar.xz; + sha256 = "8b4c05ef0ab43031661e3cdb1b17ba551efe4e4488fe4462fee9557cd10a64f9"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix new file mode 100644 index 00000000000..85ffeb3c50f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool +, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Nibbles; + description = "Guide a worm around a maze"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix new file mode 100644 index 00000000000..d82422619f8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-nibbles-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-nibbles/3.18/gnome-nibbles-3.18.0.tar.xz; + sha256 = "9ffc549d574774905c79b391d3e59f8045f47504d96279d9b26cc602f59ad545"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix new file mode 100644 index 00000000000..3c318fa847c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Robots; + description = "Avoid the robots and make them crash into each other"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix new file mode 100644 index 00000000000..228e2ca81b1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-robots-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-robots/3.18/gnome-robots-3.18.0.tar.xz; + sha256 = "34311cb9de6a970f00fa9743dced2925e98f40f77b4a406e17b589412cb902fc"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix new file mode 100644 index 00000000000..c8ba82c7246 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook +, json_glib, qqwing, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee + json_glib qqwing itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Sudoku; + description = "Test your logic skills in this number grid puzzle"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix new file mode 100644 index 00000000000..f7dd422bec5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-sudoku-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-sudoku/3.18/gnome-sudoku-3.18.0.tar.xz; + sha256 = "e6180b14f7ccb9ec43e187cf358eceaf707edb4d9defff3386ae4ef8e53cce5b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix new file mode 100644 index 00000000000..78eaa23e63b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + intltool itstool libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Taquin; + description = "Move tiles so that they reach their places"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix new file mode 100644 index 00000000000..41cb361edb3 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-taquin-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-taquin/3.18/gnome-taquin-3.18.0.tar.xz; + sha256 = "3cee6a52003ccec3147020d24c079a0cd01b6855fcd486ef20a60e0f862e8760"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix new file mode 100644 index 00000000000..d6feab93dba --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, libxml2, intltool, itstool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Tetravex; + description = "Complete the puzzle by matching numbered tiles"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix new file mode 100644 index 00000000000..d73562835e4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-tetravex-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-tetravex/3.18/gnome-tetravex-3.18.0.tar.xz; + sha256 = "ea00ff5ea9a3b583c4d755cefa2725dd7b3b0781972af1c56377c7eda48cb579"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.18/games/hitori/default.nix new file mode 100644 index 00000000000..bd6be7d43c5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/hitori/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, libxml2, intltool, itstool }: + +stdenv.mkDerivation rec { + name = "hitori-${gnome3.version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; + sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; + }; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Hitori; + description = "GTK+ application to generate and let you play games of Hitori"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.18/games/iagno/default.nix new file mode 100644 index 00000000000..1b6f08d1fd6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/iagno/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Iagno; + description = "Computer version of the game Reversi, more popularly called Othello"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix new file mode 100644 index 00000000000..09b30cf066b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "iagno-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/iagno/3.18/iagno-3.18.0.tar.xz; + sha256 = "4a03b474f9b0f0812c8b22b4991aa6dd894dedc05959001fd9e3e09d0d323c56"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix new file mode 100644 index 00000000000..8ec54b48972 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf + libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Lightsoff; + description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix new file mode 100644 index 00000000000..6645182b3a4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "lightsoff-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/lightsoff/3.18/lightsoff-3.18.0.tar.xz; + sha256 = "cd5126dae4506363d9196ce8ba083a769d9f8c287fb0008db53cecf6cdc55d61"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix new file mode 100644 index 00000000000..f319608764d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf +, librsvg, libcanberra_gtk3 +, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libcanberra_gtk3 itstool intltool clutter + libxml2 clutter_gtk wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Quadrapassel; + description = "Classic falling-block game, Tetris"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix new file mode 100644 index 00000000000..55b70b7ec58 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "quadrapassel-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/quadrapassel/3.18/quadrapassel-3.18.0.tar.xz; + sha256 = "2cd1d5328ab9e2c7041936e8e7e01157f292aa4428da81175fb1aa15d40ef8e1"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix new file mode 100644 index 00000000000..3d3e424d0da --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf +, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + description = "Puzzle game, previously known as Same GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix new file mode 100644 index 00000000000..ea127d8c8dc --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "swell-foop-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/swell-foop/3.18/swell-foop-3.18.0.tar.xz; + sha256 = "b105a36e04dc33e2fe1c3200ed62efea0a68e2411453cb41269508aa739d2936"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/tali/default.nix b/pkgs/desktops/gnome-3/3.18/games/tali/default.nix new file mode 100644 index 00000000000..c2b1f585712 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/tali/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf +, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libxml2 itstool intltool wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Tali; + description = "Sort of poker with dice and less money"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/games/tali/src.nix b/pkgs/desktops/gnome-3/3.18/games/tali/src.nix new file mode 100644 index 00000000000..12c8aefcd71 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/games/tali/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "tali-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/tali/3.18/tali-3.18.0.tar.xz; + sha256 = "fe785ed2c3eeca8706834a967c0011cfee016008b4e55c1f5e0529b348bc9864"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch new file mode 100644 index 00000000000..c229cc96094 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch @@ -0,0 +1,39 @@ +diff --git a/configure.ac b/configure.ac +index 8a94642..1ca6426 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) + GLIB_REQUIRED=2.38.0 + GTK_REQUIRED=3.12.2 + GEE_REQUIRED=0.10.5 +-ECAL_REQUIRED=3.8.5 ++ECAL_REQUIRED=3.13.90 + LIBSOUP_REQUIRED=2.44 + GDATA_REQUIRED=0.14.0 + GOA_REQUIRED=3.8.3 +diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala +index ee6a572..5009b5d 100644 +--- a/src/backing/eds/backing-eds-calendar-source.vala ++++ b/src/backing/eds/backing-eds-calendar-source.vala +@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { + + // Invoked by EdsStore prior to making it available outside of unit + internal async void open_async(Cancellable? cancellable) throws Error { +- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, ++ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, + cancellable); + + client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); +diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi +index 6ead3ec..46fd711 100644 +--- a/vapi/libecal-1.2.vapi ++++ b/vapi/libecal-1.2.vapi +@@ -23,7 +23,7 @@ namespace E { + public bool check_save_schedules (); + public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; + [CCode (finish_name = "e_cal_client_connect_finish")] +- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; ++ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; + public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; + [CCode (finish_name = "e_cal_client_create_object_finish")] + public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/3.18/misc/california/default.nix b/pkgs/desktops/gnome-3/3.18/misc/california/default.nix new file mode 100644 index 00000000000..4bdeeb23a91 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/california/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper +, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: + +let + majorVersion = "0.4"; +in +stdenv.mkDerivation rec { + name = "california-${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; + sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee + libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server + sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; + + preFixup = '' + wrapProgram "$out/bin/california" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" + ''; + + enableParallelBuilding = true; + + # Apply fedoras patch to build with evolution-data-server >3.13 + patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/California; + description = "Calendar application for GNOME 3"; + maintainers = with maintainers; [ pSub ]; + license = licenses.lgpl21; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.18/misc/geary/default.nix new file mode 100644 index 00000000000..11655edded0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/geary/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala +, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +, libnotify, libcanberra, libsecret, gmime +, libpthreadstubs, sqlite +, gnome3, librsvg, gnome_doc_utils, webkitgtk }: + +let + majorVersion = "0.8"; +in +stdenv.mkDerivation rec { + name = "geary-${majorVersion}.2"; + + src = fetchurl { + url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; + sha256 = "3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + gdk_pixbuf librsvg gnome3.defaultIconTheme ]; + + preConfigure = '' + substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' + ''; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/${name}/ + mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} + ''; + + preFixup = '' + wrapProgram "$out/bin/geary" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + patches = [ ./disable_valadoc.patch ]; + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Geary; + description = "Mail client for GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch new file mode 100644 index 00000000000..e65c0dea747 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch @@ -0,0 +1,24 @@ +--- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 ++++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 +@@ -696,21 +696,6 @@ + ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ + ) + +-# Valadoc +-################################################# +-foreach(pkg ${ENGINE_PACKAGES}) +- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") +-endforeach(pkg ${ENGINE_PACKAGES}) +- +-include(FindValadoc) +-add_custom_target( +- valadoc +- WORKING_DIRECTORY +- ${CMAKE_SOURCE_DIR}/src +- COMMAND +- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi +-) +- + ## Make clean: remove copied files + ################################################## + set_property( diff --git a/pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix new file mode 100644 index 00000000000..7cea9cd8d15 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: + +let + majorVersion = "0.10"; +in +stdenv.mkDerivation rec { + name = "gexiv2-${version}"; + version = "${majorVersion}.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; + sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; + }; + + preConfigure = '' + patchShebangs . + ''; + + buildInputs = [ pkgconfig glib libtool m4 ]; + propagatedBuildInputs = [ exiv2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/gexiv2; + description = "GObject wrapper around the Exiv2 photo metadata library"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix new file mode 100644 index 00000000000..e85b087fa41 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix @@ -0,0 +1,23 @@ +{ stdenv, intltool, fetchurl, pkgconfig, glib +, gnome3, libsoup, json_glib }: + +stdenv.mkDerivation rec { + name = "gfbgraph-0.2.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; + sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; + }; + + buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; + propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "GLib/GObject wrapper for the Facebook Graph API"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix new file mode 100644 index 00000000000..c517fca57bf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib +, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: + +# TODO: icons and theme still does not work +# use packaged gnome3.adwaita-icon-theme + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + preCheck = '' + substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" + ''; + doCheck = true; + + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + + propagatedUserEnvPkgs = [ shared_mime_info + gnome3.gnome_themes_standard ]; + + buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas + libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg + gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ]; + + preFixup = '' + wrapProgram "$out/bin/gitg" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + description = "GNOME GUI client to view git repositories"; + maintainers = with maintainers; [ iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix new file mode 100644 index 00000000000..ac95070b5f5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gitg-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gitg/3.18/gitg-3.18.0.tar.xz; + sha256 = "fa4b7b9c492f13f5f1d864af1281ea377ac8c7619c856e05f533b18989edf421"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch new file mode 100644 index 00000000000..d5a6f90e33d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch @@ -0,0 +1,123 @@ +From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sat, 1 Aug 2015 21:01:11 +0200 +Subject: [PATCH 1/1] Search for themes and icons in system data dirs + +--- + gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- + gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- + gtweak/utils.py | 17 +++++++++++++++++ + 3 files changed, 23 insertions(+), 18 deletions(-) + +diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py +index ed2ad5f..a319907 100644 +--- a/gtweak/tweaks/tweak_group_interface.py ++++ b/gtweak/tweaks/tweak_group_interface.py +@@ -26,7 +26,7 @@ from gi.repository import Gtk + from gi.repository import GLib + + import gtweak +-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file ++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.gshellwrapper import GnomeShellFactory + from gtweak.gsettings import GSettingsSetting +@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): + + def _get_valid_themes(self): + """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ +- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), +- os.path.join(GLib.get_user_data_dir(), "themes"), +- os.path.join(os.path.expanduser("~"), ".themes")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs('themes'), lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + os.path.exists(os.path.join(d, "gtk-3.0"))) + return valid +@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak): + **options) + + def _get_valid_icon_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), +- os.path.join(GLib.get_user_data_dir(), "icons"), +- os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "index.theme"))) + return valid +@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): + **options) + + def _get_valid_cursor_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), +- os.path.join(GLib.get_user_data_dir(), "icons"), +- os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) + return valid +diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py +index b56a4f4..3486098 100644 +--- a/gtweak/tweaks/tweak_group_keymouse.py ++++ b/gtweak/tweaks/tweak_group_keymouse.py +@@ -20,7 +20,7 @@ import os.path + from gi.repository import GLib + + import gtweak +-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default ++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs + from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title + + class PrimaryPasteTweak(GetterSetterSwitchTweak): +@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): + **options) + + def _get_valid_key_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), +- os.path.join(GLib.get_user_data_dir(), "themes"), +- os.path.join(os.path.expanduser("~"), ".themes")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ + os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) + return valid +diff --git a/gtweak/utils.py b/gtweak/utils.py +index 3d20425..0fcb51d 100644 +--- a/gtweak/utils.py ++++ b/gtweak/utils.py +@@ -21,6 +21,7 @@ import tempfile + import shutil + import subprocess + import glob ++import itertools + + import gtweak + from gtweak.gsettings import GSettingsSetting +@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True): + stdout, stderr = p.communicate() + return stdout, stderr, p.returncode + ++def get_resource_dirs(resource): ++ """Returns a list of all known resource dirs for a given resource. ++ ++ :param str resource: ++ Name of the resource (e.g. "themes") ++ :return: ++ A list of resource dirs ++ """ ++ dirs = [os.path.join(dir, resource) ++ for dir in itertools.chain(GLib.get_system_data_dirs(), ++ (gtweak.DATA_DIR, ++ GLib.get_user_data_dir()))] ++ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] ++ ++ return [dir for dir in dirs if os.path.isdir(dir)] ++ + @singleton + class AutostartManager: + +-- +2.4.5 + diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch new file mode 100644 index 00000000000..61ae2734979 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch @@ -0,0 +1,103 @@ +From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sat, 1 Aug 2015 21:26:57 +0200 +Subject: [PATCH 1/1] Don't show multiple entries for a single theme + +--- + gtweak/tweaks/tweak_group_interface.py | 8 ++++---- + gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- + gtweak/utils.py | 16 ++++++++++++++++ + 3 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py +index a319907..82c0286 100644 +--- a/gtweak/tweaks/tweak_group_interface.py ++++ b/gtweak/tweaks/tweak_group_interface.py +@@ -26,7 +26,7 @@ from gi.repository import Gtk + from gi.repository import GLib + + import gtweak +-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs ++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.gshellwrapper import GnomeShellFactory + from gtweak.gsettings import GSettingsSetting +@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs('themes'), lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + os.path.exists(os.path.join(d, "gtk-3.0"))) +- return valid ++ return get_unique_resources(valid) + + class IconThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): +@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "index.theme"))) +- return valid ++ return get_unique_resources(valid) + + class CursorThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): +@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) +- return valid ++ return get_unique_resources(valid) + + class ShellThemeTweak(Gtk.Box, Tweak): + +diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py +index 3486098..9f53425 100644 +--- a/gtweak/tweaks/tweak_group_keymouse.py ++++ b/gtweak/tweaks/tweak_group_keymouse.py +@@ -20,7 +20,7 @@ import os.path + from gi.repository import GLib + + import gtweak +-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs ++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources + from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title + + class PrimaryPasteTweak(GetterSetterSwitchTweak): +@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): + valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ + os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) +- return valid ++ return get_unique_resources(valid) + + TWEAK_GROUPS = [ + ListBoxTweakGroup(_("Keyboard and Mouse"), +diff --git a/gtweak/utils.py b/gtweak/utils.py +index 0fcb51d..ce8e12e 100644 +--- a/gtweak/utils.py ++++ b/gtweak/utils.py +@@ -131,6 +131,22 @@ def get_resource_dirs(resource): + + return [dir for dir in dirs if os.path.isdir(dir)] + ++def get_unique_resources(dirs): ++ """Filter out duplicated resources. ++ ++ :param list dirs: ++ List of resource dirs (e.g. /usr/share/themes/Adwaita) ++ :return: ++ List of dirs without duplicated resources ++ """ ++ unique_dirs = {} ++ for dir in dirs: ++ basename = os.path.basename(dir) ++ if basename not in unique_dirs: ++ unique_dirs[basename] = dir ++ ++ return unique_dirs ++ + @singleton + class AutostartManager: + +-- +2.4.5 + diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch new file mode 100644 index 00000000000..840ebb82ec7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch @@ -0,0 +1,29 @@ +From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sun, 2 Aug 2015 12:01:20 +0200 +Subject: [PATCH 1/1] Create config dir if it doesn't exist + +Otherwise gnome-tweak-tool can't enable the dark theme and fails +without a clear error message. +--- + gtweak/gtksettings.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py +index bcec9f1..f39991b 100644 +--- a/gtweak/gtksettings.py ++++ b/gtweak/gtksettings.py +@@ -35,6 +35,10 @@ class GtkSettingsManager: + def _get_keyfile(self): + keyfile = None + try: ++ config_dir = os.path.dirname(self._path) ++ if not os.path.isdir(config_dir): ++ os.makedirs(config_dir) ++ + keyfile = GLib.KeyFile() + keyfile.load_from_file(self._path, 0) + except MemoryError: +-- +2.4.5 + diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix new file mode 100644 index 00000000000..986d4058af9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix @@ -0,0 +1,44 @@ +{ stdenv, intltool, fetchurl, python, pygobject3, atk +, pkgconfig, gtk3, glib, libsoup +, bash, makeWrapper, itstool, libxml2, python3Packages +, gnome3, librsvg, gdk_pixbuf, file, libnotify }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + makeFlags = [ "DESTDIR=/" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.defaultIconTheme librsvg + python pygobject3 libnotify gnome3.gnome_shell + libsoup gnome3.gnome_settings_daemon gnome3.nautilus + gnome3.gnome_desktop ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-tweak-tool" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" + ''; + + patches = [ + ./find_gsettings.patch + ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch + ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch + ./0003-Create-config-dir-if-it-doesn-t-exist.patch + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + description = "A tool to customize advanced GNOME 3 options"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch new file mode 100644 index 00000000000..3e68c04cb3a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch @@ -0,0 +1,22 @@ +diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py +index a00fe19..dce74b2 100644 +--- a/gtweak/gsettings.py ++++ b/gtweak/gsettings.py +@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): + + class _GSettingsSchema: + def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): +- if not schema_dir: +- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR + if not schema_filename: + schema_filename = schema_name + ".gschema.xml" ++ if not schema_dir: ++ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR ++ for xdg_dir in GLib.get_system_data_dirs(): ++ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") ++ if os.path.exists(os.path.join(dir, schema_filename)): ++ schema_dir = dir ++ break + + schema_path = os.path.join(schema_dir, schema_filename) + if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix new file mode 100644 index 00000000000..abb957394e7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-tweak-tool-3.16.2"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-tweak-tool/3.16/gnome-tweak-tool-3.16.2.tar.xz; + sha256 = "b1e403725c3489be07e1d754f044d1128eddb38204a344bbe0baa523d531bd64"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix new file mode 100644 index 00000000000..c0bd2fed3f2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: + +stdenv.mkDerivation rec { + name = "gnome-video-effects-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; + sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; + }; + + buildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix new file mode 100644 index 00000000000..dee9caf444c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib +, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: + +stdenv.mkDerivation rec { + version = "${gnome3.version}.3"; + name = "gpaste-${version}"; + + src = fetchurl { + url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; + sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + }; + + buildInputs = [ intltool autoreconfHook pkgconfig vala glib + gtk3 gnome3.gnome_control_center dbus.libs + clutter pango appstream-glib makeWrapper ]; + + preConfigure = "intltoolize -f"; + + configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" + "--with-dbusservicesdir=$(out)/share/dbus-1/services" ]; + + enableParallelBuilding = true; + + preFixup = + let + libPath = stdenv.lib.makeLibraryPath + [ glib gtk3 clutter pango ]; + in + '' + for i in $out/libexec/gpaste/*; do + wrapProgram $i \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/Keruspe/GPaste; + description = "Clipboard management system with GNOME3 integration"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix new file mode 100644 index 00000000000..89703b61932 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool +, gnome3, enchant, isocodes }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme + gnome3.gsettings_desktop_schemas ]; + + propagatedBuildInputs = [ enchant isocodes ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix new file mode 100644 index 00000000000..21876ec9c39 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtkhtml-4.10.0"; + + src = fetchurl { + url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; + sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix new file mode 100644 index 00000000000..1fcb411d120 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: + +let + major = "5.2"; + minor = "2"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "libgda-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; + sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; + }; + + configureFlags = [ + "--enable-gi-system-install=no" + ]; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ]; + + meta = with stdenv.lib; { + description = "Database access library"; + homepage = http://www.gnome-db.org/; + license = [ licenses.lgpl2 licenses.gpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix new file mode 100644 index 00000000000..dbdd2cc7fd1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala +, gtk_doc, gobjectIntrospection, libgit2, glib }: + +let + majorVersion = "0.0"; +in +stdenv.mkDerivation rec { + name = "libgit2-glib-${majorVersion}.24"; + + src = fetchurl { + url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz"; + sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8"; + }; + + buildInputs = [ gnome3.gnome_common libtool pkgconfig vala + gtk_doc gobjectIntrospection libgit2 glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix new file mode 100644 index 00000000000..b8648012573 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: + +let + majorVersion = "1.9"; +in +stdenv.mkDerivation rec { + name = "libmediaart-${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; + sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll"; + }; + + buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; + + meta = with stdenv.lib; { + description = "Library tasked with managing, extracting and handling media art caches"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix new file mode 100644 index 00000000000..0440af440fe --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, + dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, + glib, gobjectIntrospection, telepathy_glib +}: + +stdenv.mkDerivation rec { + rev = "624945d"; + name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; + + src = fetchFromGitHub { + owner = "codito"; + repo = "gnome-pomodoro"; + rev = "${rev}"; + sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq"; + }; + + configureScript = ''./autogen.sh''; + + buildInputs = [ + which automake113x intltool glib gobjectIntrospection pkgconfig libtool + makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gnome3.gsettings_desktop_schemas gnome3.gnome_desktop + gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib + gnome3.defaultIconTheme + ]; + + preBuild = '' + sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ + vapi/Makefile + ''; + + preFixup = '' + wrapProgram $out/bin/gnome-pomodoro \ + --prefix XDG_DATA_DIRS : \ + "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/codito/gnome-shell-pomodoro; + description = "A time management utility for GNOME based on the pomodoro technique"; + longDescription = '' + This GNOME utility helps to manage time according to Pomodoro Technique. + It intends to improve productivity and focus by taking short breaks. + ''; + maintainers = with maintainers; [ DamienCassou jgeerds ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56fadb5ce10..e276c326859 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13855,6 +13855,8 @@ let gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { }); + gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); + gnome3 = gnome3_16; gnome = recurseIntoAttrs gnome2; -- GitLab From e43d3b711400c43b6366e896a5186bc90287f256 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Fri, 25 Sep 2015 02:33:21 -0700 Subject: [PATCH 273/553] fix faulty include in libpsl --- pkgs/development/libraries/libpsl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 58de331c0c5..7d4d4503c54 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -28,6 +28,10 @@ in stdenv.mkDerivation { buildInputs = [ icu libxslt ]; nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ]; + postPatch = '' + substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h + ''; + preAutoreconf = '' mkdir m4 gtkdocize -- GitLab From 72aa4582851271e027453d5caf932b6acebc4414 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Sep 2015 11:38:26 +0200 Subject: [PATCH 274/553] Revert "pcre: Fix patch method" This reverts commit fb30776a77122b687fd5f758672311dbcbd81cc2. --- pkgs/development/libraries/pcre/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index f32af2a0e1e..5a55db53348 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, unicodeSupport ? true, cplusplusSupport ? true +{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true , windows ? null }: @@ -12,12 +12,8 @@ stdenv.mkDerivation rec { sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi"; }; - nativeBuildInputs = [ autoreconfHook ]; - # A bundle of fixes which should be removed for 8.38 - patchPhase = '' - patch -p0 -i ${./fixes.patch} - ''; + patches = [ ./fixes.patch ]; outputs = [ "out" "doc" "man" ]; -- GitLab From 298ec05e74f1e375e3929a1442e3473b384ad77b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Sep 2015 11:38:34 +0200 Subject: [PATCH 275/553] Revert "pcre: Updates to fix a number of vulnerabilities" This reverts commit 453b986d2f1061dd04f7a2f198c4e5276ddc8d8f. Such large patches should not be included in the repo. --- pkgs/development/libraries/pcre/default.nix | 3 - pkgs/development/libraries/pcre/fixes.patch | 3538 ------------------- 2 files changed, 3541 deletions(-) delete mode 100644 pkgs/development/libraries/pcre/fixes.patch diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 5a55db53348..a34f3e5e132 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -12,9 +12,6 @@ stdenv.mkDerivation rec { sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi"; }; - # A bundle of fixes which should be removed for 8.38 - patches = [ ./fixes.patch ]; - outputs = [ "out" "doc" "man" ]; configureFlags = '' diff --git a/pkgs/development/libraries/pcre/fixes.patch b/pkgs/development/libraries/pcre/fixes.patch deleted file mode 100644 index 3b39128d7e4..00000000000 --- a/pkgs/development/libraries/pcre/fixes.patch +++ /dev/null @@ -1,3538 +0,0 @@ -Index: pcre_jit_compile.c -=================================================================== ---- pcre_jit_compile.c (revision 1554) -+++ pcre_jit_compile.c (working copy) -@@ -1064,6 +1064,7 @@ - pcre_uchar *end = NULL; - int private_data_ptr = *private_data_start; - int space, size, bracketlen; -+BOOL repeat_check = TRUE; - - while (cc < ccend) - { -@@ -1071,9 +1072,10 @@ - size = 0; - bracketlen = 0; - if (private_data_ptr > SLJIT_MAX_LOCAL_SIZE) -- return; -+ break; - -- if (*cc == OP_ONCE || *cc == OP_ONCE_NC || *cc == OP_BRA || *cc == OP_CBRA || *cc == OP_COND) -+ if (repeat_check && (*cc == OP_ONCE || *cc == OP_ONCE_NC || *cc == OP_BRA || *cc == OP_CBRA || *cc == OP_COND)) -+ { - if (detect_repeat(common, cc)) - { - /* These brackets are converted to repeats, so no global -@@ -1081,6 +1083,8 @@ - if (cc >= end) - end = bracketend(cc); - } -+ } -+ repeat_check = TRUE; - - switch(*cc) - { -@@ -1136,6 +1140,13 @@ - bracketlen = 1 + LINK_SIZE + IMM2_SIZE; - break; - -+ case OP_BRAZERO: -+ case OP_BRAMINZERO: -+ case OP_BRAPOSZERO: -+ repeat_check = FALSE; -+ size = 1; -+ break; -+ - CASE_ITERATOR_PRIVATE_DATA_1 - space = 1; - size = -2; -@@ -1162,12 +1173,17 @@ - size = 1; - break; - -- CASE_ITERATOR_TYPE_PRIVATE_DATA_2B -+ case OP_TYPEUPTO: - if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI) - space = 2; - size = 1 + IMM2_SIZE; - break; - -+ case OP_TYPEMINUPTO: -+ space = 2; -+ size = 1 + IMM2_SIZE; -+ break; -+ - case OP_CLASS: - case OP_NCLASS: - size += 1 + 32 / sizeof(pcre_uchar); -@@ -1316,6 +1332,13 @@ - cc += 1 + LINK_SIZE + IMM2_SIZE; - break; - -+ case OP_THEN: -+ stack_restore = TRUE; -+ if (common->control_head_ptr != 0) -+ *needs_control_head = TRUE; -+ cc ++; -+ break; -+ - default: - stack_restore = TRUE; - /* Fall through. */ -@@ -2220,6 +2243,7 @@ - SLJIT_ASSERT_STOP(); - break; - } -+ SLJIT_ASSERT(current > (sljit_sw*)current[-1]); - current = (sljit_sw*)current[-1]; - } - return -1; -@@ -3209,7 +3233,7 @@ - bytes[0] = len; - } - --static int scan_prefix(compiler_common *common, pcre_uchar *cc, pcre_uint32 *chars, pcre_uint8 *bytes, int max_chars) -+static int scan_prefix(compiler_common *common, pcre_uchar *cc, pcre_uint32 *chars, pcre_uint8 *bytes, int max_chars, pcre_uint32 *rec_count) - { - /* Recursive function, which scans prefix literals. */ - BOOL last, any, caseless; -@@ -3227,9 +3251,14 @@ - repeat = 1; - while (TRUE) - { -+ if (*rec_count == 0) -+ return 0; -+ (*rec_count)--; -+ - last = TRUE; - any = FALSE; - caseless = FALSE; -+ - switch (*cc) - { - case OP_CHARI: -@@ -3291,7 +3320,7 @@ - #ifdef SUPPORT_UTF - if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc); - #endif -- max_chars = scan_prefix(common, cc + len, chars, bytes, max_chars); -+ max_chars = scan_prefix(common, cc + len, chars, bytes, max_chars, rec_count); - if (max_chars == 0) - return consumed; - last = FALSE; -@@ -3314,7 +3343,7 @@ - alternative = cc + GET(cc, 1); - while (*alternative == OP_ALT) - { -- max_chars = scan_prefix(common, alternative + 1 + LINK_SIZE, chars, bytes, max_chars); -+ max_chars = scan_prefix(common, alternative + 1 + LINK_SIZE, chars, bytes, max_chars, rec_count); - if (max_chars == 0) - return consumed; - alternative += GET(alternative, 1); -@@ -3556,6 +3585,7 @@ - int range_right = -1, range_len = 3 - 1; - sljit_ub *update_table = NULL; - BOOL in_range; -+pcre_uint32 rec_count; - - for (i = 0; i < MAX_N_CHARS; i++) - { -@@ -3564,7 +3594,8 @@ - bytes[i * MAX_N_BYTES] = 0; - } - --max = scan_prefix(common, common->start, chars, bytes, MAX_N_CHARS); -+rec_count = 10000; -+max = scan_prefix(common, common->start, chars, bytes, MAX_N_CHARS, &rec_count); - - if (max <= 1) - return FALSE; -@@ -4311,8 +4342,10 @@ - case 4: - if ((ranges[1] - ranges[0]) == (ranges[3] - ranges[2]) - && (ranges[0] | (ranges[2] - ranges[0])) == ranges[2] -+ && (ranges[1] & (ranges[2] - ranges[0])) == 0 - && is_powerof2(ranges[2] - ranges[0])) - { -+ SLJIT_ASSERT((ranges[0] & (ranges[2] - ranges[0])) == 0 && (ranges[2] & ranges[3] & (ranges[2] - ranges[0])) != 0); - OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[2] - ranges[0]); - if (ranges[2] + 1 != ranges[3]) - { -@@ -4900,9 +4933,10 @@ - if (!check_class_ranges(common, (const pcre_uint8 *)cc, FALSE, TRUE, list)) - { - #ifdef COMPILE_PCRE8 -- SLJIT_ASSERT(common->utf); -+ jump = NULL; -+ if (common->utf) - #endif -- jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255); -+ jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255); - - OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7); - OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3); -@@ -4911,7 +4945,10 @@ - OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0); - add_jump(compiler, list, JUMP(SLJIT_NOT_ZERO)); - -- JUMPHERE(jump); -+#ifdef COMPILE_PCRE8 -+ if (common->utf) -+#endif -+ JUMPHERE(jump); - } - - OP1(SLJIT_MOV, TMP1, 0, TMP3, 0); -@@ -7665,6 +7702,10 @@ - OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0); - } - -+ /* Even if the match is empty, we need to reset the control head. */ -+ if (needs_control_head) -+ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(stack)); -+ - if (opcode == OP_SBRAPOS || opcode == OP_SCBRAPOS) - add_jump(compiler, &emptymatch, CMP(SLJIT_EQUAL, TMP1, 0, STR_PTR, 0)); - -@@ -7692,6 +7733,10 @@ - OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), (framesize + 1) * sizeof(sljit_sw), STR_PTR, 0); - } - -+ /* Even if the match is empty, we need to reset the control head. */ -+ if (needs_control_head) -+ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(stack)); -+ - if (opcode == OP_SBRAPOS || opcode == OP_SCBRAPOS) - add_jump(compiler, &emptymatch, CMP(SLJIT_EQUAL, TMP1, 0, STR_PTR, 0)); - -@@ -7704,9 +7749,6 @@ - } - } - -- if (needs_control_head) -- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_MEM1(STACK_TOP), STACK(stack)); -- - JUMPTO(SLJIT_JUMP, loop); - flush_stubs(common); - -@@ -8441,8 +8483,7 @@ - OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), STR_PTR, 0); - } - BACKTRACK_AS(braminzero_backtrack)->matchingpath = LABEL(); -- if (cc[1] > OP_ASSERTBACK_NOT) -- count_match(common); -+ count_match(common); - break; - - case OP_ONCE: -@@ -9624,7 +9665,7 @@ - DEFINE_COMPILER; - pcre_uchar *cc = common->start + common->currententry->start; - pcre_uchar *ccbegin = cc + 1 + LINK_SIZE + (*cc == OP_BRA ? 0 : IMM2_SIZE); --pcre_uchar *ccend = bracketend(cc); -+pcre_uchar *ccend = bracketend(cc) - (1 + LINK_SIZE); - BOOL needs_control_head; - int framesize = get_framesize(common, cc, NULL, TRUE, &needs_control_head); - int private_data_size = get_private_data_copy_length(common, ccbegin, ccend, needs_control_head); -@@ -9648,6 +9689,7 @@ - - sljit_emit_fast_enter(compiler, TMP2, 0); - allocate_stack(common, private_data_size + framesize + alternativesize); -+count_match(common); - OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(private_data_size + framesize + alternativesize - 1), TMP2, 0); - copy_private_data(common, ccbegin, ccend, TRUE, private_data_size + framesize + alternativesize, framesize + alternativesize, needs_control_head); - if (needs_control_head) -@@ -9992,6 +10034,7 @@ - OP1(SLJIT_MOV_UI, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, limit_match)); - OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(struct sljit_stack, base)); - OP1(SLJIT_MOV, STACK_LIMIT, 0, SLJIT_MEM1(TMP2), SLJIT_OFFSETOF(struct sljit_stack, limit)); -+OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1); - OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LIMIT_MATCH, TMP1, 0); - - if (mode == JIT_PARTIAL_SOFT_COMPILE) -Index: RunGrepTest -=================================================================== ---- RunGrepTest (revision 1554) -+++ RunGrepTest (working copy) -@@ -512,6 +512,14 @@ - (cd $srcdir; $valgrind $pcregrep --line-offsets '(?<=\Ka)' $builddir/testtemp1grep) >>testtrygrep 2>&1 - echo "RC=$?" >>testtrygrep - -+echo "---------------------------- Test 108 ------------------------------" >>testtrygrep -+(cd $srcdir; $valgrind $pcregrep -lq PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtrygrep -+echo "RC=$?" >>testtrygrep -+ -+echo "---------------------------- Test 109 -----------------------------" >>testtrygrep -+(cd $srcdir; $valgrind $pcregrep -cq lazy ./testdata/grepinput*) >>testtrygrep -+echo "RC=$?" >>testtrygrep -+ - # Now compare the results. - - $cf $srcdir/testdata/grepoutput testtrygrep -Index: pcre_compile.c -=================================================================== ---- pcre_compile.c (revision 1554) -+++ pcre_compile.c (working copy) -@@ -174,7 +174,7 @@ - -ESC_Z, CHAR_LEFT_SQUARE_BRACKET, - CHAR_BACKSLASH, CHAR_RIGHT_SQUARE_BRACKET, - CHAR_CIRCUMFLEX_ACCENT, CHAR_UNDERSCORE, -- CHAR_GRAVE_ACCENT, 7, -+ CHAR_GRAVE_ACCENT, ESC_a, - -ESC_b, 0, - -ESC_d, ESC_e, - ESC_f, 0, -@@ -202,9 +202,9 @@ - /* 68 */ 0, 0, '|', ',', '%', '_', '>', '?', - /* 70 */ 0, 0, 0, 0, 0, 0, 0, 0, - /* 78 */ 0, '`', ':', '#', '@', '\'', '=', '"', --/* 80 */ 0, 7, -ESC_b, 0, -ESC_d, ESC_e, ESC_f, 0, -+/* 80 */ 0, ESC_a, -ESC_b, 0, -ESC_d, ESC_e, ESC_f, 0, - /* 88 */-ESC_h, 0, 0, '{', 0, 0, 0, 0, --/* 90 */ 0, 0, -ESC_k, 'l', 0, ESC_n, 0, -ESC_p, -+/* 90 */ 0, 0, -ESC_k, 0, 0, ESC_n, 0, -ESC_p, - /* 98 */ 0, ESC_r, 0, '}', 0, 0, 0, 0, - /* A0 */ 0, '~', -ESC_s, ESC_tee, 0,-ESC_v, -ESC_w, 0, - /* A8 */ 0,-ESC_z, 0, 0, 0, '[', 0, 0, -@@ -219,6 +219,12 @@ - /* F0 */ 0, 0, 0, 0, 0, 0, 0, 0, - /* F8 */ 0, 0, 0, 0, 0, 0, 0, 0 - }; -+ -+/* We also need a table of characters that may follow \c in an EBCDIC -+environment for characters 0-31. */ -+ -+static unsigned char ebcdic_escape_c[] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"; -+ - #endif - - -@@ -458,7 +464,7 @@ - "range out of order in character class\0" - "nothing to repeat\0" - /* 10 */ -- "operand of unlimited repeat could match the empty string\0" /** DEAD **/ -+ "internal error: invalid forward reference offset\0" - "internal error: unexpected repeat\0" - "unrecognized character after (? or (?-\0" - "POSIX named classes are supported only within a class\0" -@@ -527,7 +533,11 @@ - "different names for subpatterns of the same number are not allowed\0" - "(*MARK) must have an argument\0" - "this version of PCRE is not compiled with Unicode property support\0" -+#ifndef EBCDIC - "\\c must be followed by an ASCII character\0" -+#else -+ "\\c must be followed by a letter or one of [\\]^_?\0" -+#endif - "\\k is not followed by a braced, angle-bracketed, or quoted name\0" - /* 70 */ - "internal error: unknown opcode in find_fixedlength()\0" -@@ -1425,7 +1435,16 @@ - c ^= 0x40; - #else /* EBCDIC coding */ - if (c >= CHAR_a && c <= CHAR_z) c += 64; -- c ^= 0xC0; -+ if (c == CHAR_QUESTION_MARK) -+ c = ('\\' == 188 && '`' == 74)? 0x5f : 0xff; -+ else -+ { -+ for (i = 0; i < 32; i++) -+ { -+ if (c == ebcdic_escape_c[i]) break; -+ } -+ if (i < 32) c = i; else *errorcodeptr = ERR68; -+ } - #endif - break; - -@@ -1799,7 +1818,7 @@ - case OP_ASSERTBACK: - case OP_ASSERTBACK_NOT: - do cc += GET(cc, 1); while (*cc == OP_ALT); -- cc += PRIV(OP_lengths)[*cc]; -+ cc += 1 + LINK_SIZE; - break; - - /* Skip over things that don't match chars */ -@@ -2487,7 +2506,7 @@ - if (c == OP_BRA || c == OP_BRAPOS || - c == OP_CBRA || c == OP_CBRAPOS || - c == OP_ONCE || c == OP_ONCE_NC || -- c == OP_COND) -+ c == OP_COND || c == OP_SCOND) - { - BOOL empty_branch; - if (GET(code, 1) == 0) return TRUE; /* Hit unclosed bracket */ -@@ -3886,11 +3905,11 @@ - The problem in trying to be exactly like Perl is in the handling of escapes. We - have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX - class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code --below handles the special case of \], but does not try to do any other escape --processing. This makes it different from Perl for cases such as [:l\ower:] --where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize --"l\ower". This is a lesser evil than not diagnosing bad classes when Perl does, --I think. -+below handles the special cases \\ and \], but does not try to do any other -+escape processing. This makes it different from Perl for cases such as -+[:l\ower:] where Perl recognizes it as the POSIX class "lower" but PCRE does -+not recognize "l\ower". This is a lesser evil than not diagnosing bad classes -+when Perl does, I think. - - A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. - It seems that the appearance of a nested POSIX class supersedes an apparent -@@ -3917,21 +3936,16 @@ - terminator = *(++ptr); /* compiler warns about "non-constant" initializer. */ - for (++ptr; *ptr != CHAR_NULL; ptr++) - { -- if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) -+ if (*ptr == CHAR_BACKSLASH && -+ (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET || -+ ptr[1] == CHAR_BACKSLASH)) - ptr++; -- else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; -- else -+ else if ((*ptr == CHAR_LEFT_SQUARE_BRACKET && ptr[1] == terminator) || -+ *ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; -+ else if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) - { -- if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) -- { -- *endptr = ptr; -- return TRUE; -- } -- if (*ptr == CHAR_LEFT_SQUARE_BRACKET && -- (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT || -- ptr[1] == CHAR_EQUALS_SIGN) && -- check_posix_syntax(ptr, endptr)) -- return FALSE; -+ *endptr = ptr; -+ return TRUE; - } - } - return FALSE; -@@ -3985,11 +3999,12 @@ - is called, the partially compiled regex must be temporarily terminated with - OP_END. - --This function has been extended with the possibility of forward references for --recursions and subroutine calls. It must also check the list of such references --for the group we are dealing with. If it finds that one of the recursions in --the current group is on this list, it adjusts the offset in the list, not the --value in the reference (which is a group number). -+This function has been extended to cope with forward references for recursions -+and subroutine calls. It must check the list of such references for the -+group we are dealing with. If it finds that one of the recursions in the -+current group is on this list, it does not adjust the value in the reference -+(which is a group number). After the group has been scanned, all the offsets in -+the forward reference list for the group are adjusted. - - Arguments: - group points to the start of the group -@@ -4005,29 +4020,21 @@ - adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd, - size_t save_hwm_offset) - { -+int offset; -+pcre_uchar *hc; - pcre_uchar *ptr = group; - - while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL) - { -- int offset; -- pcre_uchar *hc; -- -- /* See if this recursion is on the forward reference list. If so, adjust the -- reference. */ -- - for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; - hc += LINK_SIZE) - { - offset = (int)GET(hc, 0); -- if (cd->start_code + offset == ptr + 1) -- { -- PUT(hc, 0, offset + adjust); -- break; -- } -+ if (cd->start_code + offset == ptr + 1) break; - } - -- /* Otherwise, adjust the recursion offset if it's after the start of this -- group. */ -+ /* If we have not found this recursion on the forward reference list, adjust -+ the recursion's offset if it's after the start of this group. */ - - if (hc >= cd->hwm) - { -@@ -4037,6 +4044,15 @@ - - ptr += 1 + LINK_SIZE; - } -+ -+/* Now adjust all forward reference offsets for the group. */ -+ -+for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; -+ hc += LINK_SIZE) -+ { -+ offset = (int)GET(hc, 0); -+ PUT(hc, 0, offset + adjust); -+ } - } - - -@@ -4465,7 +4481,7 @@ - const pcre_uchar *nestptr = NULL; - pcre_uchar *previous = NULL; - pcre_uchar *previous_callout = NULL; --size_t save_hwm_offset = 0; -+size_t item_hwm_offset = 0; - pcre_uint8 classbits[32]; - - /* We can fish out the UTF-8 setting once and for all into a BOOL, but we -@@ -4623,8 +4639,7 @@ - /* In the real compile phase, just check the workspace used by the forward - reference list. */ - -- else if (cd->hwm > cd->start_workspace + cd->workspace_size - -- WORK_SIZE_SAFETY_MARGIN) -+ else if (cd->hwm > cd->start_workspace + cd->workspace_size) - { - *errorcodeptr = ERR52; - goto FAILED; -@@ -4767,6 +4782,7 @@ - zeroreqchar = reqchar; - zeroreqcharflags = reqcharflags; - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY; - break; - -@@ -4818,6 +4834,7 @@ - /* Handle a real character class. */ - - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - - /* PCRE supports POSIX class stuff inside a class. Perl gives an error if - they are encountered at the top level, so we'll do that too. */ -@@ -5195,9 +5212,9 @@ - cd, PRIV(vspace_list)); - continue; - --#ifdef SUPPORT_UCP - case ESC_p: - case ESC_P: -+#ifdef SUPPORT_UCP - { - BOOL negated; - unsigned int ptype = 0, pdata = 0; -@@ -5211,6 +5228,9 @@ - class_has_8bitchar--; /* Undo! */ - continue; - } -+#else -+ *errorcodeptr = ERR45; -+ goto FAILED; - #endif - /* Unrecognized escapes are faulted if PCRE is running in its - strict mode. By default, for compatibility with Perl, they are -@@ -5930,7 +5950,7 @@ - { - register int i; - int len = (int)(code - previous); -- size_t base_hwm_offset = save_hwm_offset; -+ size_t base_hwm_offset = item_hwm_offset; - pcre_uchar *bralink = NULL; - pcre_uchar *brazeroptr = NULL; - -@@ -5985,7 +6005,7 @@ - if (repeat_max <= 1) /* Covers 0, 1, and unlimited */ - { - *code = OP_END; -- adjust_recurse(previous, 1, utf, cd, save_hwm_offset); -+ adjust_recurse(previous, 1, utf, cd, item_hwm_offset); - memmove(previous + 1, previous, IN_UCHARS(len)); - code++; - if (repeat_max == 0) -@@ -6009,7 +6029,7 @@ - { - int offset; - *code = OP_END; -- adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm_offset); -+ adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset); - memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len)); - code += 2 + LINK_SIZE; - *previous++ = OP_BRAZERO + repeat_type; -@@ -6254,6 +6274,12 @@ - while (*scode == OP_ALT); - } - -+ /* A conditional group with only one branch has an implicit empty -+ alternative branch. */ -+ -+ if (*bracode == OP_COND && bracode[GET(bracode,1)] != OP_ALT) -+ *bracode = OP_SCOND; -+ - /* Handle possessive quantifiers. */ - - if (possessive_quantifier) -@@ -6267,11 +6293,11 @@ - { - int nlen = (int)(code - bracode); - *code = OP_END; -- adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); -+ adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); - memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen)); - code += 1 + LINK_SIZE; - nlen += 1 + LINK_SIZE; -- *bracode = OP_BRAPOS; -+ *bracode = (*bracode == OP_COND)? OP_BRAPOS : OP_SBRAPOS; - *code++ = OP_KETRPOS; - PUTINC(code, 0, nlen); - PUT(bracode, 1, nlen); -@@ -6401,7 +6427,7 @@ - else - { - *code = OP_END; -- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); -+ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); - memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); - code += 1 + LINK_SIZE; - len += 1 + LINK_SIZE; -@@ -6450,7 +6476,7 @@ - - default: - *code = OP_END; -- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); -+ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); - memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); - code += 1 + LINK_SIZE; - len += 1 + LINK_SIZE; -@@ -6623,7 +6649,7 @@ - newoptions = options; - skipbytes = 0; - bravalue = OP_CBRA; -- save_hwm_offset = cd->hwm - cd->start_workspace; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - reset_bracount = FALSE; - - /* Deal with the extended parentheses; all are introduced by '?', and the -@@ -6641,6 +6667,7 @@ - /* ------------------------------------------------------------ */ - case CHAR_VERTICAL_LINE: /* Reset capture count for each branch */ - reset_bracount = TRUE; -+ cd->dupgroups = TRUE; /* Record (?| encountered */ - /* Fall through */ - - /* ------------------------------------------------------------ */ -@@ -6741,6 +6768,12 @@ - { - while (IS_DIGIT(*ptr)) - { -+ if (recno > INT_MAX / 10 - 1) /* Integer overflow */ -+ { -+ while (IS_DIGIT(*ptr)) ptr++; -+ *errorcodeptr = ERR61; -+ goto FAILED; -+ } - recno = recno * 10 + (int)(*ptr - CHAR_0); - ptr++; - } -@@ -6769,7 +6802,7 @@ - ptr++; - } - namelen = (int)(ptr - name); -- if (lengthptr != NULL) *lengthptr += IMM2_SIZE; -+ if (lengthptr != NULL) skipbytes += IMM2_SIZE; - } - - /* Check the terminator */ -@@ -6875,6 +6908,11 @@ - *errorcodeptr = ERR15; - goto FAILED; - } -+ if (recno > INT_MAX / 10 - 1) /* Integer overflow */ -+ { -+ *errorcodeptr = ERR61; -+ goto FAILED; -+ } - recno = recno * 10 + name[i] - CHAR_0; - } - if (recno == 0) recno = RREF_ANY; -@@ -7151,7 +7189,8 @@ - if (lengthptr != NULL) - { - named_group *ng; -- -+ recno = 0; -+ - if (namelen == 0) - { - *errorcodeptr = ERR62; -@@ -7168,20 +7207,6 @@ - goto FAILED; - } - -- /* The name table does not exist in the first pass; instead we must -- scan the list of names encountered so far in order to get the -- number. If the name is not found, set the value to 0 for a forward -- reference. */ -- -- ng = cd->named_groups; -- for (i = 0; i < cd->names_found; i++, ng++) -- { -- if (namelen == ng->length && -- STRNCMP_UC_UC(name, ng->name, namelen) == 0) -- break; -- } -- recno = (i < cd->names_found)? ng->number : 0; -- - /* Count named back references. */ - - if (!is_recurse) cd->namedrefcount++; -@@ -7191,6 +7216,56 @@ - 16-bit data item. */ - - *lengthptr += IMM2_SIZE; -+ -+ /* If this is a forward reference and we are within a (?|...) group, -+ the reference may end up as the number of a group which we are -+ currently inside, that is, it could be a recursive reference. In the -+ real compile this will be picked up and the reference wrapped with -+ OP_ONCE to make it atomic, so we must space in case this occurs. */ -+ -+ /* In fact, this can happen for a non-forward reference because -+ another group with the same number might be created later. This -+ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance -+ only mode, we finesse the bug by allowing more memory always. */ -+ -+ *lengthptr += 2 + 2*LINK_SIZE; -+ -+ /* It is even worse than that. The current reference may be to an -+ existing named group with a different number (so apparently not -+ recursive) but which later on is also attached to a group with the -+ current number. This can only happen if $(| has been previous -+ encountered. In that case, we allow yet more memory, just in case. -+ (Again, this is fixed "properly" in PCRE2. */ -+ -+ if (cd->dupgroups) *lengthptr += 4 + 4*LINK_SIZE; -+ -+ /* Otherwise, check for recursion here. The name table does not exist -+ in the first pass; instead we must scan the list of names encountered -+ so far in order to get the number. If the name is not found, leave -+ the value of recno as 0 for a forward reference. */ -+ -+ else -+ { -+ ng = cd->named_groups; -+ for (i = 0; i < cd->names_found; i++, ng++) -+ { -+ if (namelen == ng->length && -+ STRNCMP_UC_UC(name, ng->name, namelen) == 0) -+ { -+ open_capitem *oc; -+ recno = ng->number; -+ if (is_recurse) break; -+ for (oc = cd->open_caps; oc != NULL; oc = oc->next) -+ { -+ if (oc->number == recno) -+ { -+ oc->flag = TRUE; -+ break; -+ } -+ } -+ } -+ } -+ } - } - - /* In the real compile, search the name table. We check the name -@@ -7237,8 +7312,6 @@ - for (i++; i < cd->names_found; i++) - { - if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break; -- -- - count++; - cslot += cd->name_entry_size; - } -@@ -7247,6 +7320,7 @@ - { - if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF; - PUT2INC(code, 0, index); - PUT2INC(code, 0, count); -@@ -7284,9 +7358,14 @@ - - - /* ------------------------------------------------------------ */ -- case CHAR_R: /* Recursion */ -- ptr++; /* Same as (?0) */ -- /* Fall through */ -+ case CHAR_R: /* Recursion, same as (?0) */ -+ recno = 0; -+ if (*(++ptr) != CHAR_RIGHT_PARENTHESIS) -+ { -+ *errorcodeptr = ERR29; -+ goto FAILED; -+ } -+ goto HANDLE_RECURSION; - - - /* ------------------------------------------------------------ */ -@@ -7323,7 +7402,15 @@ - - recno = 0; - while(IS_DIGIT(*ptr)) -+ { -+ if (recno > INT_MAX / 10 - 1) /* Integer overflow */ -+ { -+ while (IS_DIGIT(*ptr)) ptr++; -+ *errorcodeptr = ERR61; -+ goto FAILED; -+ } - recno = recno * 10 + *ptr++ - CHAR_0; -+ } - - if (*ptr != (pcre_uchar)terminator) - { -@@ -7360,6 +7447,7 @@ - HANDLE_RECURSION: - - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - called = cd->start_code; - - /* When we are actually compiling, find the bracket that is being -@@ -7561,7 +7649,11 @@ - previous = NULL; - cd->iscondassert = FALSE; - } -- else previous = code; -+ else -+ { -+ previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; -+ } - - *code = bravalue; - tempcode = code; -@@ -7809,7 +7901,7 @@ - const pcre_uchar *p; - pcre_uint32 cf; - -- save_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ -+ item_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ - terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)? - CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE; - -@@ -7838,7 +7930,7 @@ - if (*p != (pcre_uchar)terminator) - { - *errorcodeptr = ERR57; -- break; -+ goto FAILED; - } - ptr++; - goto HANDLE_NUMERICAL_RECURSION; -@@ -7853,7 +7945,7 @@ - ptr[1] != CHAR_APOSTROPHE && ptr[1] != CHAR_LEFT_CURLY_BRACKET)) - { - *errorcodeptr = ERR69; -- break; -+ goto FAILED; - } - is_recurse = FALSE; - terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)? -@@ -7877,6 +7969,7 @@ - HANDLE_REFERENCE: - if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF; - PUT2INC(code, 0, recno); - cd->backref_map |= (recno < 32)? (1 << recno) : 1; -@@ -7906,6 +7999,7 @@ - if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr)) - goto FAILED; - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP; - *code++ = ptype; - *code++ = pdata; -@@ -7946,6 +8040,7 @@ - - { - previous = (escape > ESC_b && escape < ESC_Z)? code : NULL; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape; - } - } -@@ -7989,6 +8084,7 @@ - - ONE_CHAR: - previous = code; -+ item_hwm_offset = cd->hwm - cd->start_workspace; - - /* For caseless UTF-8 mode when UCP support is available, check whether - this character has more than one other case. If so, generate a special -@@ -9164,6 +9260,7 @@ - cd->name_entry_size = 0; - cd->name_table = NULL; - cd->dupnames = FALSE; -+cd->dupgroups = FALSE; - cd->namedrefcount = 0; - cd->start_code = cworkspace; - cd->hwm = cworkspace; -@@ -9198,7 +9295,7 @@ - - DPRINTF(("end pre-compile: length=%d workspace=%d\n", length, - (int)(cd->hwm - cworkspace))); -- -+ - if (length > MAX_PATTERN_SIZE) - { - errorcode = ERR20; -@@ -9336,6 +9433,16 @@ - int offset, recno; - cd->hwm -= LINK_SIZE; - offset = GET(cd->hwm, 0); -+ -+ /* Check that the hwm handling hasn't gone wrong. This whole area is -+ rewritten in PCRE2 because there are some obscure cases. */ -+ -+ if (offset == 0 || codestart[offset-1] != OP_RECURSE) -+ { -+ errorcode = ERR10; -+ break; -+ } -+ - recno = GET(codestart, offset); - if (recno != prev_recno) - { -@@ -9366,7 +9473,7 @@ - "const" attribute if the cast (pcre_uchar *)codestart is used directly in the - function call. */ - --if ((options & PCRE_NO_AUTO_POSSESS) == 0) -+if (errorcode == 0 && (options & PCRE_NO_AUTO_POSSESS) == 0) - { - pcre_uchar *temp = (pcre_uchar *)codestart; - auto_possessify(temp, utf, cd); -@@ -9380,7 +9487,7 @@ - exceptional ones forgo this. We scan the pattern to check that they are fixed - length, and set their lengths. */ - --if (cd->check_lookbehind) -+if (errorcode == 0 && cd->check_lookbehind) - { - pcre_uchar *cc = (pcre_uchar *)codestart; - -@@ -9593,4 +9700,3 @@ - } - - /* End of pcre_compile.c */ -- -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 1554) -+++ ChangeLog (working copy) -@@ -1,6 +1,162 @@ - ChangeLog for PCRE - ------------------ - -+Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All -+development is happening in the PCRE2 10.xx series. -+ -+Version 8.38 xx-xxx-xxxx -+------------------------ -+ -+1. If a group that contained a recursive back reference also contained a -+ forward reference subroutine call followed by a non-forward-reference -+ subroutine call, for example /.((?2)(?R)\1)()/, pcre2_compile() failed to -+ compile correct code, leading to undefined behaviour or an internally -+ detected error. This bug was discovered by the LLVM fuzzer. -+ -+2. Quantification of certain items (e.g. atomic back references) could cause -+ incorrect code to be compiled when recursive forward references were -+ involved. For example, in this pattern: /(?1)()((((((\1++))\x85)+)|))/. -+ This bug was discovered by the LLVM fuzzer. -+ -+3. A repeated conditional group whose condition was a reference by name caused -+ a buffer overflow if there was more than one group with the given name. -+ This bug was discovered by the LLVM fuzzer. -+ -+4. A recursive back reference by name within a group that had the same name as -+ another group caused a buffer overflow. For example: -+ /(?J)(?'d'(?'d'\g{d}))/. This bug was discovered by the LLVM fuzzer. -+ -+5. A forward reference by name to a group whose number is the same as the -+ current group, for example in this pattern: /(?|(\k'Pm')|(?'Pm'))/, caused -+ a buffer overflow at compile time. This bug was discovered by the LLVM -+ fuzzer. -+ -+6. A lookbehind assertion within a set of mutually recursive subpatterns could -+ provoke a buffer overflow. This bug was discovered by the LLVM fuzzer. -+ -+7. Another buffer overflow bug involved duplicate named groups with a -+ reference between their definition, with a group that reset capture -+ numbers, for example: /(?J:(?|(?'R')(\k'R')|((?'R'))))/. This has been -+ fixed by always allowing for more memory, even if not needed. (A proper fix -+ is implemented in PCRE2, but it involves more refactoring.) -+ -+8. There was no check for integer overflow in subroutine calls such as (?123). -+ -+9. The table entry for \l in EBCDIC environments was incorrect, leading to its -+ being treated as a literal 'l' instead of causing an error. -+ -+10. There was a buffer overflow if pcre_exec() was called with an ovector of -+ size 1. This bug was found by american fuzzy lop. -+ -+11. If a non-capturing group containing a conditional group that could match -+ an empty string was repeated, it was not identified as matching an empty -+ string itself. For example: /^(?:(?(1)x|)+)+$()/. -+ -+12. In an EBCDIC environment, pcretest was mishandling the escape sequences -+ \a and \e in test subject lines. -+ -+13. In an EBCDIC environment, \a in a pattern was converted to the ASCII -+ instead of the EBCDIC value. -+ -+14. The handling of \c in an EBCDIC environment has been revised so that it is -+ now compatible with the specification in Perl's perlebcdic page. -+ -+15. The EBCDIC character 0x41 is a non-breaking space, equivalent to 0xa0 in -+ ASCII/Unicode. This has now been added to the list of characters that are -+ recognized as white space in EBCDIC. -+ -+16. When PCRE was compiled without UCP support, the use of \p and \P gave an -+ error (correctly) when used outside a class, but did not give an error -+ within a class. -+ -+17. \h within a class was incorrectly compiled in EBCDIC environments. -+ -+18. A pattern with an unmatched closing parenthesis that contained a backward -+ assertion which itself contained a forward reference caused buffer -+ overflow. And example pattern is: /(?=di(?<=(?1))|(?=(.))))/. -+ -+19. JIT should return with error when the compiled pattern requires more stack -+ space than the maximum. -+ -+20. A possessively repeated conditional group that could match an empty string, -+ for example, /(?(R))*+/, was incorrectly compiled. -+ -+21. Fix infinite recursion in the JIT compiler when certain patterns such as -+ /(?:|a|){100}x/ are analysed. -+ -+22. Some patterns with character classes involving [: and \\ were incorrectly -+ compiled and could cause reading from uninitialized memory or an incorrect -+ error diagnosis. -+ -+23. Pathological patterns containing many nested occurrences of [: caused -+ pcre_compile() to run for a very long time. -+ -+24. A conditional group with only one branch has an implicit empty alternative -+ branch and must therefore be treated as potentially matching an empty -+ string. -+ -+25. If (?R was followed by - or + incorrect behaviour happened instead of a -+ diagnostic. -+ -+26. Arrange to give up on finding the minimum matching length for overly -+ complex patterns. -+ -+27. Similar to (4) above: in a pattern with duplicated named groups and an -+ occurrence of (?| it is possible for an apparently non-recursive back -+ reference to become recursive if a later named group with the relevant -+ number is encountered. This could lead to a buffer overflow. Wen Guanxing -+ from Venustech ADLAB discovered this bug. -+ -+28. If pcregrep was given the -q option with -c or -l, or when handling a -+ binary file, it incorrectly wrote output to stdout. -+ -+29. The JIT compiler did not restore the control verb head in case of *THEN -+ control verbs. This issue was found by Karl Skomski with a custom LLVM -+ fuzzer. -+ -+30. Error messages for syntax errors following \g and \k were giving inaccurate -+ offsets in the pattern. -+ -+31. Added a check for integer overflow in conditions (?() and -+ (?(R). This omission was discovered by Karl Skomski with the LLVM -+ fuzzer. -+ -+32. Handling recursive references such as (?2) when the reference is to a group -+ later in the pattern uses code that is very hacked about and error-prone. -+ It has been re-written for PCRE2. Here in PCRE1, a check has been added to -+ give an internal error if it is obvious that compiling has gone wrong. -+ -+33. The JIT compiler should not check repeats after a {0,1} repeat byte code. -+ This issue was found by Karl Skomski with a custom LLVM fuzzer. -+ -+34. The JIT compiler should restore the control chain for empty possessive -+ repeats. This issue was found by Karl Skomski with a custom LLVM fuzzer. -+ -+35. Match limit check added to JIT recursion. This issue was found by Karl -+ Skomski with a custom LLVM fuzzer. -+ -+36. Yet another case similar to 27 above has been circumvented by an -+ unconditional allocation of extra memory. This issue is fixed "properly" in -+ PCRE2 by refactoring the way references are handled. Wen Guanxing -+ from Venustech ADLAB discovered this bug. -+ -+37. Fix two assertion fails in JIT. These issues were found by Karl Skomski -+ with a custom LLVM fuzzer. -+ -+38. Fixed a corner case of range optimization in JIT. -+ -+39. An incorrect error "overran compiling workspace" was given if there were -+ exactly enough group forward references such that the last one extended -+ into the workspace safety margin. The next one would have expanded the -+ workspace. The test for overflow was not including the safety margin. -+ -+40. A match limit issue is fixed in JIT which was found by Karl Skomski -+ with a custom LLVM fuzzer. -+ -+41. Remove the use of /dev/null in testdata/testinput2, because it doesn't -+ work under Windows. (Why has it taken so long for anyone to notice?) -+ -+ - Version 8.37 28-April-2015 - -------------------------- - -Index: pcretest.c -=================================================================== ---- pcretest.c (revision 1554) -+++ pcretest.c (working copy) -@@ -4621,9 +4621,9 @@ - - else switch ((c = *p++)) - { -- case 'a': c = 7; break; -+ case 'a': c = CHAR_BEL; break; - case 'b': c = '\b'; break; -- case 'e': c = 27; break; -+ case 'e': c = CHAR_ESC; break; - case 'f': c = '\f'; break; - case 'n': c = '\n'; break; - case 'r': c = '\r'; break; -Index: sljit/sljitLir.c -=================================================================== ---- sljit/sljitLir.c (revision 1554) -+++ sljit/sljitLir.c (working copy) -@@ -845,8 +845,8 @@ - } - - static SLJIT_CONST char* op0_names[] = { -- (char*)"breakpoint", (char*)"nop", -- (char*)"lumul", (char*)"lsmul", (char*)"ludiv", (char*)"lsdiv", -+ (char*)"breakpoint", (char*)"nop", (char*)"lumul", (char*)"lsmul", -+ (char*)"udivmod", (char*)"sdivmod", (char*)"udivi", (char*)"sdivi" - }; - - static SLJIT_CONST char* op1_names[] = { -@@ -1036,7 +1036,7 @@ - { - #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) - CHECK_ARGUMENT((op >= SLJIT_BREAKPOINT && op <= SLJIT_LSMUL) -- || ((op & ~SLJIT_INT_OP) >= SLJIT_LUDIV && (op & ~SLJIT_INT_OP) <= SLJIT_LSDIV)); -+ || ((op & ~SLJIT_INT_OP) >= SLJIT_UDIVMOD && (op & ~SLJIT_INT_OP) <= SLJIT_SDIVI)); - CHECK_ARGUMENT(op < SLJIT_LUMUL || compiler->scratches >= 2); - #endif - #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) -@@ -1447,6 +1447,8 @@ - - static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset) - { -+ SLJIT_UNUSED_ARG(offset); -+ - #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) - FUNCTION_CHECK_DST(dst, dstw); - #endif -@@ -1462,6 +1464,8 @@ - - static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value) - { -+ SLJIT_UNUSED_ARG(init_value); -+ - #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) - FUNCTION_CHECK_DST(dst, dstw); - #endif -Index: sljit/sljitNativeSPARC_common.c -=================================================================== ---- sljit/sljitNativeSPARC_common.c (revision 1554) -+++ sljit/sljitNativeSPARC_common.c (working copy) -@@ -777,20 +777,25 @@ - #else - #error "Implementation required" - #endif -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: -+ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); - #if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) -- if (op == SLJIT_LUDIV) -+ if ((op | 0x2) == SLJIT_UDIVI) - FAIL_IF(push_inst(compiler, WRY | S1(0), MOVABLE_INS)); - else { - FAIL_IF(push_inst(compiler, SRA | D(TMP_REG1) | S1(SLJIT_R0) | IMM(31), DR(TMP_REG1))); - FAIL_IF(push_inst(compiler, WRY | S1(TMP_REG1), MOVABLE_INS)); - } -- FAIL_IF(push_inst(compiler, OR | D(TMP_REG2) | S1(0) | S2(SLJIT_R0), DR(TMP_REG2))); -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? UDIV : SDIV) | D(SLJIT_R0) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R0))); -+ if (op <= SLJIT_SDIVMOD) -+ FAIL_IF(push_inst(compiler, OR | D(TMP_REG2) | S1(0) | S2(SLJIT_R0), DR(TMP_REG2))); -+ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? UDIV : SDIV) | D(SLJIT_R0) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R0))); -+ if (op >= SLJIT_UDIVI) -+ return SLJIT_SUCCESS; - FAIL_IF(push_inst(compiler, SMUL | D(SLJIT_R1) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R1))); -- FAIL_IF(push_inst(compiler, SUB | D(SLJIT_R1) | S1(TMP_REG2) | S2(SLJIT_R1), DR(SLJIT_R1))); -- return SLJIT_SUCCESS; -+ return push_inst(compiler, SUB | D(SLJIT_R1) | S1(TMP_REG2) | S2(SLJIT_R1), DR(SLJIT_R1)); - #else - #error "Implementation required" - #endif -Index: sljit/sljitNativeMIPS_common.c -=================================================================== ---- sljit/sljitNativeMIPS_common.c (revision 1554) -+++ sljit/sljitNativeMIPS_common.c (working copy) -@@ -1053,8 +1053,11 @@ - #endif - FAIL_IF(push_inst(compiler, MFLO | D(SLJIT_R0), DR(SLJIT_R0))); - return push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1)); -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: -+ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); - #if !(defined SLJIT_MIPS_R1 && SLJIT_MIPS_R1) - FAIL_IF(push_inst(compiler, NOP, UNMOVABLE_INS)); - FAIL_IF(push_inst(compiler, NOP, UNMOVABLE_INS)); -@@ -1062,15 +1065,15 @@ - - #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) - if (int_op) -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); -+ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); - else -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DDIVU : DDIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); -+ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? DDIVU : DDIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); - #else -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); -+ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); - #endif - - FAIL_IF(push_inst(compiler, MFLO | D(SLJIT_R0), DR(SLJIT_R0))); -- return push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1)); -+ return (op >= SLJIT_UDIVI) ? SLJIT_SUCCESS : push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1)); - } - - return SLJIT_SUCCESS; -Index: sljit/sljitNativeARM_32.c -=================================================================== ---- sljit/sljitNativeARM_32.c (revision 1554) -+++ sljit/sljitNativeARM_32.c (working copy) -@@ -1833,18 +1833,33 @@ - | (reg_map[SLJIT_R0] << 8) - | reg_map[TMP_REG1]); - #endif -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -- if (compiler->scratches >= 3) -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: -+ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); -+ SLJIT_COMPILE_ASSERT(reg_map[2] == 1 && reg_map[3] == 2, bad_register_mapping); -+ -+ if ((op >= SLJIT_UDIVI) && (compiler->scratches >= 3)) { - FAIL_IF(push_inst(compiler, 0xe52d2008 /* str r2, [sp, #-8]! */)); -+ FAIL_IF(push_inst(compiler, 0xe58d1004 /* str r1, [sp, #4] */)); -+ } -+ else if ((op >= SLJIT_UDIVI) || (compiler->scratches >= 3)) -+ FAIL_IF(push_inst(compiler, 0xe52d0008 | (op >= SLJIT_UDIVI ? 0x1000 : 0x2000) /* str r1/r2, [sp, #-8]! */)); -+ - #if defined(__GNUC__) - FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM, -- (op == SLJIT_LUDIV ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); -+ ((op | 0x2) == SLJIT_UDIVI ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); - #else - #error "Software divmod functions are needed" - #endif -- if (compiler->scratches >= 3) -- return push_inst(compiler, 0xe49d2008 /* ldr r2, [sp], #8 */); -+ -+ if ((op >= SLJIT_UDIVI) && (compiler->scratches >= 3)) { -+ FAIL_IF(push_inst(compiler, 0xe59d1004 /* ldr r1, [sp, #4] */)); -+ FAIL_IF(push_inst(compiler, 0xe49d2008 /* ldr r2, [sp], #8 */)); -+ } -+ else if ((op >= SLJIT_UDIVI) || (compiler->scratches >= 3)) -+ return push_inst(compiler, 0xe49d0008 | (op >= SLJIT_UDIVI ? 0x1000 : 0x2000) /* ldr r1/r2, [sp], #8 */); - return SLJIT_SUCCESS; - } - -Index: sljit/sljitLir.h -=================================================================== ---- sljit/sljitLir.h (revision 1554) -+++ sljit/sljitLir.h (working copy) -@@ -687,7 +687,7 @@ - #define SLJIT_OP0_BASE 0 - - /* Flags: - (never set any flags) -- Note: breakpoint instruction is not supported by all architectures (namely ppc) -+ Note: breakpoint instruction is not supported by all architectures (e.g. ppc) - It falls back to SLJIT_NOP in those cases. */ - #define SLJIT_BREAKPOINT (SLJIT_OP0_BASE + 0) - /* Flags: - (never set any flags) -@@ -696,24 +696,42 @@ - #define SLJIT_NOP (SLJIT_OP0_BASE + 1) - /* Flags: - (may destroy flags) - Unsigned multiplication of SLJIT_R0 and SLJIT_R1. -- Result goes to SLJIT_R1:SLJIT_R0 (high:low) word */ -+ Result is placed into SLJIT_R1:SLJIT_R0 (high:low) word */ - #define SLJIT_LUMUL (SLJIT_OP0_BASE + 2) - /* Flags: - (may destroy flags) - Signed multiplication of SLJIT_R0 and SLJIT_R1. -- Result goes to SLJIT_R1:SLJIT_R0 (high:low) word */ -+ Result is placed into SLJIT_R1:SLJIT_R0 (high:low) word */ - #define SLJIT_LSMUL (SLJIT_OP0_BASE + 3) - /* Flags: I - (may destroy flags) - Unsigned divide of the value in SLJIT_R0 by the value in SLJIT_R1. -- The result is placed in SLJIT_R0 and the remainder goes to SLJIT_R1. -- Note: if SLJIT_R1 contains 0, the behaviour is undefined. */ --#define SLJIT_LUDIV (SLJIT_OP0_BASE + 4) --#define SLJIT_ILUDIV (SLJIT_LUDIV | SLJIT_INT_OP) -+ The result is placed into SLJIT_R0 and the remainder into SLJIT_R1. -+ Note: if SLJIT_R1 is 0, the behaviour is undefined. */ -+#define SLJIT_UDIVMOD (SLJIT_OP0_BASE + 4) -+#define SLJIT_IUDIVMOD (SLJIT_UDIVMOD | SLJIT_INT_OP) - /* Flags: I - (may destroy flags) - Signed divide of the value in SLJIT_R0 by the value in SLJIT_R1. -- The result is placed in SLJIT_R0 and the remainder goes to SLJIT_R1. -- Note: if SLJIT_R1 contains 0, the behaviour is undefined. */ --#define SLJIT_LSDIV (SLJIT_OP0_BASE + 5) --#define SLJIT_ILSDIV (SLJIT_LSDIV | SLJIT_INT_OP) -+ The result is placed into SLJIT_R0 and the remainder into SLJIT_R1. -+ Note: if SLJIT_R1 is 0, the behaviour is undefined. -+ Note: if SLJIT_R1 is -1 and SLJIT_R0 is integer min (0x800..00), -+ the behaviour is undefined. */ -+#define SLJIT_SDIVMOD (SLJIT_OP0_BASE + 5) -+#define SLJIT_ISDIVMOD (SLJIT_SDIVMOD | SLJIT_INT_OP) -+/* Flags: I - (may destroy flags) -+ Unsigned divide of the value in SLJIT_R0 by the value in SLJIT_R1. -+ The result is placed into SLJIT_R0. SLJIT_R1 preserves its value. -+ Note: if SLJIT_R1 is 0, the behaviour is undefined. -+ Note: SLJIT_SDIV is single precision divide. */ -+#define SLJIT_UDIVI (SLJIT_OP0_BASE + 6) -+#define SLJIT_IUDIVI (SLJIT_UDIVI | SLJIT_INT_OP) -+/* Flags: I - (may destroy flags) -+ Signed divide of the value in SLJIT_R0 by the value in SLJIT_R1. -+ The result is placed into SLJIT_R0. SLJIT_R1 preserves its value. -+ Note: if SLJIT_R1 is 0, the behaviour is undefined. -+ Note: if SLJIT_R1 is -1 and SLJIT_R0 is integer min (0x800..00), -+ the behaviour is undefined. -+ Note: SLJIT_SDIV is single precision divide. */ -+#define SLJIT_SDIVI (SLJIT_OP0_BASE + 7) -+#define SLJIT_ISDIVI (SLJIT_SDIVI | SLJIT_INT_OP) - - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op); - -@@ -851,34 +869,6 @@ - sljit_si src1, sljit_sw src1w, - sljit_si src2, sljit_sw src2w); - --/* The following function is a helper function for sljit_emit_op_custom. -- It returns with the real machine register index ( >=0 ) of any SLJIT_R, -- SLJIT_S and SLJIT_SP registers. -- -- Note: it returns with -1 for virtual registers (only on x86-32). */ -- --SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg); -- --/* The following function is a helper function for sljit_emit_op_custom. -- It returns with the real machine register index of any SLJIT_FLOAT register. -- -- Note: the index is always an even number on ARM (except ARM-64), MIPS, and SPARC. */ -- --SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_float_register_index(sljit_si reg); -- --/* Any instruction can be inserted into the instruction stream by -- sljit_emit_op_custom. It has a similar purpose as inline assembly. -- The size parameter must match to the instruction size of the target -- architecture: -- -- x86: 0 < size <= 15. The instruction argument can be byte aligned. -- Thumb2: if size == 2, the instruction argument must be 2 byte aligned. -- if size == 4, the instruction argument must be 4 byte aligned. -- Otherwise: size must be 4 and instruction argument must be 4 byte aligned. */ -- --SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler, -- void *instruction, sljit_si size); -- - /* Returns with non-zero if fpu is available. */ - - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_is_fpu_available(void); -@@ -1196,4 +1186,64 @@ - - #endif /* !(defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL) */ - -+/* --------------------------------------------------------------------- */ -+/* CPU specific functions */ -+/* --------------------------------------------------------------------- */ -+ -+/* The following function is a helper function for sljit_emit_op_custom. -+ It returns with the real machine register index ( >=0 ) of any SLJIT_R, -+ SLJIT_S and SLJIT_SP registers. -+ -+ Note: it returns with -1 for virtual registers (only on x86-32). */ -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg); -+ -+/* The following function is a helper function for sljit_emit_op_custom. -+ It returns with the real machine register index of any SLJIT_FLOAT register. -+ -+ Note: the index is always an even number on ARM (except ARM-64), MIPS, and SPARC. */ -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_float_register_index(sljit_si reg); -+ -+/* Any instruction can be inserted into the instruction stream by -+ sljit_emit_op_custom. It has a similar purpose as inline assembly. -+ The size parameter must match to the instruction size of the target -+ architecture: -+ -+ x86: 0 < size <= 15. The instruction argument can be byte aligned. -+ Thumb2: if size == 2, the instruction argument must be 2 byte aligned. -+ if size == 4, the instruction argument must be 4 byte aligned. -+ Otherwise: size must be 4 and instruction argument must be 4 byte aligned. */ -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler, -+ void *instruction, sljit_si size); -+ -+#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) -+ -+/* Returns with non-zero if sse2 is available. */ -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_sse2_available(void); -+ -+/* Returns with non-zero if cmov instruction is available. */ -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_cmov_available(void); -+ -+/* Emit a conditional mov instruction on x86 CPUs. This instruction -+ moves src to destination, if the condition is satisfied. Unlike -+ other arithmetic instructions, destination must be a register. -+ Before such instructions are emitted, cmov support should be -+ checked by sljit_x86_is_cmov_available function. -+ type must be between SLJIT_EQUAL and SLJIT_S_ORDERED -+ dst_reg must be a valid register and it can be combined -+ with SLJIT_INT_OP to perform 32 bit arithmetic -+ Flags: I - (never set any flags) -+ */ -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_emit_cmov(struct sljit_compiler *compiler, -+ sljit_si type, -+ sljit_si dst_reg, -+ sljit_si src, sljit_sw srcw); -+ -+#endif -+ - #endif /* _SLJIT_LIR_H_ */ -Index: sljit/sljitNativeARM_64.c -=================================================================== ---- sljit/sljitNativeARM_64.c (revision 1554) -+++ sljit/sljitNativeARM_64.c (working copy) -@@ -1087,7 +1087,8 @@ - saved_regs_size += sizeof(sljit_sw); - } - local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET; -- FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); -+ if (saved_regs_size > 0) -+ FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); - } - - tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; -@@ -1094,7 +1095,12 @@ - prev = -1; - for (i = SLJIT_S0; i >= tmp; i--) { - if (prev == -1) { -- prev = i; -+ if (!(offs & (1 << 15))) { -+ prev = i; -+ continue; -+ } -+ FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5))); -+ offs += 1 << 15; - continue; - } - FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); -@@ -1104,7 +1110,12 @@ - - for (i = scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { - if (prev == -1) { -- prev = i; -+ if (!(offs & (1 << 15))) { -+ prev = i; -+ continue; -+ } -+ FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5))); -+ offs += 1 << 15; - continue; - } - FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); -@@ -1112,8 +1123,7 @@ - prev = -1; - } - -- if (prev != -1) -- FAIL_IF(push_inst(compiler, STRI | RT(prev) | RN(TMP_SP) | (offs >> 5))); -+ SLJIT_ASSERT(prev == -1); - - if (compiler->local_size > (63 * sizeof(sljit_sw))) { - /* The local_size is already adjusted by the saved registers. */ -@@ -1188,7 +1198,12 @@ - prev = -1; - for (i = SLJIT_S0; i >= tmp; i--) { - if (prev == -1) { -- prev = i; -+ if (!(offs & (1 << 15))) { -+ prev = i; -+ continue; -+ } -+ FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5))); -+ offs += 1 << 15; - continue; - } - FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); -@@ -1198,7 +1213,12 @@ - - for (i = compiler->scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { - if (prev == -1) { -- prev = i; -+ if (!(offs & (1 << 15))) { -+ prev = i; -+ continue; -+ } -+ FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5))); -+ offs += 1 << 15; - continue; - } - FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); -@@ -1206,13 +1226,12 @@ - prev = -1; - } - -- if (prev != -1) -- FAIL_IF(push_inst(compiler, LDRI | RT(prev) | RN(TMP_SP) | (offs >> 5))); -+ SLJIT_ASSERT(prev == -1); - - if (compiler->local_size <= (63 * sizeof(sljit_sw))) { - FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) - | RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15))); -- } else { -+ } else if (saved_regs_size > 0) { - FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); - } - -@@ -1242,12 +1261,15 @@ - FAIL_IF(push_inst(compiler, ORR | RD(TMP_REG1) | RN(TMP_ZERO) | RM(SLJIT_R0))); - FAIL_IF(push_inst(compiler, MADD | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1) | RT2(TMP_ZERO))); - return push_inst(compiler, (op == SLJIT_LUMUL ? UMULH : SMULH) | RD(SLJIT_R1) | RN(TMP_REG1) | RM(SLJIT_R1)); -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: - FAIL_IF(push_inst(compiler, (ORR ^ inv_bits) | RD(TMP_REG1) | RN(TMP_ZERO) | RM(SLJIT_R0))); -- FAIL_IF(push_inst(compiler, ((op == SLJIT_LUDIV ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1))); -+ FAIL_IF(push_inst(compiler, ((op == SLJIT_UDIVMOD ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1))); - FAIL_IF(push_inst(compiler, (MADD ^ inv_bits) | RD(SLJIT_R1) | RN(SLJIT_R0) | RM(SLJIT_R1) | RT2(TMP_ZERO))); - return push_inst(compiler, (SUB ^ inv_bits) | RD(SLJIT_R1) | RN(TMP_REG1) | RM(SLJIT_R1)); -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: -+ return push_inst(compiler, ((op == SLJIT_UDIVI ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1)); - } - - return SLJIT_SUCCESS; -Index: sljit/sljitNativeARM_T2_32.c -=================================================================== ---- sljit/sljitNativeARM_T2_32.c (revision 1554) -+++ sljit/sljitNativeARM_T2_32.c (working copy) -@@ -1239,6 +1239,9 @@ - - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op) - { -+ sljit_sw saved_reg_list[3]; -+ sljit_sw saved_reg_count; -+ - CHECK_ERROR(); - CHECK(check_sljit_emit_op0(compiler, op)); - -@@ -1255,24 +1258,53 @@ - | (reg_map[SLJIT_R0] << 12) - | (reg_map[SLJIT_R0] << 16) - | reg_map[SLJIT_R1]); -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -- if (compiler->scratches >= 4) { -- FAIL_IF(push_inst32(compiler, 0xf84d2d04 /* str r2, [sp, #-4]! */)); -- FAIL_IF(push_inst32(compiler, 0xf84dcd04 /* str ip, [sp, #-4]! */)); -- } else if (compiler->scratches >= 3) -- FAIL_IF(push_inst32(compiler, 0xf84d2d08 /* str r2, [sp, #-8]! */)); -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: -+ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); -+ SLJIT_COMPILE_ASSERT(reg_map[2] == 1 && reg_map[3] == 2 && reg_map[4] == 12, bad_register_mapping); -+ -+ saved_reg_count = 0; -+ if (compiler->scratches >= 4) -+ saved_reg_list[saved_reg_count++] = 12; -+ if (compiler->scratches >= 3) -+ saved_reg_list[saved_reg_count++] = 2; -+ if (op >= SLJIT_UDIVI) -+ saved_reg_list[saved_reg_count++] = 1; -+ -+ if (saved_reg_count > 0) { -+ FAIL_IF(push_inst32(compiler, 0xf84d0d00 | (saved_reg_count >= 3 ? 16 : 8) -+ | (saved_reg_list[0] << 12) /* str rX, [sp, #-8/-16]! */)); -+ if (saved_reg_count >= 2) { -+ SLJIT_ASSERT(saved_reg_list[1] < 8); -+ FAIL_IF(push_inst16(compiler, 0x9001 | (saved_reg_list[1] << 8) /* str rX, [sp, #4] */)); -+ } -+ if (saved_reg_count >= 3) { -+ SLJIT_ASSERT(saved_reg_list[2] < 8); -+ FAIL_IF(push_inst16(compiler, 0x9002 | (saved_reg_list[2] << 8) /* str rX, [sp, #8] */)); -+ } -+ } -+ - #if defined(__GNUC__) - FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM, -- (op == SLJIT_LUDIV ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); -+ ((op | 0x2) == SLJIT_UDIVI ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); - #else - #error "Software divmod functions are needed" - #endif -- if (compiler->scratches >= 4) { -- FAIL_IF(push_inst32(compiler, 0xf85dcb04 /* ldr ip, [sp], #4 */)); -- return push_inst32(compiler, 0xf85d2b04 /* ldr r2, [sp], #4 */); -- } else if (compiler->scratches >= 3) -- return push_inst32(compiler, 0xf85d2b08 /* ldr r2, [sp], #8 */); -+ -+ if (saved_reg_count > 0) { -+ if (saved_reg_count >= 3) { -+ SLJIT_ASSERT(saved_reg_list[2] < 8); -+ FAIL_IF(push_inst16(compiler, 0x9802 | (saved_reg_list[2] << 8) /* ldr rX, [sp, #8] */)); -+ } -+ if (saved_reg_count >= 2) { -+ SLJIT_ASSERT(saved_reg_list[1] < 8); -+ FAIL_IF(push_inst16(compiler, 0x9801 | (saved_reg_list[1] << 8) /* ldr rX, [sp, #4] */)); -+ } -+ return push_inst32(compiler, 0xf85d0b00 | (saved_reg_count >= 3 ? 16 : 8) -+ | (saved_reg_list[0] << 12) /* ldr rX, [sp], #8/16 */); -+ } - return SLJIT_SUCCESS; - } - -Index: sljit/sljitNativePPC_common.c -=================================================================== ---- sljit/sljitNativePPC_common.c (revision 1554) -+++ sljit/sljitNativePPC_common.c (working copy) -@@ -1267,22 +1267,23 @@ - FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); - return push_inst(compiler, (op == SLJIT_LUMUL ? MULHWU : MULHW) | D(SLJIT_R1) | A(TMP_REG1) | B(SLJIT_R1)); - #endif -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: - FAIL_IF(push_inst(compiler, OR | S(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R0))); - #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) -- if (int_op) { -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVWU : DIVW) | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); -- FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); -- } else { -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVDU : DIVD) | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); -- FAIL_IF(push_inst(compiler, MULLD | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); -- } -- return push_inst(compiler, SUBF | D(SLJIT_R1) | A(SLJIT_R1) | B(TMP_REG1)); -+ FAIL_IF(push_inst(compiler, (int_op ? (op == SLJIT_UDIVMOD ? DIVWU : DIVW) : (op == SLJIT_UDIVMOD ? DIVDU : DIVD)) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1))); -+ FAIL_IF(push_inst(compiler, (int_op ? MULLW : MULLD) | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); - #else -- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVWU : DIVW) | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); -+ FAIL_IF(push_inst(compiler, (op == SLJIT_UDIVMOD ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1))); - FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); -+#endif - return push_inst(compiler, SUBF | D(SLJIT_R1) | A(SLJIT_R1) | B(TMP_REG1)); -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: -+#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) -+ return push_inst(compiler, (int_op ? (op == SLJIT_UDIVI ? DIVWU : DIVW) : (op == SLJIT_UDIVI ? DIVDU : DIVD)) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1)); -+#else -+ return push_inst(compiler, (op == SLJIT_UDIVI ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1)); - #endif - } - -Index: sljit/sljitNativeX86_common.c -=================================================================== ---- sljit/sljitNativeX86_common.c (revision 1554) -+++ sljit/sljitNativeX86_common.c (working copy) -@@ -273,7 +273,9 @@ - #endif - static sljit_si cpu_has_cmov = -1; - --#if defined(_MSC_VER) && _MSC_VER >= 1400 -+#ifdef _WIN32_WCE -+#include -+#elif defined(_MSC_VER) && _MSC_VER >= 1400 - #include - #endif - -@@ -742,8 +744,10 @@ - break; - case SLJIT_LUMUL: - case SLJIT_LSMUL: -- case SLJIT_LUDIV: -- case SLJIT_LSDIV: -+ case SLJIT_UDIVMOD: -+ case SLJIT_SDIVMOD: -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: - compiler->flags_saved = 0; - #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) - #ifdef _WIN64 -@@ -761,9 +765,10 @@ - #endif - compiler->mode32 = op & SLJIT_INT_OP; - #endif -+ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); - - op = GET_OPCODE(op); -- if (op == SLJIT_LUDIV) { -+ if ((op | 0x2) == SLJIT_UDIVI) { - #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || defined(_WIN64) - EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0); - inst = emit_x86_instruction(compiler, 1, SLJIT_R1, 0, SLJIT_R1, 0); -@@ -774,7 +779,7 @@ - *inst = XOR_r_rm; - } - -- if (op == SLJIT_LSDIV) { -+ if ((op | 0x2) == SLJIT_SDIVI) { - #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || defined(_WIN64) - EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0); - #endif -@@ -805,10 +810,10 @@ - FAIL_IF(!inst); - INC_SIZE(2); - *inst++ = GROUP_F7; -- *inst = MOD_REG | ((op >= SLJIT_LUDIV) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]); -+ *inst = MOD_REG | ((op >= SLJIT_UDIVMOD) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]); - #else - #ifdef _WIN64 -- size = (!compiler->mode32 || op >= SLJIT_LUDIV) ? 3 : 2; -+ size = (!compiler->mode32 || op >= SLJIT_UDIVMOD) ? 3 : 2; - #else - size = (!compiler->mode32) ? 3 : 2; - #endif -@@ -817,11 +822,11 @@ - INC_SIZE(size); - #ifdef _WIN64 - if (!compiler->mode32) -- *inst++ = REX_W | ((op >= SLJIT_LUDIV) ? REX_B : 0); -- else if (op >= SLJIT_LUDIV) -+ *inst++ = REX_W | ((op >= SLJIT_UDIVMOD) ? REX_B : 0); -+ else if (op >= SLJIT_UDIVMOD) - *inst++ = REX_B; - *inst++ = GROUP_F7; -- *inst = MOD_REG | ((op >= SLJIT_LUDIV) ? reg_lmap[TMP_REG1] : reg_lmap[SLJIT_R1]); -+ *inst = MOD_REG | ((op >= SLJIT_UDIVMOD) ? reg_lmap[TMP_REG1] : reg_lmap[SLJIT_R1]); - #else - if (!compiler->mode32) - *inst++ = REX_W; -@@ -836,15 +841,21 @@ - case SLJIT_LSMUL: - *inst |= IMUL; - break; -- case SLJIT_LUDIV: -+ case SLJIT_UDIVMOD: -+ case SLJIT_UDIVI: - *inst |= DIV; - break; -- case SLJIT_LSDIV: -+ case SLJIT_SDIVMOD: -+ case SLJIT_SDIVI: - *inst |= IDIV; - break; - } - #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) && !defined(_WIN64) -- EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0); -+ if (op <= SLJIT_SDIVMOD) -+ EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0); -+#else -+ if (op >= SLJIT_UDIVI) -+ EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0); - #endif - break; - } -@@ -1905,60 +1916,62 @@ - return SLJIT_SUCCESS; - } - -- if (FAST_IS_REG(src1)) { -+ if (!(src1 & SLJIT_IMM)) { - if (src2 & SLJIT_IMM) { - #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) - if (IS_HALFWORD(src2w) || compiler->mode32) { -- inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, 0); -+ inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w); - FAIL_IF(!inst); - *inst = GROUP_F7; - } - else { - FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src2w)); -- inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src1, 0); -+ inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src1, src1w); - FAIL_IF(!inst); - *inst = TEST_rm_r; - } - #else -- inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, 0); -+ inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w); - FAIL_IF(!inst); - *inst = GROUP_F7; - #endif -+ return SLJIT_SUCCESS; - } -- else { -+ else if (FAST_IS_REG(src1)) { - inst = emit_x86_instruction(compiler, 1, src1, 0, src2, src2w); - FAIL_IF(!inst); - *inst = TEST_rm_r; -+ return SLJIT_SUCCESS; - } -- return SLJIT_SUCCESS; - } - -- if (FAST_IS_REG(src2)) { -+ if (!(src2 & SLJIT_IMM)) { - if (src1 & SLJIT_IMM) { - #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) - if (IS_HALFWORD(src1w) || compiler->mode32) { -- inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src1w, src2, 0); -+ inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src1w, src2, src2w); - FAIL_IF(!inst); - *inst = GROUP_F7; - } - else { - FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src1w)); -- inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src2, 0); -+ inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src2, src2w); - FAIL_IF(!inst); - *inst = TEST_rm_r; - } - #else -- inst = emit_x86_instruction(compiler, 1, src1, src1w, src2, 0); -+ inst = emit_x86_instruction(compiler, 1, src1, src1w, src2, src2w); - FAIL_IF(!inst); - *inst = GROUP_F7; - #endif -+ return SLJIT_SUCCESS; - } -- else { -+ else if (FAST_IS_REG(src2)) { - inst = emit_x86_instruction(compiler, 1, src2, 0, src1, src1w); - FAIL_IF(!inst); - *inst = TEST_rm_r; -+ return SLJIT_SUCCESS; - } -- return SLJIT_SUCCESS; - } - - EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w); -@@ -2923,3 +2936,69 @@ - { - *(sljit_sw*)addr = new_constant; - } -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_sse2_available(void) -+{ -+#if (defined SLJIT_DETECT_SSE2 && SLJIT_DETECT_SSE2) -+ if (cpu_has_sse2 == -1) -+ get_cpu_features(); -+ return cpu_has_sse2; -+#else -+ return 1; -+#endif -+} -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_is_cmov_available(void) -+{ -+ if (cpu_has_cmov == -1) -+ get_cpu_features(); -+ return cpu_has_cmov; -+} -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_x86_emit_cmov(struct sljit_compiler *compiler, -+ sljit_si type, -+ sljit_si dst_reg, -+ sljit_si src, sljit_sw srcw) -+{ -+ sljit_ub* inst; -+ -+ CHECK_ERROR(); -+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) -+ CHECK_ARGUMENT(sljit_x86_is_cmov_available()); -+ CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_INT_OP))); -+ CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_D_ORDERED); -+ CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(dst_reg & ~SLJIT_INT_OP)); -+ FUNCTION_CHECK_SRC(src, srcw); -+#endif -+#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) -+ if (SLJIT_UNLIKELY(!!compiler->verbose)) { -+ fprintf(compiler->verbose, " x86_cmov%s %s%s, ", -+ !(dst_reg & SLJIT_INT_OP) ? "" : ".i", -+ JUMP_PREFIX(type), jump_names[type & 0xff]); -+ sljit_verbose_reg(compiler, dst_reg & ~SLJIT_INT_OP); -+ fprintf(compiler->verbose, ", "); -+ sljit_verbose_param(compiler, src, srcw); -+ fprintf(compiler->verbose, "\n"); -+ } -+#endif -+ -+ ADJUST_LOCAL_OFFSET(src, srcw); -+ CHECK_EXTRA_REGS(src, srcw, (void)0); -+ -+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) -+ compiler->mode32 = dst_reg & SLJIT_INT_OP; -+#endif -+ dst_reg &= ~SLJIT_INT_OP; -+ -+ if (SLJIT_UNLIKELY(src & SLJIT_IMM)) { -+ EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, srcw); -+ src = TMP_REG1; -+ srcw = 0; -+ } -+ -+ inst = emit_x86_instruction(compiler, 2, dst_reg, 0, src, srcw); -+ FAIL_IF(!inst); -+ *inst++ = GROUP_0F; -+ *inst = get_jump_code(type & 0xff) - 0x40; -+ return SLJIT_SUCCESS; -+} -Index: sljit/sljitConfigInternal.h -=================================================================== ---- sljit/sljitConfigInternal.h (revision 1554) -+++ sljit/sljitConfigInternal.h (working copy) -@@ -468,8 +468,13 @@ - - #ifndef SLJIT_CALL - --#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) -+#if (defined SLJIT_USE_CDECL_CALLING_CONVENTION && SLJIT_USE_CDECL_CALLING_CONVENTION) - -+/* Force cdecl. */ -+#define SLJIT_CALL -+ -+#elif (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) -+ - #if defined(__GNUC__) && !defined(__APPLE__) - - #define SLJIT_CALL __attribute__ ((fastcall)) -@@ -608,6 +613,12 @@ - #define SLJIT_LOCALS_OFFSET_BASE ((23 + 1) * sizeof(sljit_sw)) - #endif - -+#elif (defined SLJIT_CONFIG_TILEGX && SLJIT_CONFIG_TILEGX) -+ -+#define SLJIT_NUMBER_OF_REGISTERS 10 -+#define SLJIT_NUMBER_OF_SAVED_REGISTERS 5 -+#define SLJIT_LOCALS_OFFSET_BASE 0 -+ - #elif (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - - #define SLJIT_NUMBER_OF_REGISTERS 0 -Index: sljit/sljitConfig.h -=================================================================== ---- sljit/sljitConfig.h (revision 1554) -+++ sljit/sljitConfig.h (working copy) -@@ -96,6 +96,15 @@ - #define SLJIT_EXECUTABLE_ALLOCATOR 1 - #endif - -+/* Force cdecl calling convention even if a better calling -+ convention (e.g. fastcall) is supported by the C compiler. -+ If this option is enabled, C functions without -+ SLJIT_CALL can also be called from JIT code. */ -+#ifndef SLJIT_USE_CDECL_CALLING_CONVENTION -+/* Disabled by default */ -+#define SLJIT_USE_CDECL_CALLING_CONVENTION 0 -+#endif -+ - /* Return with error when an invalid argument is passed. */ - #ifndef SLJIT_ARGUMENT_CHECKS - /* Disabled by default */ -Index: sljit/sljitNativeTILEGX_64.c -=================================================================== ---- sljit/sljitNativeTILEGX_64.c (revision 1554) -+++ sljit/sljitNativeTILEGX_64.c (working copy) -@@ -35,21 +35,21 @@ - #define SIMM_16BIT_MIN (-0x8000) - #define SIMM_17BIT_MAX (0xffff) - #define SIMM_17BIT_MIN (-0x10000) --#define SIMM_32BIT_MIN (-0x80000000) - #define SIMM_32BIT_MAX (0x7fffffff) --#define SIMM_48BIT_MIN (0x800000000000L) -+#define SIMM_32BIT_MIN (-0x7fffffff - 1) - #define SIMM_48BIT_MAX (0x7fffffff0000L) -+#define SIMM_48BIT_MIN (-0x800000000000L) - #define IMM16(imm) ((imm) & 0xffff) - - #define UIMM_16BIT_MAX (0xffff) - --#define TMP_REG1 (SLJIT_NO_REGISTERS + 1) --#define TMP_REG2 (SLJIT_NO_REGISTERS + 2) --#define TMP_REG3 (SLJIT_NO_REGISTERS + 3) --#define ADDR_TMP (SLJIT_NO_REGISTERS + 4) -+#define TMP_REG1 (SLJIT_NUMBER_OF_REGISTERS + 2) -+#define TMP_REG2 (SLJIT_NUMBER_OF_REGISTERS + 3) -+#define TMP_REG3 (SLJIT_NUMBER_OF_REGISTERS + 4) -+#define ADDR_TMP (SLJIT_NUMBER_OF_REGISTERS + 5) - #define PIC_ADDR_REG TMP_REG2 - --static SLJIT_CONST sljit_ub reg_map[SLJIT_NO_REGISTERS + 5] = { -+static SLJIT_CONST sljit_ub reg_map[SLJIT_NUMBER_OF_REGISTERS + 6] = { - 63, 0, 1, 2, 3, 4, 30, 31, 32, 33, 34, 54, 5, 16, 6, 7 - }; - -@@ -58,11 +58,6 @@ - #define TMP_REG2_mapped 16 - #define TMP_REG3_mapped 6 - #define ADDR_TMP_mapped 7 --#define SLJIT_SAVED_REG1_mapped 30 --#define SLJIT_SAVED_REG2_mapped 31 --#define SLJIT_SAVED_REG3_mapped 32 --#define SLJIT_SAVED_EREG1_mapped 33 --#define SLJIT_SAVED_EREG2_mapped 34 - - /* Flags are keept in volatile registers. */ - #define EQUAL_FLAG 8 -@@ -399,6 +394,9 @@ - #define SUB(dst, srca, srcb) \ - push_3_buffer(compiler, TILEGX_OPC_SUB, dst, srca, srcb, __LINE__) - -+#define MUL(dst, srca, srcb) \ -+ push_3_buffer(compiler, TILEGX_OPC_MULX, dst, srca, srcb, __LINE__) -+ - #define NOR(dst, srca, srcb) \ - push_3_buffer(compiler, TILEGX_OPC_NOR, dst, srca, srcb, __LINE__) - -@@ -547,8 +545,8 @@ - - const struct Format* match = NULL; - const struct Format *b = NULL; -- unsigned int i = 0; -- for (i; i < sizeof formats / sizeof formats[0]; i++) { -+ unsigned int i; -+ for (i = 0; i < sizeof formats / sizeof formats[0]; i++) { - b = &formats[i]; - if ((b->pipe_mask & compatible_pipes) == b->pipe_mask) { - match = b; -@@ -625,7 +623,6 @@ - - static sljit_si update_buffer(struct sljit_compiler *compiler) - { -- int count; - int i; - int orig_index = inst_buf_index; - struct jit_instr inst0 = inst_buf[0]; -@@ -738,8 +735,10 @@ - - static sljit_si flush_buffer(struct sljit_compiler *compiler) - { -- while (inst_buf_index != 0) -- update_buffer(compiler); -+ while (inst_buf_index != 0) { -+ FAIL_IF(update_buffer(compiler)); -+ } -+ return SLJIT_SUCCESS; - } - - static sljit_si push_4_buffer(struct sljit_compiler *compiler, tilegx_mnemonic opc, int op0, int op1, int op2, int op3, int line) -@@ -787,6 +786,7 @@ - case TILEGX_OPC_ADD: - case TILEGX_OPC_AND: - case TILEGX_OPC_SUB: -+ case TILEGX_OPC_MULX: - case TILEGX_OPC_OR: - case TILEGX_OPC_XOR: - case TILEGX_OPC_NOR: -@@ -905,7 +905,6 @@ - sljit_sw diff; - sljit_uw target_addr; - sljit_ins *inst; -- sljit_ins saved_inst; - - if (jump->flags & SLJIT_REWRITABLE_JUMP) - return code_ptr; -@@ -1009,7 +1008,7 @@ - struct sljit_const *const_; - - CHECK_ERROR_PTR(); -- check_sljit_generate_code(compiler); -+ CHECK_PTR(check_sljit_generate_code(compiler)); - reverse_buf(compiler); - - code = (sljit_ins *)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins)); -@@ -1178,13 +1177,13 @@ - sljit_si fscratches, sljit_si fsaveds, sljit_si local_size) - { - sljit_ins base; -- sljit_ins bundle = 0; -- -+ sljit_si i, tmp; -+ - CHECK_ERROR(); -- check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size); -+ CHECK(check_sljit_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size)); - set_emit_enter(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size); - -- local_size += (saveds + 1) * sizeof(sljit_sw); -+ local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1); - local_size = (local_size + 7) & ~7; - compiler->local_size = local_size; - -@@ -1200,46 +1199,41 @@ - local_size = 0; - } - -+ /* Save the return address. */ - FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 8)); - FAIL_IF(ST_ADD(ADDR_TMP_mapped, RA, -8)); - -- if (saveds >= 1) -- FAIL_IF(ST_ADD(ADDR_TMP_mapped, SLJIT_SAVED_REG1_mapped, -8)); -+ /* Save the S registers. */ -+ tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; -+ for (i = SLJIT_S0; i >= tmp; i--) { -+ FAIL_IF(ST_ADD(ADDR_TMP_mapped, reg_map[i], -8)); -+ } - -- if (saveds >= 2) -- FAIL_IF(ST_ADD(ADDR_TMP_mapped, SLJIT_SAVED_REG2_mapped, -8)); -+ /* Save the R registers that need to be reserved. */ -+ for (i = scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { -+ FAIL_IF(ST_ADD(ADDR_TMP_mapped, reg_map[i], -8)); -+ } - -- if (saveds >= 3) -- FAIL_IF(ST_ADD(ADDR_TMP_mapped, SLJIT_SAVED_REG3_mapped, -8)); -+ /* Move the arguments to S registers. */ -+ for (i = 0; i < args; i++) { -+ FAIL_IF(ADD(reg_map[SLJIT_S0 - i], i, ZERO)); -+ } - -- if (saveds >= 4) -- FAIL_IF(ST_ADD(ADDR_TMP_mapped, SLJIT_SAVED_EREG1_mapped, -8)); -- -- if (saveds >= 5) -- FAIL_IF(ST_ADD(ADDR_TMP_mapped, SLJIT_SAVED_EREG2_mapped, -8)); -- -- if (args >= 1) -- FAIL_IF(ADD(SLJIT_SAVED_REG1_mapped, 0, ZERO)); -- -- if (args >= 2) -- FAIL_IF(ADD(SLJIT_SAVED_REG2_mapped, 1, ZERO)); -- -- if (args >= 3) -- FAIL_IF(ADD(SLJIT_SAVED_REG3_mapped, 2, ZERO)); -- - return SLJIT_SUCCESS; - } - --SLJIT_API_FUNC_ATTRIBUTE void sljit_set_context(struct sljit_compiler *compiler, -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_set_context(struct sljit_compiler *compiler, - sljit_si options, sljit_si args, sljit_si scratches, sljit_si saveds, - sljit_si fscratches, sljit_si fsaveds, sljit_si local_size) - { -- CHECK_ERROR_VOID(); -- check_sljit_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size); -+ CHECK_ERROR(); -+ CHECK(check_sljit_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size)); - set_set_context(compiler, options, args, scratches, saveds, fscratches, fsaveds, local_size); - -- local_size += (saveds + 1) * sizeof(sljit_sw); -+ local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1); - compiler->local_size = (local_size + 7) & ~7; -+ -+ return SLJIT_SUCCESS; - } - - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_return(struct sljit_compiler *compiler, sljit_si op, sljit_si src, sljit_sw srcw) -@@ -1246,10 +1240,11 @@ - { - sljit_si local_size; - sljit_ins base; -- int addr_initialized = 0; -+ sljit_si i, tmp; -+ sljit_si saveds; - - CHECK_ERROR(); -- check_sljit_emit_return(compiler, op, src, srcw); -+ CHECK(check_sljit_emit_return(compiler, op, src, srcw)); - - FAIL_IF(emit_mov_before_return(compiler, op, src, srcw)); - -@@ -1263,52 +1258,22 @@ - local_size = 0; - } - -+ /* Restore the return address. */ - FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 8)); -- FAIL_IF(LD(RA, ADDR_TMP_mapped)); -+ FAIL_IF(LD_ADD(RA, ADDR_TMP_mapped, -8)); - -- if (compiler->saveds >= 5) { -- FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 48)); -- addr_initialized = 1; -- -- FAIL_IF(LD_ADD(SLJIT_SAVED_EREG2_mapped, ADDR_TMP_mapped, 8)); -+ /* Restore the S registers. */ -+ saveds = compiler->saveds; -+ tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; -+ for (i = SLJIT_S0; i >= tmp; i--) { -+ FAIL_IF(LD_ADD(reg_map[i], ADDR_TMP_mapped, -8)); - } - -- if (compiler->saveds >= 4) { -- if (addr_initialized == 0) { -- FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 40)); -- addr_initialized = 1; -- } -- -- FAIL_IF(LD_ADD(SLJIT_SAVED_EREG1_mapped, ADDR_TMP_mapped, 8)); -+ /* Restore the R registers that need to be reserved. */ -+ for (i = compiler->scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { -+ FAIL_IF(LD_ADD(reg_map[i], ADDR_TMP_mapped, -8)); - } - -- if (compiler->saveds >= 3) { -- if (addr_initialized == 0) { -- FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 32)); -- addr_initialized = 1; -- } -- -- FAIL_IF(LD_ADD(SLJIT_SAVED_REG3_mapped, ADDR_TMP_mapped, 8)); -- } -- -- if (compiler->saveds >= 2) { -- if (addr_initialized == 0) { -- FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 24)); -- addr_initialized = 1; -- } -- -- FAIL_IF(LD_ADD(SLJIT_SAVED_REG2_mapped, ADDR_TMP_mapped, 8)); -- } -- -- if (compiler->saveds >= 1) { -- if (addr_initialized == 0) { -- FAIL_IF(ADDLI(ADDR_TMP_mapped, base, local_size - 16)); -- /* addr_initialized = 1; no need to initialize as it's the last one. */ -- } -- -- FAIL_IF(LD_ADD(SLJIT_SAVED_REG1_mapped, ADDR_TMP_mapped, 8)); -- } -- - if (compiler->local_size <= SIMM_16BIT_MAX) - FAIL_IF(ADDLI(SLJIT_LOCALS_REG_mapped, SLJIT_LOCALS_REG_mapped, compiler->local_size)); - else -@@ -1585,7 +1550,7 @@ - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_enter(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw) - { - CHECK_ERROR(); -- check_sljit_emit_fast_enter(compiler, dst, dstw); -+ CHECK(check_sljit_emit_fast_enter(compiler, dst, dstw)); - ADJUST_LOCAL_OFFSET(dst, dstw); - - /* For UNUSED dst. Uncommon, but possible. */ -@@ -1602,7 +1567,7 @@ - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_fast_return(struct sljit_compiler *compiler, sljit_si src, sljit_sw srcw) - { - CHECK_ERROR(); -- check_sljit_emit_fast_return(compiler, src, srcw); -+ CHECK(check_sljit_emit_fast_return(compiler, src, srcw)); - ADJUST_LOCAL_OFFSET(src, srcw); - - if (FAST_IS_REG(src)) -@@ -1636,9 +1601,11 @@ - if (op == SLJIT_MOV_SI) - return BFEXTS(reg_map[dst], reg_map[src2], 0, 31); - -- return BFEXTU(reg_map[dst], reg_map[src2], 0, 31); -- } else if (dst != src2) -- SLJIT_ASSERT_STOP(); -+ return BFEXTU(reg_map[dst], reg_map[src2], 0, 31); -+ } else if (dst != src2) { -+ SLJIT_ASSERT(src2 == 0); -+ return ADD(reg_map[dst], reg_map[src2], ZERO); -+ } - - return SLJIT_SUCCESS; - -@@ -1650,8 +1617,10 @@ - return BFEXTS(reg_map[dst], reg_map[src2], 0, 7); - - return BFEXTU(reg_map[dst], reg_map[src2], 0, 7); -- } else if (dst != src2) -- SLJIT_ASSERT_STOP(); -+ } else if (dst != src2) { -+ SLJIT_ASSERT(src2 == 0); -+ return ADD(reg_map[dst], reg_map[src2], ZERO); -+ } - - return SLJIT_SUCCESS; - -@@ -1663,8 +1632,10 @@ - return BFEXTS(reg_map[dst], reg_map[src2], 0, 15); - - return BFEXTU(reg_map[dst], reg_map[src2], 0, 15); -- } else if (dst != src2) -- SLJIT_ASSERT_STOP(); -+ } else if (dst != src2) { -+ SLJIT_ASSERT(src2 == 0); -+ return ADD(reg_map[dst], reg_map[src2], ZERO); -+ } - - return SLJIT_SUCCESS; - -@@ -1811,7 +1782,6 @@ - else { - /* Rare ocasion. */ - FAIL_IF(ADD(TMP_EREG2, reg_map[src1], ZERO)); -- - overflow_ra = TMP_EREG2; - } - } -@@ -1903,6 +1873,17 @@ - - return SLJIT_SUCCESS; - -+ case SLJIT_MUL: -+ if (flags & SRC2_IMM) { -+ FAIL_IF(load_immediate(compiler, TMP_REG2_mapped, src2)); -+ src2 = TMP_REG2; -+ flags &= ~SRC2_IMM; -+ } -+ -+ FAIL_IF(MUL(reg_map[dst], reg_map[src1], reg_map[src2])); -+ -+ return SLJIT_SUCCESS; -+ - #define EMIT_LOGICAL(op_imm, op_norm) \ - if (flags & SRC2_IMM) { \ - FAIL_IF(load_immediate(compiler, ADDR_TMP_mapped, src2)); \ -@@ -1950,8 +1931,8 @@ - } else { \ - if (op & SLJIT_SET_E) \ - FAIL_IF(push_3_buffer( \ -- compiler, op_imm, reg_map[dst], reg_map[src1], \ -- src2 & 0x3F, __LINE__)); \ -+ compiler, op_norm, EQUAL_FLAG, reg_map[src1], \ -+ reg_map[src2], __LINE__)); \ - if (CHECK_FLAGS(SLJIT_SET_E)) \ - FAIL_IF(push_3_buffer( \ - compiler, op_norm, reg_map[dst], reg_map[src1], \ -@@ -2105,9 +2086,10 @@ - { - sljit_si sugg_dst_ar, dst_ar; - sljit_si flags = GET_ALL_FLAGS(op); -+ sljit_si mem_type = (op & SLJIT_INT_OP) ? (INT_DATA | SIGNED_DATA) : WORD_DATA; - - CHECK_ERROR(); -- check_sljit_emit_op_flags(compiler, op, dst, dstw, src, srcw, type); -+ CHECK(check_sljit_emit_op_flags(compiler, op, dst, dstw, src, srcw, type)); - ADJUST_LOCAL_OFFSET(dst, dstw); - - if (dst == SLJIT_UNUSED) -@@ -2114,6 +2096,8 @@ - return SLJIT_SUCCESS; - - op = GET_OPCODE(op); -+ if (op == SLJIT_MOV_SI || op == SLJIT_MOV_UI) -+ mem_type = INT_DATA | SIGNED_DATA; - sugg_dst_ar = reg_map[(op < SLJIT_ADD && FAST_IS_REG(dst)) ? dst : TMP_REG2]; - - compiler->cache_arg = 0; -@@ -2120,51 +2104,43 @@ - compiler->cache_argw = 0; - if (op >= SLJIT_ADD && (src & SLJIT_MEM)) { - ADJUST_LOCAL_OFFSET(src, srcw); -- FAIL_IF(emit_op_mem2(compiler, WORD_DATA | LOAD_DATA, TMP_REG1_mapped, src, srcw, dst, dstw)); -+ FAIL_IF(emit_op_mem2(compiler, mem_type | LOAD_DATA, TMP_REG1_mapped, src, srcw, dst, dstw)); - src = TMP_REG1; - srcw = 0; - } - -- switch (type) { -- case SLJIT_C_EQUAL: -- case SLJIT_C_NOT_EQUAL: -+ switch (type & 0xff) { -+ case SLJIT_EQUAL: -+ case SLJIT_NOT_EQUAL: - FAIL_IF(CMPLTUI(sugg_dst_ar, EQUAL_FLAG, 1)); - dst_ar = sugg_dst_ar; - break; -- case SLJIT_C_LESS: -- case SLJIT_C_GREATER_EQUAL: -- case SLJIT_C_FLOAT_LESS: -- case SLJIT_C_FLOAT_GREATER_EQUAL: -+ case SLJIT_LESS: -+ case SLJIT_GREATER_EQUAL: - dst_ar = ULESS_FLAG; - break; -- case SLJIT_C_GREATER: -- case SLJIT_C_LESS_EQUAL: -- case SLJIT_C_FLOAT_GREATER: -- case SLJIT_C_FLOAT_LESS_EQUAL: -+ case SLJIT_GREATER: -+ case SLJIT_LESS_EQUAL: - dst_ar = UGREATER_FLAG; - break; -- case SLJIT_C_SIG_LESS: -- case SLJIT_C_SIG_GREATER_EQUAL: -+ case SLJIT_SIG_LESS: -+ case SLJIT_SIG_GREATER_EQUAL: - dst_ar = LESS_FLAG; - break; -- case SLJIT_C_SIG_GREATER: -- case SLJIT_C_SIG_LESS_EQUAL: -+ case SLJIT_SIG_GREATER: -+ case SLJIT_SIG_LESS_EQUAL: - dst_ar = GREATER_FLAG; - break; -- case SLJIT_C_OVERFLOW: -- case SLJIT_C_NOT_OVERFLOW: -+ case SLJIT_OVERFLOW: -+ case SLJIT_NOT_OVERFLOW: - dst_ar = OVERFLOW_FLAG; - break; -- case SLJIT_C_MUL_OVERFLOW: -- case SLJIT_C_MUL_NOT_OVERFLOW: -+ case SLJIT_MUL_OVERFLOW: -+ case SLJIT_MUL_NOT_OVERFLOW: - FAIL_IF(CMPLTUI(sugg_dst_ar, OVERFLOW_FLAG, 1)); - dst_ar = sugg_dst_ar; - type ^= 0x1; /* Flip type bit for the XORI below. */ - break; -- case SLJIT_C_FLOAT_EQUAL: -- case SLJIT_C_FLOAT_NOT_EQUAL: -- dst_ar = EQUAL_FLAG; -- break; - - default: - SLJIT_ASSERT_STOP(); -@@ -2180,11 +2156,11 @@ - if (op >= SLJIT_ADD) { - if (TMP_REG2_mapped != dst_ar) - FAIL_IF(ADD(TMP_REG2_mapped, dst_ar, ZERO)); -- return emit_op(compiler, op | flags, CUMULATIVE_OP | LOGICAL_OP | IMM_OP | ALT_KEEP_CACHE, dst, dstw, src, srcw, TMP_REG2, 0); -+ return emit_op(compiler, op | flags, mem_type | CUMULATIVE_OP | LOGICAL_OP | IMM_OP | ALT_KEEP_CACHE, dst, dstw, src, srcw, TMP_REG2, 0); - } - - if (dst & SLJIT_MEM) -- return emit_op_mem(compiler, WORD_DATA, dst_ar, dst, dstw); -+ return emit_op_mem(compiler, mem_type, dst_ar, dst, dstw); - - if (sugg_dst_ar != dst_ar) - return ADD(sugg_dst_ar, dst_ar, ZERO); -@@ -2194,7 +2170,7 @@ - - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op) { - CHECK_ERROR(); -- check_sljit_emit_op0(compiler, op); -+ CHECK(check_sljit_emit_op0(compiler, op)); - - op = GET_OPCODE(op); - switch (op) { -@@ -2204,10 +2180,10 @@ - case SLJIT_BREAKPOINT: - return PI(BPT); - -- case SLJIT_UMUL: -- case SLJIT_SMUL: -- case SLJIT_UDIV: -- case SLJIT_SDIV: -+ case SLJIT_LUMUL: -+ case SLJIT_LSMUL: -+ case SLJIT_UDIVI: -+ case SLJIT_SDIVI: - SLJIT_ASSERT_STOP(); - } - -@@ -2217,7 +2193,7 @@ - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op1(struct sljit_compiler *compiler, sljit_si op, sljit_si dst, sljit_sw dstw, sljit_si src, sljit_sw srcw) - { - CHECK_ERROR(); -- check_sljit_emit_op1(compiler, op, dst, dstw, src, srcw); -+ CHECK(check_sljit_emit_op1(compiler, op, dst, dstw, src, srcw)); - ADJUST_LOCAL_OFFSET(dst, dstw); - ADJUST_LOCAL_OFFSET(src, srcw); - -@@ -2273,7 +2249,7 @@ - return emit_op(compiler, SLJIT_SUB | GET_ALL_FLAGS(op), IMM_OP, dst, dstw, SLJIT_IMM, 0, src, srcw); - - case SLJIT_CLZ: -- return emit_op(compiler, op, 0, dst, dstw, TMP_REG1, 0, src, srcw); -+ return emit_op(compiler, op, (op & SLJIT_INT_OP) ? INT_DATA : WORD_DATA, dst, dstw, TMP_REG1, 0, src, srcw); - } - - return SLJIT_SUCCESS; -@@ -2282,7 +2258,7 @@ - SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op2(struct sljit_compiler *compiler, sljit_si op, sljit_si dst, sljit_sw dstw, sljit_si src1, sljit_sw src1w, sljit_si src2, sljit_sw src2w) - { - CHECK_ERROR(); -- check_sljit_emit_op2(compiler, op, dst, dstw, src1, src1w, src2, src2w); -+ CHECK(check_sljit_emit_op2(compiler, op, dst, dstw, src1, src1w, src2, src2w)); - ADJUST_LOCAL_OFFSET(dst, dstw); - ADJUST_LOCAL_OFFSET(src1, src1w); - ADJUST_LOCAL_OFFSET(src2, src2w); -@@ -2325,7 +2301,7 @@ - flush_buffer(compiler); - - CHECK_ERROR_PTR(); -- check_sljit_emit_label(compiler); -+ CHECK_PTR(check_sljit_emit_label(compiler)); - - if (compiler->last_label && compiler->last_label->size == compiler->size) - return compiler->last_label; -@@ -2344,7 +2320,7 @@ - flush_buffer(compiler); - - CHECK_ERROR(); -- check_sljit_emit_ijump(compiler, type, src, srcw); -+ CHECK(check_sljit_emit_ijump(compiler, type, src, srcw)); - ADJUST_LOCAL_OFFSET(src, srcw); - - if (FAST_IS_REG(src)) { -@@ -2404,8 +2380,10 @@ - - return SLJIT_SUCCESS; - -- } else if (src & SLJIT_MEM) -+ } else if (src & SLJIT_MEM) { - FAIL_IF(emit_op(compiler, SLJIT_MOV, WORD_DATA, TMP_REG2, 0, TMP_REG1, 0, src, srcw)); -+ flush_buffer(compiler); -+ } - - FAIL_IF(JR_SOLO(reg_map[src_r])); - -@@ -2432,7 +2410,7 @@ - flush_buffer(compiler); - - CHECK_ERROR_PTR(); -- check_sljit_emit_jump(compiler, type); -+ CHECK_PTR(check_sljit_emit_jump(compiler, type)); - - jump = (struct sljit_jump *)ensure_abuf(compiler, sizeof(struct sljit_jump)); - PTR_FAIL_IF(!jump); -@@ -2440,48 +2418,42 @@ - type &= 0xff; - - switch (type) { -- case SLJIT_C_EQUAL: -- case SLJIT_C_FLOAT_NOT_EQUAL: -+ case SLJIT_EQUAL: - BR_NZ(EQUAL_FLAG); - break; -- case SLJIT_C_NOT_EQUAL: -- case SLJIT_C_FLOAT_EQUAL: -+ case SLJIT_NOT_EQUAL: - BR_Z(EQUAL_FLAG); - break; -- case SLJIT_C_LESS: -- case SLJIT_C_FLOAT_LESS: -+ case SLJIT_LESS: - BR_Z(ULESS_FLAG); - break; -- case SLJIT_C_GREATER_EQUAL: -- case SLJIT_C_FLOAT_GREATER_EQUAL: -+ case SLJIT_GREATER_EQUAL: - BR_NZ(ULESS_FLAG); - break; -- case SLJIT_C_GREATER: -- case SLJIT_C_FLOAT_GREATER: -+ case SLJIT_GREATER: - BR_Z(UGREATER_FLAG); - break; -- case SLJIT_C_LESS_EQUAL: -- case SLJIT_C_FLOAT_LESS_EQUAL: -+ case SLJIT_LESS_EQUAL: - BR_NZ(UGREATER_FLAG); - break; -- case SLJIT_C_SIG_LESS: -+ case SLJIT_SIG_LESS: - BR_Z(LESS_FLAG); - break; -- case SLJIT_C_SIG_GREATER_EQUAL: -+ case SLJIT_SIG_GREATER_EQUAL: - BR_NZ(LESS_FLAG); - break; -- case SLJIT_C_SIG_GREATER: -+ case SLJIT_SIG_GREATER: - BR_Z(GREATER_FLAG); - break; -- case SLJIT_C_SIG_LESS_EQUAL: -+ case SLJIT_SIG_LESS_EQUAL: - BR_NZ(GREATER_FLAG); - break; -- case SLJIT_C_OVERFLOW: -- case SLJIT_C_MUL_OVERFLOW: -+ case SLJIT_OVERFLOW: -+ case SLJIT_MUL_OVERFLOW: - BR_Z(OVERFLOW_FLAG); - break; -- case SLJIT_C_NOT_OVERFLOW: -- case SLJIT_C_MUL_NOT_OVERFLOW: -+ case SLJIT_NOT_OVERFLOW: -+ case SLJIT_MUL_NOT_OVERFLOW: - BR_NZ(OVERFLOW_FLAG); - break; - default: -@@ -2536,7 +2508,7 @@ - flush_buffer(compiler); - - CHECK_ERROR_PTR(); -- check_sljit_emit_const(compiler, dst, dstw, init_value); -+ CHECK_PTR(check_sljit_emit_const(compiler, dst, dstw, init_value)); - ADJUST_LOCAL_OFFSET(dst, dstw); - - const_ = (struct sljit_const *)ensure_abuf(compiler, sizeof(struct sljit_const)); -@@ -2572,3 +2544,18 @@ - inst[3] = (inst[3] & ~(0xFFFFL << 43)) | ((new_constant & 0xFFFFL) << 43); - SLJIT_CACHE_FLUSH(inst, inst + 4); - } -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_get_register_index(sljit_si reg) -+{ -+ CHECK_REG_INDEX(check_sljit_get_register_index(reg)); -+ return reg_map[reg]; -+} -+ -+SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op_custom(struct sljit_compiler *compiler, -+ void *instruction, sljit_si size) -+{ -+ CHECK_ERROR(); -+ CHECK(check_sljit_emit_op_custom(compiler, instruction, size)); -+ return SLJIT_ERR_UNSUPPORTED; -+} -+ -Index: pcregrep.c -=================================================================== ---- pcregrep.c (revision 1554) -+++ pcregrep.c (working copy) -@@ -1692,9 +1692,13 @@ - - if (filenames == FN_NOMATCH_ONLY) return 1; - -+ /* If all we want is a yes/no answer, stop now. */ -+ -+ if (quiet) return 0; -+ - /* Just count if just counting is wanted. */ - -- if (count_only) count++; -+ else if (count_only) count++; - - /* When handling a binary file and binary-files==binary, the "binary" - variable will be set true (it's false in all other cases). In this -@@ -1715,10 +1719,6 @@ - return 0; - } - -- /* Likewise, if all we want is a yes/no answer. */ -- -- else if (quiet) return 0; -- - /* The --only-matching option prints just the substring that matched, - and/or one or more captured portions of it, as long as these strings are - not empty. The --file-offsets and --line-offsets options output offsets for -@@ -2089,7 +2089,7 @@ - - /* Print the match count if wanted */ - --if (count_only) -+if (count_only && !quiet) - { - if (count > 0 || !omit_zero_count) - { -Index: pcre_study.c -=================================================================== ---- pcre_study.c (revision 1554) -+++ pcre_study.c (working copy) -@@ -71,6 +71,7 @@ - startcode pointer to start of the whole pattern's code - options the compiling options - recurses chain of recurse_check to catch mutual recursion -+ countptr pointer to call count (to catch over complexity) - - Returns: the minimum length - -1 if \C in UTF-8 mode or (*ACCEPT) was encountered -@@ -80,7 +81,8 @@ - - static int - find_minlength(const REAL_PCRE *re, const pcre_uchar *code, -- const pcre_uchar *startcode, int options, recurse_check *recurses) -+ const pcre_uchar *startcode, int options, recurse_check *recurses, -+ int *countptr) - { - int length = -1; - /* PCRE_UTF16 has the same value as PCRE_UTF8. */ -@@ -90,6 +92,8 @@ - register int branchlength = 0; - register pcre_uchar *cc = (pcre_uchar *)code + 1 + LINK_SIZE; - -+if ((*countptr)++ > 1000) return -1; /* too complex */ -+ - if (*code == OP_CBRA || *code == OP_SCBRA || - *code == OP_CBRAPOS || *code == OP_SCBRAPOS) cc += IMM2_SIZE; - -@@ -131,7 +135,7 @@ - case OP_SBRAPOS: - case OP_ONCE: - case OP_ONCE_NC: -- d = find_minlength(re, cc, startcode, options, recurses); -+ d = find_minlength(re, cc, startcode, options, recurses, countptr); - if (d < 0) return d; - branchlength += d; - do cc += GET(cc, 1); while (*cc == OP_ALT); -@@ -415,7 +419,8 @@ - int dd; - this_recurse.prev = recurses; - this_recurse.group = cs; -- dd = find_minlength(re, cs, startcode, options, &this_recurse); -+ dd = find_minlength(re, cs, startcode, options, &this_recurse, -+ countptr); - if (dd < d) d = dd; - } - } -@@ -451,7 +456,8 @@ - { - this_recurse.prev = recurses; - this_recurse.group = cs; -- d = find_minlength(re, cs, startcode, options, &this_recurse); -+ d = find_minlength(re, cs, startcode, options, &this_recurse, -+ countptr); - } - } - } -@@ -514,7 +520,7 @@ - this_recurse.prev = recurses; - this_recurse.group = cs; - branchlength += find_minlength(re, cs, startcode, options, -- &this_recurse); -+ &this_recurse, countptr); - } - } - cc += 1 + LINK_SIZE; -@@ -1453,6 +1459,7 @@ - #endif - { - int min; -+int count = 0; - BOOL bits_set = FALSE; - pcre_uint8 start_bits[32]; - PUBL(extra) *extra = NULL; -@@ -1539,7 +1546,7 @@ - - /* Find the minimum length of subject string. */ - --switch(min = find_minlength(re, code, code, re->options, NULL)) -+switch(min = find_minlength(re, code, code, re->options, NULL, &count)) - { - case -2: *errorptr = "internal error: missing capturing bracket"; return NULL; - case -3: *errorptr = "internal error: opcode not recognized"; return NULL; -Index: pcre_internal.h -=================================================================== ---- pcre_internal.h (revision 1554) -+++ pcre_internal.h (working copy) -@@ -984,7 +984,7 @@ - #ifndef EBCDIC - - #define HSPACE_LIST \ -- CHAR_HT, CHAR_SPACE, 0xa0, \ -+ CHAR_HT, CHAR_SPACE, CHAR_NBSP, \ - 0x1680, 0x180e, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, \ - 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202f, 0x205f, 0x3000, \ - NOTACHAR -@@ -1010,7 +1010,7 @@ - #define HSPACE_BYTE_CASES \ - case CHAR_HT: \ - case CHAR_SPACE: \ -- case 0xa0 /* NBSP */ -+ case CHAR_NBSP - - #define HSPACE_CASES \ - HSPACE_BYTE_CASES: \ -@@ -1037,11 +1037,12 @@ - /* ------ EBCDIC environments ------ */ - - #else --#define HSPACE_LIST CHAR_HT, CHAR_SPACE -+#define HSPACE_LIST CHAR_HT, CHAR_SPACE, CHAR_NBSP, NOTACHAR - - #define HSPACE_BYTE_CASES \ - case CHAR_HT: \ -- case CHAR_SPACE -+ case CHAR_SPACE: \ -+ case CHAR_NBSP - - #define HSPACE_CASES HSPACE_BYTE_CASES - -@@ -1215,6 +1216,7 @@ - - #define CHAR_ESC '\047' - #define CHAR_DEL '\007' -+#define CHAR_NBSP '\x41' - #define STR_ESC "\047" - #define STR_DEL "\007" - -@@ -1229,6 +1231,7 @@ - #define CHAR_NEL ((unsigned char)'\x85') - #define CHAR_ESC '\033' - #define CHAR_DEL '\177' -+#define CHAR_NBSP ((unsigned char)'\xa0') - - #define STR_LF "\n" - #define STR_NL STR_LF -@@ -1606,6 +1609,7 @@ - #define CHAR_VERTICAL_LINE '\174' - #define CHAR_RIGHT_CURLY_BRACKET '\175' - #define CHAR_TILDE '\176' -+#define CHAR_NBSP ((unsigned char)'\xa0') - - #define STR_HT "\011" - #define STR_VT "\013" -@@ -1762,6 +1766,10 @@ - - /* Escape items that are just an encoding of a particular data value. */ - -+#ifndef ESC_a -+#define ESC_a CHAR_BEL -+#endif -+ - #ifndef ESC_e - #define ESC_e CHAR_ESC - #endif -@@ -2446,6 +2454,7 @@ - BOOL had_pruneorskip; /* (*PRUNE) or (*SKIP) encountered */ - BOOL check_lookbehind; /* Lookbehinds need later checking */ - BOOL dupnames; /* Duplicate names exist */ -+ BOOL dupgroups; /* Duplicate groups exist: (?| found */ - BOOL iscondassert; /* Next assert is a condition */ - int nltype; /* Newline type */ - int nllen; /* Newline string length */ -Index: pcre_exec.c -=================================================================== ---- pcre_exec.c (revision 1554) -+++ pcre_exec.c (working copy) -@@ -6685,7 +6685,8 @@ - register int *iend = iptr - re->top_bracket; - if (iend < md->offset_vector + 2) iend = md->offset_vector + 2; - while (--iptr >= iend) *iptr = -1; -- md->offset_vector[0] = md->offset_vector[1] = -1; -+ if (offsetcount > 0) md->offset_vector[0] = -1; -+ if (offsetcount > 1) md->offset_vector[1] = -1; - } - - /* Set up the first character to match, if available. The first_char value is -Index: pcre_jit_test.c -=================================================================== ---- pcre_jit_test.c (revision 1554) -+++ pcre_jit_test.c (working copy) -@@ -182,6 +182,7 @@ - { CMUAP, 0, "\xf0\x90\x90\x80{2}", "\xf0\x90\x90\x80#\xf0\x90\x90\xa8\xf0\x90\x90\x80" }, - { CMUAP, 0, "\xf0\x90\x90\xa8{2}", "\xf0\x90\x90\x80#\xf0\x90\x90\xa8\xf0\x90\x90\x80" }, - { CMUAP, 0, "\xe1\xbd\xb8\xe1\xbf\xb8", "\xe1\xbf\xb8\xe1\xbd\xb8" }, -+ { MA, 0, "[3-57-9]", "5" }, - - /* Assertions. */ - { MUA, 0, "\\b[^A]", "A_B#" }, -Index: configure.ac -=================================================================== ---- configure.ac (revision 1554) -+++ configure.ac (working copy) -@@ -9,9 +9,9 @@ - dnl be defined as -RC2, for example. For real releases, it should be empty. - - m4_define(pcre_major, [8]) --m4_define(pcre_minor, [37]) --m4_define(pcre_prerelease, []) --m4_define(pcre_date, [2015-04-28]) -+m4_define(pcre_minor, [38]) -+m4_define(pcre_prerelease, [-RC1]) -+m4_define(pcre_date, [2015-05-03]) - - # NOTE: The CMakeLists.txt file searches for the above variables in the first - # 50 lines of this file. Please update that if the variables above are moved. -Index: doc/pcrepattern.3 -=================================================================== ---- doc/pcrepattern.3 (revision 1554) -+++ doc/pcrepattern.3 (working copy) -@@ -1,4 +1,4 @@ --.TH PCREPATTERN 3 "08 January 2014" "PCRE 8.35" -+.TH PCREPATTERN 3 "14 June 2015" "PCRE 8.38" - .SH NAME - PCRE - Perl-compatible regular expressions - .SH "PCRE REGULAR EXPRESSION DETAILS" -@@ -308,7 +308,8 @@ - in patterns in a visible manner. There is no restriction on the appearance of - non-printing characters, apart from the binary zero that terminates a pattern, - but when a pattern is being prepared by text editing, it is often easier to use --one of the following escape sequences than the binary character it represents: -+one of the following escape sequences than the binary character it represents. -+In an ASCII or Unicode environment, these escapes are as follows: - .sp - \ea alarm, that is, the BEL character (hex 07) - \ecx "control-x", where x is any ASCII character -@@ -330,19 +331,31 @@ - but \ec{ becomes hex 3B ({ is 7B), and \ec; becomes hex 7B (; is 3B). If the - data item (byte or 16-bit value) following \ec has a value greater than 127, a - compile-time error occurs. This locks out non-ASCII characters in all modes. -+.P -+When PCRE is compiled in EBCDIC mode, \ea, \ee, \ef, \en, \er, and \et -+generate the appropriate EBCDIC code values. The \ec escape is processed -+as specified for Perl in the \fBperlebcdic\fP document. The only characters -+that are allowed after \ec are A-Z, a-z, or one of @, [, \e, ], ^, _, or ?. Any -+other character provokes a compile-time error. The sequence \e@ encodes -+character code 0; the letters (in either case) encode characters 1-26 (hex 01 -+to hex 1A); [, \e, ], ^, and _ encode characters 27-31 (hex 1B to hex 1F), and -+\e? becomes either 255 (hex FF) or 95 (hex 5F). - .P --The \ec facility was designed for use with ASCII characters, but with the --extension to Unicode it is even less useful than it once was. It is, however, --recognized when PCRE is compiled in EBCDIC mode, where data items are always --bytes. In this mode, all values are valid after \ec. If the next character is a --lower case letter, it is converted to upper case. Then the 0xc0 bits of the --byte are inverted. Thus \ecA becomes hex 01, as in ASCII (A is C1), but because --the EBCDIC letters are disjoint, \ecZ becomes hex 29 (Z is E9), and other --characters also generate different values. -+Thus, apart from \e?, these escapes generate the same character code values as -+they do in an ASCII environment, though the meanings of the values mostly -+differ. For example, \eG always generates code value 7, which is BEL in ASCII -+but DEL in EBCDIC. - .P -+The sequence \e? generates DEL (127, hex 7F) in an ASCII environment, but -+because 127 is not a control character in EBCDIC, Perl makes it generate the -+APC character. Unfortunately, there are several variants of EBCDIC. In most of -+them the APC character has the value 255 (hex FF), but in the one Perl calls -+POSIX-BC its value is 95 (hex 5F). If certain other characters have POSIX-BC -+values, PCRE makes \e? generate 95; otherwise it generates 255. -+.P - After \e0 up to two further octal digits are read. If there are fewer than two --digits, just those that are present are used. Thus the sequence \e0\ex\e07 --specifies two binary zeros followed by a BEL character (code value 7). Make -+digits, just those that are present are used. Thus the sequence \e0\ex\e015 -+specifies two binary zeros followed by a CR character (code value 13). Make - sure you supply two digits after the initial zero if the pattern character that - follows is itself an octal digit. - .P -@@ -3283,6 +3296,6 @@ - .rs - .sp - .nf --Last updated: 08 January 2014 --Copyright (c) 1997-2014 University of Cambridge. -+Last updated: 14 June 2015 -+Copyright (c) 1997-2015 University of Cambridge. - .fi -Index: testdata/testoutput11-32 -=================================================================== ---- testdata/testoutput11-32 (revision 1554) -+++ testdata/testoutput11-32 (working copy) -@@ -231,7 +231,7 @@ - ------------------------------------------------------------------ - - /(?Pa)...(?P=a)bbb(?P>a)d/BM --Memory allocation (code space): 125 -+Memory allocation (code space): 157 - ------------------------------------------------------------------ - 0 24 Bra - 2 5 CBra 1 -@@ -748,4 +748,21 @@ - 22 End - ------------------------------------------------------------------ - -+/.((?2)(?R)\1)()/B -+------------------------------------------------------------------ -+ 0 23 Bra -+ 2 Any -+ 3 13 Once -+ 5 9 CBra 1 -+ 8 18 Recurse -+ 10 0 Recurse -+ 12 \1 -+ 14 9 Ket -+ 16 13 Ket -+ 18 3 CBra 2 -+ 21 3 Ket -+ 23 23 Ket -+ 25 End -+------------------------------------------------------------------ -+ - /-- End of testinput11 --/ -Index: testdata/testinputEBC -=================================================================== ---- testdata/testinputEBC (revision 1554) -+++ testdata/testinputEBC (working copy) -@@ -29,13 +29,16 @@ - - /^A\ˆ/ - A B -+ A\x41B - - /-- Test \H --/ - - /^A\È/ - AB -+ A\x42B - ** Fail - A B -+ A\x41B - - /-- Test \R --/ - -Index: testdata/testoutput1 -=================================================================== ---- testdata/testoutput1 (revision 1554) -+++ testdata/testoutput1 (working copy) -@@ -9429,4 +9429,9 @@ - 0: aaaaaaaaa - 1: a - -+"(?|(\k'Pm')|(?'Pm'))" -+ abcd -+ 0: -+ 1: -+ - /-- End of testinput1 --/ -Index: testdata/testoutput2 -=================================================================== ---- testdata/testoutput2 (revision 1554) -+++ testdata/testoutput2 (working copy) -@@ -5614,9 +5614,9 @@ - 123456\P - No match - --//KF>/dev/null --Compiled pattern written to /dev/null --Study data written to /dev/null -+//KF>testsavedregex -+Compiled pattern written to testsavedregex -+Study data written to testsavedregex - - /abc/IS>testsavedregex - Capturing subpattern count = 0 -@@ -9135,10 +9135,10 @@ - Failed: subpattern name expected at offset 3 - - /\k/ --Failed: \k is not followed by a braced, angle-bracketed, or quoted name at offset 2 -+Failed: \k is not followed by a braced, angle-bracketed, or quoted name at offset 1 - - /\kabc/ --Failed: \k is not followed by a braced, angle-bracketed, or quoted name at offset 5 -+Failed: \k is not followed by a braced, angle-bracketed, or quoted name at offset 1 - - /(?P=)/ - Failed: subpattern name expected at offset 4 -@@ -9186,7 +9186,7 @@ - Failed: unknown POSIX class name at offset 3 - - /(^(a|b\g<-1'c))/ --Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 15 -+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 8 - - /^(?+1)(?x|y){0}z/ - xzxx -@@ -14098,10 +14098,10 @@ - Failed: group name must start with a non-digit at offset 4 - - /\g'3gh'/ --Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 7 -+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 2 - - /\g<5fg>/ --Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 7 -+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 2 - - /(?(<4gh>)abc)/ - Failed: group name must start with a non-digit at offset 4 -@@ -14423,4 +14423,146 @@ - - /((?2){73}(?2))((?1))/ - -+/.((?2)(?R)\1)()/BZ -+------------------------------------------------------------------ -+ Bra -+ Any -+ Once -+ CBra 1 -+ Recurse -+ Recurse -+ \1 -+ Ket -+ Ket -+ CBra 2 -+ Ket -+ Ket -+ End -+------------------------------------------------------------------ -+ -+/(?1)()((((((\1++))\x85)+)|))/ -+ -+/(\9*+(?2);\3++()2|)++{/ -+Failed: reference to non-existent subpattern at offset 22 -+ -+/\V\x85\9*+((?2)\3++()2)*:2/ -+Failed: reference to non-existent subpattern at offset 26 -+ -+/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J -+ -+/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J -+ -+/(((?(R)){0,2}) (?''((?'X')((?'R')))))/ -+ -+"(?J)(?'d'(?'d'\g{d}))" -+ -+".*?\h.+.\.+\R*?\xd(?i)(?=!(?=b`b`b`\`b\xa9b!)`\a`bbbbbbbbbbbbb`bbbbbbbbbbbb*R\x85bbbbbbb\C?{((?2)(?))(( -+\H){8(?<=(?1){29}\xa8bbbb\x16\xd\xc6^($(?1)/ -+ - /-- End of testinput2 --/ -Index: testdata/testoutput11-16 -=================================================================== ---- testdata/testoutput11-16 (revision 1554) -+++ testdata/testoutput11-16 (working copy) -@@ -231,7 +231,7 @@ - ------------------------------------------------------------------ - - /(?Pa)...(?P=a)bbb(?P>a)d/BM --Memory allocation (code space): 61 -+Memory allocation (code space): 77 - ------------------------------------------------------------------ - 0 24 Bra - 2 5 CBra 1 -@@ -748,4 +748,21 @@ - 22 End - ------------------------------------------------------------------ - -+/.((?2)(?R)\1)()/B -+------------------------------------------------------------------ -+ 0 23 Bra -+ 2 Any -+ 3 13 Once -+ 5 9 CBra 1 -+ 8 18 Recurse -+ 10 0 Recurse -+ 12 \1 -+ 14 9 Ket -+ 16 13 Ket -+ 18 3 CBra 2 -+ 21 3 Ket -+ 23 23 Ket -+ 25 End -+------------------------------------------------------------------ -+ - /-- End of testinput11 --/ -Index: testdata/testoutput6 -=================================================================== ---- testdata/testoutput6 (revision 1554) -+++ testdata/testoutput6 (working copy) -@@ -2469,4 +2469,8 @@ - Ó…\x0aT - No match - -+/[\pS#moq]/ -+ = -+ 0: = -+ - /-- End of testinput6 --/ -Index: testdata/testinput11 -=================================================================== ---- testdata/testinput11 (revision 1554) -+++ testdata/testinput11 (working copy) -@@ -136,4 +136,6 @@ - - /((?+1)(\1))/B - -+/.((?2)(?R)\1)()/B -+ - /-- End of testinput11 --/ -Index: testdata/testinput12 -=================================================================== ---- testdata/testinput12 (revision 1554) -+++ testdata/testinput12 (working copy) -@@ -8,6 +8,8 @@ - - /(?(?C1)(?=a)a)/S!+I - -+/b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*b*/S+I -+ - /abc/S+I>testsavedregex - - testsavedregex - Capturing subpattern count = 0 - No options -@@ -184,4 +193,12 @@ - - /(a(?:a|b|c|d|e)b){8,16}/S++ - -+/(?:|a|){100}x/S++ -+ -+/(x(?1)){4}/S++ -+ -+/(.|.)*?bx/ -+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax -+Error -8 (match limit exceeded) -+ - /-- End of testinput12 --/ -Index: testdata/testoutput11-8 -=================================================================== ---- testdata/testoutput11-8 (revision 1554) -+++ testdata/testoutput11-8 (working copy) -@@ -231,7 +231,7 @@ - ------------------------------------------------------------------ - - /(?Pa)...(?P=a)bbb(?P>a)d/BM --Memory allocation (code space): 38 -+Memory allocation (code space): 50 - ------------------------------------------------------------------ - 0 30 Bra - 3 7 CBra 1 -@@ -748,4 +748,21 @@ - 34 End - ------------------------------------------------------------------ - -+/.((?2)(?R)\1)()/B -+------------------------------------------------------------------ -+ 0 35 Bra -+ 3 Any -+ 4 20 Once -+ 7 14 CBra 1 -+ 12 27 Recurse -+ 15 0 Recurse -+ 18 \1 -+ 21 14 Ket -+ 24 20 Ket -+ 27 5 CBra 2 -+ 32 5 Ket -+ 35 35 Ket -+ 38 End -+------------------------------------------------------------------ -+ - /-- End of testinput11 --/ -Index: testdata/testoutputEBC -=================================================================== ---- testdata/testoutputEBC (revision 1554) -+++ testdata/testoutputEBC (working copy) -@@ -41,6 +41,8 @@ - /^A\ˆ/ - A B - 0: A\x20 -+ A\x41B -+ 0: AA - - /-- Test \H --/ - -@@ -47,10 +49,14 @@ - /^A\È/ - AB - 0: AB -+ A\x42B -+ 0: AB - ** Fail - No match - A B - No match -+ A\x41B -+No match - - /-- Test \R --/ - -Index: testdata/grepoutput -=================================================================== ---- testdata/grepoutput (revision 1554) -+++ testdata/grepoutput (working copy) -@@ -751,3 +751,7 @@ - 2:3,1 - 2:4,1 - RC=0 -+---------------------------- Test 108 ------------------------------ -+RC=0 -+---------------------------- Test 109 ----------------------------- -+RC=0 -Index: testdata/testinput1 -=================================================================== ---- testdata/testinput1 (revision 1554) -+++ testdata/testinput1 (working copy) -@@ -5730,4 +5730,7 @@ - "(?1)(?#?'){8}(a)" - baaaaaaaaac - -+"(?|(\k'Pm')|(?'Pm'))" -+ abcd -+ - /-- End of testinput1 --/ -Index: testdata/testinput2 -=================================================================== ---- testdata/testinput2 (revision 1554) -+++ testdata/testinput2 (working copy) -@@ -1380,7 +1380,7 @@ - 1X - 123456\P - --//KF>/dev/null -+//KF>testsavedregex - - /abc/IS>testsavedregex - 1)/ -+ - /-- End of testinput2 --/ -Index: testdata/testinput6 -=================================================================== ---- testdata/testinput6 (revision 1554) -+++ testdata/testinput6 (working copy) -@@ -1502,4 +1502,7 @@ - /\C\X*QT/8 - Ó…\x0aT - -+/[\pS#moq]/ -+ = -+ - /-- End of testinput6 --/ -Index: NON-AUTOTOOLS-BUILD -=================================================================== ---- NON-AUTOTOOLS-BUILD (revision 1554) -+++ NON-AUTOTOOLS-BUILD (working copy) -@@ -764,9 +764,9 @@ - - http://www.zaconsultants.net - --There is also a mirror here: -+You may download PCRE from WWW.CBTTAPE.ORG, file 882.  Everything, source and -+executable, is in EBCDIC and native z/OS file formats and this is the -+recommended download site. - -- http://www.vsoft-software.com/downloads.html -- - ========================== --Last Updated: 10 February 2015 -+Last Updated: 25 June 2015 -- GitLab From 000a2108ba10df725065004e1f3d2fb793078f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Sep 2015 11:36:09 +0200 Subject: [PATCH 276/553] vorbis-tools: security patches and fix meta Patches: CVE-2014-9638, CVE-2014-9639, CVE-2015-6749, and some non-security. Also drop glibc from buildInputs. --- .../audio/vorbis-tools/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index e4e5b7ff81a..1f85f442354 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,6 +1,12 @@ -{stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc -, speex, flac}: +{ stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +, speex, flac }: +let + debPatch = fetchzip { + url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-6.debian.tar.xz"; + sha256 = "1xmmpdvxyr84lazlg23c6ck5ic97ga2rkiqabb1d98ix2zdzyqz5"; + }; +in stdenv.mkDerivation { name = "vorbis-tools-1.4.0"; src = fetchurl { @@ -8,14 +14,23 @@ stdenv.mkDerivation { sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; }; - buildInputs = [ libogg libvorbis libao pkgconfig curl speex glibc flac ]; + postPatch = '' + for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) + do patch -p1 < "$patch" + done + ''; + + buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ]; - meta = { + meta = with stdenv.lib; { + description = "Extra tools for Ogg-Vorbis audio codec"; longDescription = '' A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.all; }; } + -- GitLab From 2896861c7e55da24b8f15c42af0f2b5fc3b0bdb0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Sep 2015 11:53:19 +0200 Subject: [PATCH 277/553] pcre: Smaller patch for CVE-2015-3210, CVE-2015-5073 --- .../libraries/pcre/cve-2015-3210.patch | 87 +++++++++++++++++++ .../libraries/pcre/cve-2015-5073.patch | 68 +++++++++++++++ pkgs/development/libraries/pcre/default.nix | 5 ++ 3 files changed, 160 insertions(+) create mode 100644 pkgs/development/libraries/pcre/cve-2015-3210.patch create mode 100644 pkgs/development/libraries/pcre/cve-2015-5073.patch diff --git a/pkgs/development/libraries/pcre/cve-2015-3210.patch b/pkgs/development/libraries/pcre/cve-2015-3210.patch new file mode 100644 index 00000000000..c97849fb70c --- /dev/null +++ b/pkgs/development/libraries/pcre/cve-2015-3210.patch @@ -0,0 +1,87 @@ +From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Fri, 15 May 2015 17:17:03 +0000 +Subject: [PATCH] Fix buffer overflow for named recursive back reference when + the name is duplicated. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream commit ported to pcre-8.37: + +commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19 +Author: ph10 +Date: Fri May 15 17:17:03 2015 +0000 + + Fix buffer overflow for named recursive back reference when the name is + duplicated. + + git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +This fixes CVE-2015-3210. + +Signed-off-by: Petr PísaÅ™ +--- + pcre_compile.c | 16 ++++++++++++++-- + testdata/testinput2 | 2 ++ + testdata/testoutput2 | 2 ++ + 3 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index 0efad26..6f06912 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7173,14 +7173,26 @@ for (;; ptr++) + number. If the name is not found, set the value to 0 for a forward + reference. */ + ++ recno = 0; + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) + { + if (namelen == ng->length && + STRNCMP_UC_UC(name, ng->name, namelen) == 0) +- break; ++ { ++ open_capitem *oc; ++ recno = ng->number; ++ if (is_recurse) break; ++ for (oc = cd->open_caps; oc != NULL; oc = oc->next) ++ { ++ if (oc->number == recno) ++ { ++ oc->flag = TRUE; ++ break; ++ } ++ } ++ } + } +- recno = (i < cd->names_found)? ng->number : 0; + + /* Count named back references. */ + +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 58fe53b..83bb471 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4152,4 +4152,6 @@ backtracking verbs. --/ + + /((?2){73}(?2))((?1))/ + ++"(?J)(?'d'(?'d'\g{d}))" ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index b718df0..7dff52a 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14423,4 +14423,6 @@ Failed: lookbehind assertion is not fixed length at offset 17 + + /((?2){73}(?2))((?1))/ + ++"(?J)(?'d'(?'d'\g{d}))" ++ + /-- End of testinput2 --/ +-- +2.4.3 + diff --git a/pkgs/development/libraries/pcre/cve-2015-5073.patch b/pkgs/development/libraries/pcre/cve-2015-5073.patch new file mode 100644 index 00000000000..16fd45c87b1 --- /dev/null +++ b/pkgs/development/libraries/pcre/cve-2015-5073.patch @@ -0,0 +1,68 @@ +From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Tue, 23 Jun 2015 16:34:53 +0000 +Subject: [PATCH] Fix buffer overflow for forward reference within backward + assertion with excess closing parenthesis. Bugzilla 1651. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is upstream commit ported to 8.37: + +commit 764692f9aea9eab50fdba6cb537441d8b34c6c37 +Author: ph10 +Date: Tue Jun 23 16:34:53 2015 +0000 + + Fix buffer overflow for forward reference within backward assertion with excess + closing parenthesis. Bugzilla 1651. + + git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +It fixes CVE-2015-5073. + +Signed-off-by: Petr PísaÅ™ +--- + pcre_compile.c | 2 +- + testdata/testinput2 | 2 ++ + testdata/testoutput2 | 3 +++ + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index 6f06912..b66b1f6 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The + exceptional ones forgo this. We scan the pattern to check that they are fixed + length, and set their lengths. */ + +-if (cd->check_lookbehind) ++if (errorcode == 0 && cd->check_lookbehind) + { + pcre_uchar *cc = (pcre_uchar *)codestart; + +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 83bb471..5cc9ce6 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4154,4 +4154,6 @@ backtracking verbs. --/ + + "(?J)(?'d'(?'d'\g{d}))" + ++/(?=di(?<=(?1))|(?=(.))))/ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 7dff52a..4decb8d 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17 + + "(?J)(?'d'(?'d'\g{d}))" + ++/(?=di(?<=(?1))|(?=(.))))/ ++Failed: unmatched parentheses at offset 23 ++ + /-- End of testinput2 --/ +-- +2.4.3 + diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index a34f3e5e132..3370e910565 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi"; }; + patches = + [ ./cve-2015-3210.patch + ./cve-2015-5073.patch + ]; + outputs = [ "out" "doc" "man" ]; configureFlags = '' -- GitLab From 59bc47c9ede58f3cdfdfea18297375627ac99c6c Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 22 Sep 2015 15:49:17 +0200 Subject: [PATCH 278/553] nixos networking: add vswitch option Add a configuration option for Open vSwitch that is similar to the option for the Linux kernel ethernet bridge. --- nixos/modules/services/networking/dhcpcd.nix | 1 + .../tasks/network-interfaces-scripted.nix | 40 ++++++++++ .../tasks/network-interfaces-systemd.nix | 3 + nixos/modules/tasks/network-interfaces.nix | 80 ++++++++++++++++++- 4 files changed, 123 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 8552395fdb1..b31d479ab4f 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -18,6 +18,7 @@ let map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) + ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 328d94cbb05..d8b1592c36b 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -220,6 +220,45 @@ in ''; }); + createVswitchDevice = n: v: nameValuePair "${n}-netdev" + (let + managedInterfaces = filter (x: hasAttr x cfg.interfaces) v.interfaces; + managedInterfaceServices = concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) managedInterfaces; + virtualInterfaces = filter (x: (hasAttr x cfg.interfaces) && cfg.interfaces.${x}.virtual) v.interfaces; + virtualInterfaceServices = concatMap (i: [ "${i}-netdev.service" ]) virtualInterfaces; + deps = map subsystemDevice v.interfaces; + ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules; + in + { description = "Open vSwitch Interface ${n}"; + wantedBy = [ "network.target" "vswitchd.service" (subsystemDevice n) ]; + requires = optionals v.bindInterfaces (deps ++ managedInterfaceServices ++ virtualInterfaceServices); + requiredBy = optionals v.bindInterfaces (managedInterfaceServices ++ virtualInterfaceServices); + bindsTo = deps ++ [ "vswitchd.service" ]; + partOf = [ "vswitchd.service" ]; + after = [ "network-pre.target" "vswitchd.service" ] ++ deps ++ managedInterfaceServices ++ virtualInterfaceServices; + before = [ "network-interfaces.target" (subsystemDevice n) ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + script = '' + echo "Removing old Open vSwitch ${n}..." + ovs-vsctl --if-exists del-br ${n} + + echo "Adding Open vSwitch ${n}..." + ovs-vsctl -- add-br ${n} ${concatMapStrings (i: " -- add-port ${n} ${i}") v.interfaces} \ + ${concatMapStrings (x: " -- set-controller ${n} " + x) v.controllers} \ + ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)} + + echo "Adding OpenFlow rules for Open vSwitch ${n}..." + ovs-ofctl add-flows ${n} ${ofRules} + ''; + postStop = '' + ip link set ${n} down || true + ovs-ofctl del-flows ${n} || true + ovs-vsctl --if-exists del-br ${n} + ''; + }); + createBondDevice = n: v: nameValuePair "${n}-netdev" (let deps = map subsystemDevice v.interfaces; @@ -335,6 +374,7 @@ in map configureAddrs interfaces ++ map createTunDevice (filter (i: i.virtual) interfaces)) // mapAttrs' createBridgeDevice cfg.bridges + // mapAttrs' createVswitchDevice cfg.vswitches // mapAttrs' createBondDevice cfg.bonds // mapAttrs' createMacvlanDevice cfg.macvlans // mapAttrs' createSitDevice cfg.sits diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8223c5a4941..301ee43fd0e 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -35,6 +35,9 @@ in assertions = [ { assertion = cfg.defaultGatewayWindowSize == null; message = "networking.defaultGatewayWindowSize is not supported by networkd."; + } { + assertion = cfg.vswitches == {}; + message = "networking.vswichtes are not supported by networkd."; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9931c977e8f..7af3160e2d4 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -12,7 +12,8 @@ let hasBonds = cfg.bonds != { }; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) - ++ concatMap (i: i.interfaces) (attrValues cfg.bridges); + ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) + ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches); slaveIfs = map (i: cfg.interfaces.${i}) (filter (i: cfg.interfaces ? ${i}) slaves); @@ -371,6 +372,81 @@ in options = [ interfaceOpts ]; }; + networking.vswitches = mkOption { + default = { }; + example = + { vs0.interfaces = [ "eth0" "eth1" ]; + vs1.interfaces = [ "eth2" "wlan0" ]; + }; + description = + '' + This option allows you to define Open vSwitches that connect + physical networks together. The value of this option is an + attribute set. Each attribute specifies a vswitch, with the + attribute name specifying the name of the vswitch's network + interface. + ''; + + type = types.attrsOf types.optionSet; + + options = { + + interfaces = mkOption { + example = [ "eth0" "eth1" ]; + type = types.listOf types.str; + description = + "The physical network interfaces connected by the vSwitch."; + }; + + bindInterfaces = mkOption { + type = types.bool; + default = false; + description = '' + If true, then the interfaces of the vSwitch are brought 'up' and especially + also 'down' together with the vSwitch. That requires that every interfaces + is configured as a systemd network services. + ''; + }; + + controllers = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ptcp:6653:[::1]" ]; + description = '' + Specify the controller targets. For the allowed options see man 8 ovs-vsctl. + ''; + }; + + openFlowRules = mkOption { + type = types.lines; + default = ""; + example = '' + actions=normal + ''; + description = '' + OpenFlow rules to insert into the Open vSwitch. All openFlowRules are + loaded with ovs-ofctl within one atomic operation. + ''; + }; + + extraOvsctlCmds = mkOption { + type = types.lines; + default = ""; + example = '' + set-fail-mode secure + set Bridge stp_enable=true + ''; + description = '' + Commands to manipulate the Open vSwitch database. Every line executed with ovs-vsctl. + All commands are bundled together with the operations for adding the interfaces + into one atomic operation. + ''; + }; + + }; + + }; + networking.bridges = mkOption { default = { }; example = @@ -766,6 +842,8 @@ in services.mstpd = mkIf needsMstpd { enable = true; }; + virtualisation.vswitch = mkIf (cfg.vswitches != { }) { enable = true; }; + }; } -- GitLab From baf1d1dcd77a66450adb54e22b5748566b06a8d7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 25 Sep 2015 12:06:58 +0200 Subject: [PATCH 279/553] nixos/tests/virtualbox: Don't parallelize VM boot. I'm not quite sure why the official Hydra gets a kernel panic in one of two VMs using the exact same kernels: https://hydra.nixos.org/build/26339384 Because the kernel panic happens before stage 1, let's wait for the first VM to boot up and after the bootup is done, start the second one in hope that it won't trigger the panic. Oddly enough, whenever I run the test on my own Hydra and on my local machines, I don't get anything like that. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 2b5b5a180fc..01fcd15fd8b 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -424,11 +424,10 @@ in { vbm("startvm test1"); waitForStartup_test1; + waitForVMBoot_test1; vbm("startvm test2"); waitForStartup_test2; - - waitForVMBoot_test1; waitForVMBoot_test2; $machine->screenshot("net_booted"); -- GitLab From 592f0f7eadbf3db956aa832ca91496a09dd1acb7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 25 Sep 2015 13:37:37 +0200 Subject: [PATCH 280/553] firefox: Drop crash_OTMC+GTK3.patch. The patch only applies for Firefox versions between 37.0 and 40.1. Because we're on version 41.0 the changes are already included upstream and thus the patch doesn't apply and is even unnecessary. As for version 38.3 for ESR, the patch doesn't apply as well if compiled with enableGTK3. Of course, this is a bit unfortunate but I don't have the time right now to properly rebase the patch on 38.3. Signed-off-by: aszlig Reported-by: devhell <"^"@regexmail.net> --- .../networking/browsers/firefox/default.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ce5eac7a2ff..9f027a25c17 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -4,7 +4,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio -, enableGTK3 ? false, fetchpatch +, enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -28,17 +28,6 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { inherit sha1; }; - patches = if !enableGTK3 then null else [(fetchpatch { - name = "crash_OTMC+GTK3.patch"; - # backported from 40.1 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1127752 - # https://bugzilla.redhat.com/show_bug.cgi?id=1256875 - url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/" - + "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1"; - sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5"; - })]; - patchFlags = "-p2"; - buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi -- GitLab From 702fde3a91f450d4963189250bf2df113b42efa7 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 14:06:23 +0200 Subject: [PATCH 281/553] libarchive: fix .la file for lzo2 --- pkgs/development/libraries/libarchive/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 837db32ea4b..ff33043dbae 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { '' else null; preFixup = '' - sed 's|-lcrypto|-L${openssl}/lib -lcrypto|' -i $out/lib/libarchive.la + sed -i $out/lib/libarchive.la \ + -e 's|-lcrypto|-L${openssl}/lib -lcrypto|' \ + -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; meta = { -- GitLab From 7d1cb980bfdb88f889ac59bb9080389052d12558 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 25 Sep 2015 14:06:23 +0200 Subject: [PATCH 282/553] libarchive: fix .la file for lzo2 --- pkgs/development/libraries/libarchive/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 837db32ea4b..ff33043dbae 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { '' else null; preFixup = '' - sed 's|-lcrypto|-L${openssl}/lib -lcrypto|' -i $out/lib/libarchive.la + sed -i $out/lib/libarchive.la \ + -e 's|-lcrypto|-L${openssl}/lib -lcrypto|' \ + -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; meta = { -- GitLab From 48200a96e0063fa25132d1e5907ab1271f3205ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Sep 2015 14:24:47 +0200 Subject: [PATCH 283/553] doc/release notes (15.09): mention `texlive` --- nixos/doc/manual/release-notes/rl-1509.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 098613f9685..93c75aa6269 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -243,6 +243,18 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + A newly packaged TeX Live 2015 is provided in pkgs.texlive, + split into 6500 nix packages. For basic user documentation see + the source. + Beware of an issue when installing a too large package set. + + The plan is to deprecate and maybe delete the original TeX packages + until the next release. + + -- GitLab From 9142c02cb97d1b5dbb83f6032df55025b050141e Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 23 Sep 2015 13:00:26 +0100 Subject: [PATCH 284/553] pithos: 1.0.1 -> 1.1.1 --- pkgs/applications/audio/pithos/default.nix | 37 ++++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index bb863d2501c..0483882ccb0 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,40 +1,35 @@ -# Based on Richard Wallace's post here: http://comments.gmane.org/gmane.linux.distributions.nixos/14734 +{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify, gst_all_1 }: -{ fetchurl, stdenv, pythonPackages, gtk3, libnotify, gst_all_1 }: pythonPackages.buildPythonPackage rec { name = "pithos-${version}"; - version = "1.0.1"; + version = "1.1.1"; - src = fetchurl { - url = "https://github.com/pithos/pithos/archive/${version}.tar.gz"; - sha256 = "67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f"; + src = fetchFromGitHub { + owner = "pithos"; + repo = "pithos"; + rev = version; + sha256 = "0373z7g1wd3g1xl8m4ipx5n2ka67a2wcn387nyk8yvgdikm14jm3"; }; postPatch = '' substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad libnotify ]; - - pythonPath = with pythonPackages; [ pygobject3 dbus pylast ]; - - propogatedBuildInputs = pythonPath; + propagatedBuildInputs = + [ gtk3 gobjectIntrospection libnotify ] ++ + (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ + (with pythonPackages; [ pygobject3 pylast ]); postInstall = '' - wrapProgram "$out/bin/pithos" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + wrapProgram "$out/bin/pithos" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; meta = with stdenv.lib; { - description = "Pandora player"; - - longDescription = '' - Pandora Internet Radio player for GNOME - ''; - - homepage = http://pithos.github.io/ ; - + description = "Pandora Internet Radio player for GNOME"; + homepage = http://pithos.github.io/; license = licenses.gpl3; - maintainers = with maintainers; [ obadz ]; }; } -- GitLab From bc2dc7de5e4d8c073b9adf28176516fa968a3d34 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:30:59 +0200 Subject: [PATCH 285/553] bwm_ng: 0.6 -> 0.6.1 --- pkgs/tools/networking/bwm-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 6fa0c20b0ac..91eec73b9dc 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "bwm-ng-0.6"; + name = "bwm-ng-0.6.1"; src = fetchurl { url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; - sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1"; + sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; buildInputs = [ ncurses ]; -- GitLab From 8ca7e4c2d1b5ace88660bdf86760982cd500cc65 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:33:42 +0200 Subject: [PATCH 286/553] bwm_ng: Move version to own variable --- pkgs/tools/networking/bwm-ng/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 91eec73b9dc..353425108a2 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, ncurses }: +let + version = "0.6.1"; +in stdenv.mkDerivation rec { - name = "bwm-ng-0.6.1"; - + name = "bwm-ng-${version}"; + src = fetchurl { url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version. I actually don't know if netstat input is useful at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them. - + (from homepage) ''; }; -- GitLab From 0a818afe22ca207e3304c357b7429c159b8f9b31 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:37:16 +0200 Subject: [PATCH 287/553] joe: 4.0 -> 4.1 --- pkgs/applications/editors/joe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 9f4d56bf8ad..14cfd81586c 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "joe-4.0"; + name = "joe-4.1"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0599xp90idl3dkplz72p33d2rfg0hb5yd38rhqdvz5zxfzzssmn5"; + sha256 = "1nznzr9h0rh8g15c56yxzwpn2labx9sgsak0wcnpj7wmpnr12ql1"; }; meta = with stdenv.lib; { -- GitLab From 1adaab27e2863d639686de7b589f44621a225242 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:40:28 +0200 Subject: [PATCH 288/553] joe: Move version to own variable --- pkgs/applications/editors/joe/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 14cfd81586c..b08f98a054c 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "joe-4.1"; + version = "4.1"; + name = "joe-${version}"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; -- GitLab From bea75f4c781d2637d48a7c6b392e4ed388c54457 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:47:57 +0200 Subject: [PATCH 289/553] libgit2: 0.21.2 -> 0.23.2 --- pkgs/development/libraries/git2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 823f09b8bce..3f0412bf839 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}: stdenv.mkDerivation rec { - version = "0.21.2"; + version = "0.23.2"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y"; + sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; }; cmakeFlags = "-DTHREADSAFE=ON"; -- GitLab From 0c95190fff80db7cf526109b01a466108eb2616c Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Fri, 25 Sep 2015 19:36:23 +0300 Subject: [PATCH 290/553] qtox: fix git hash revision --- .../networking/instant-messengers/qtox/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 5c8a03eb8ef..5863eb0d805 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,12 +2,16 @@ libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: +let + revision = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; +in + stdenv.mkDerivation rec { name = "qtox-dev-20150821"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; - rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; + rev = "${revision}"; md5 = "b2f9cf283136b6e558876ca2e6d128a3"; }; @@ -21,6 +25,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; preConfigure = '' + # patch .pro file for proper set of the git hash + sed -i '/git rev-parse/d' qtox.pro + sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro + # since .pro have hardcoded paths, we need to explicitly set paths here export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" @@ -44,9 +52,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "QT Tox client"; + description = "Qt Tox client"; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ viric jgeerds akaWolf ]; platforms = platforms.all; }; } -- GitLab From 1bfa084cdc51fa8bcaee4225c9e0a0d2923b8bb0 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Fri, 25 Sep 2015 19:47:51 +0300 Subject: [PATCH 291/553] qtox: 20150821 -> 20150925 --- .../networking/instant-messengers/qtox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 5863eb0d805..170702e44d1 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -3,16 +3,16 @@ pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: let - revision = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; + revision = "1673b43e26c853f6446f228fec083af166cbf446"; in stdenv.mkDerivation rec { - name = "qtox-dev-20150821"; + name = "qtox-dev-20150925"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; rev = "${revision}"; - md5 = "b2f9cf283136b6e558876ca2e6d128a3"; + md5 = "785f5b305cdcdf777d93ee823a5b9f49"; }; buildInputs = -- GitLab From 2549373cb9b33866452e93a404f80adf4030c36b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 25 Sep 2015 22:16:43 +0300 Subject: [PATCH 292/553] fio: Minor refactor - Use postPatch for patching, so don't need to manually override configurePhase and installPhase. - Add python to buildInputs, so fio2gnuplot gets patchShebangs'd. - Add platforms, so it gets built by Hydra. --- pkgs/tools/system/fio/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 6e1d899d6b5..8589cbe9236 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libaio, zlib }: +{ stdenv, fetchFromGitHub, libaio, python, zlib }: let version = "2.2.10"; in @@ -12,23 +12,18 @@ stdenv.mkDerivation rec { sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q"; }; - buildInputs = [ libaio zlib ]; + buildInputs = [ libaio python zlib ]; enableParallelBuilding = true; - configurePhase = '' - substituteInPlace tools/plot/fio2gnuplot \ - --replace /usr/share/fio $out/share/fio - ./configure + postPatch = '' + substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; - installPhase = '' - make install prefix=$out - ''; - - meta = { + meta = with stdenv.lib; { homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; }; } -- GitLab From 84c0098117e329ef370153a1ecaa19ee72f336b5 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Sat, 26 Sep 2015 00:42:16 +0300 Subject: [PATCH 293/553] Unprivileged overlayfs mounts kernel patch from ubuntu This allows to create overlayfs mounts by unprivileged containers (i.e. in user and mount namespace). It's super-useful for containers. The patch is trivial as I understand from the patch description it's does not have security implications (on top of what user namespaces already have). And it's enabled in ubuntu long time ago. Here is a proof: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1357025 --- pkgs/os-specific/linux/kernel/patches.nix | 5 ++ .../ubuntu-unprivileged-overlayfs.patch | 69 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 18e73ae68d4..de1b16347e1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -68,6 +68,11 @@ rec { patch = ./ubuntu-fan-4.patch; }; + ubuntu_unprivileged_overlayfs = + { name = "ubuntu-unprivileged-overlayfs"; + patch = ./ubuntu-unprivileged-overlayfs.patch; + }; + tuxonice_3_10 = makeTuxonicePatch { version = "2013-11-07"; kernelVersion = "3.10.18"; diff --git a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch new file mode 100644 index 00000000000..cfa8009e71e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch @@ -0,0 +1,69 @@ +From 7415cb7b31569e9266229d4ebc79ccec4841ab04 Mon Sep 17 00:00:00 2001 +From: Serge Hallyn +Date: Fri, 7 Feb 2014 09:32:46 -0600 +Subject: [PATCH] UBUNTU: SAUCE: Overlayfs: allow unprivileged mounts + +Unprivileged mounting, here, refers to root in a non-initial user +namespace performing the mount. In particular, it requires +CAP_SYS_ADMIN toward the task's mounts namespace, alleviating +the concerns of manipulating mount environment for setuid-root +binaries on the host. + +We refuse unprivileged mounting of most filesystem types because +we do not trust the in-kernel superblock parsers to correctly +handle malicious input. + +However, overlayfs does not parse any user-provided data other +than the pathnames passed in. Therefore unprivileged mounting +of overlayfs should be safe. + +Allowing unprivileged mounting of overlayfs filesystems would +allow Ubuntu Trusty users to create overlayfs-based container +snapshots, which would be a huge usability improvement. + +This patch enables unprivileged mounting of overlayfs. + +I tested a few simple combinations, and found that, when +doing (the equivalent of) + +mount -t overlayfs -oupperdir=u,lowerdir=l l t + +(u for upper, l for lower, t for target), + +1. overlayfs mount is always allowed, regardless of ownership +of u, l, or t. However + +2. Creation of new files is allowed so long as u is owned by + T. Otherwise, regardless of ownerships of l and t it is + denied. (This is expected; t was the mountpoint and + 'disapears', so its ownership is irrelevant) + +3. modification of a file 'hithere' which is in l but not yet + in u, and which is not owned by T, is not allowed, even if + writes to u are allowed. This may be a bug in overlayfs, + but it is safe behavior. It also will not cause a problem + for lxc since lxc will ensure that files are mapped into T's + namespace. + +Signed-off-by: Serge Hallyn +Signed-off-by: Tim Gardner +Signed-off-by: Andy Whitcroft +--- + fs/overlayfs/super.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c +index 9473e79..50890c2 100644 +--- a/fs/overlayfs/super.c ++++ b/fs/overlayfs/super.c +@@ -668,6 +668,7 @@ static struct file_system_type ovl_fs_type = { + .name = "overlayfs", + .mount = ovl_mount, + .kill_sb = kill_anon_super, ++ .fs_flags = FS_USERNS_MOUNT, + }; + MODULE_ALIAS_FS("overlayfs"); + +-- +2.1.0.rc1 + -- GitLab From eebe362911f5e41e7d2e47d16808eeb05b2895d9 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 23 Sep 2015 22:08:05 -0400 Subject: [PATCH 294/553] xfce.thunar-archive-plugin: init at 0.3.1 (close #10029) A `thunar` plugin that adds archive manipulation features to right click on file/directory menu. It can use either gnome or kde archive managers. Detection of backend based on `*.desktop` files mime types. Should supercede non-functional pre-existing `xfce.thunar_archive_plugin` (which for some unknown reason is building the volume manager plugin). Also removed `xfce.thunar_archive_plugin` because superceded. Tests: - When plugin package is installed, the supplementary menu entries appear in thunar. - Succesfully extracted an archive using backend `file-roller` through thunar menu entry. + minor changes from vcunat, mainly meta. --- .../xfce/core/thunar-archive-plugin.nix | 25 -------- pkgs/desktops/xfce/default.nix | 6 +- .../xfce/thunar-plugins/archive/default.nix | 58 +++++++++++++++++++ 3 files changed, 62 insertions(+), 27 deletions(-) delete mode 100644 pkgs/desktops/xfce/core/thunar-archive-plugin.nix create mode 100644 pkgs/desktops/xfce/thunar-plugins/archive/default.nix diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix deleted file mode 100644 index 62a90578bd3..00000000000 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, thunar, intltool, exo, gtk, udev, libxfce4ui, libxfce4util, xfconf }: - -stdenv.mkDerivation rec { - name = "thunar-archive-plugin-${version}"; - maj_ver = "0.3"; - version = "${maj_ver}.1"; - - src = fetchurl { - url = "mirror://xfce/src/thunar-plugins/${name}/${maj_ver}/${name}.tar.bz2"; - sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; - }; - - buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ]; - enableParallelBuilding = true; - - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - - meta = { - homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; - description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.iElectric ]; - }; -} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index a9903c941bf..5fdab2ab81e 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -26,8 +26,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; - thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; + thunar-archive-plugin + = callPackage ./thunar-plugins/archive { }; + thunar-dropbox-plugin + = callPackage ./thunar-plugins/dropbox { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix new file mode 100644 index 00000000000..78e5f5002cd --- /dev/null +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools +, gtk +, thunar +, exo, libxfce4util, libxfce4ui +, xfconf, udev, libnotify +}: + +stdenv.mkDerivation rec { + p_name = "thunar-archive-plugin"; + ver_maj = "0.3"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchFromGitHub { + owner = "xfce-mirror"; + repo = p_name; + rev = "72b23eefc348bee31e06a04f968e430bc7dfa51e"; + sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx"; + }; + + buildInputs = [ + pkgconfig + xfce4_dev_tools + thunar + exo gtk libxfce4util libxfce4ui + xfconf udev libnotify + ]; + + preConfigure = '' + ./autogen.sh + ''; + + /* + File roller `*.desktop` situation + --------------------------------- + + For some odd reason, in nix os, gnome file-roller's desktop file has the non-standard name + `org.gnome.FileRoller.desktop`. In order to be compatible with this odd context, create + a `*.tap` file of the same name. + + IMPORTANT: Adapt or remove the symbolic link if the situation changes. + */ + preFixup = '' + pushd $out/libexec/thunar-archive-plugin > /dev/null + ln -s ./file-roller.tap org.gnome.FileRoller.tap + popd > /dev/null + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; + description = "Thunar plugin providing file context menus for archives"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} -- GitLab From 1f73d482d6c837f92bb5aa4dc50097baa1873418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Sep 2015 09:29:13 +0200 Subject: [PATCH 295/553] beets: fix tarball evaluation by asserting isLinux /cc #10069. --- pkgs/tools/audio/beets/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8c693d9145f..51e81ef9193 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -136,7 +136,7 @@ in buildPythonPackage rec { runHook preCheck LANG=en_US.UTF-8 \ - LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive \ + LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \ BEETS_TEST_SHELL="${testShell}" \ BASH_COMPLETION_SCRIPT="${completion}" \ HOME="$(mktemp -d)" \ @@ -168,5 +168,6 @@ in buildPythonPackage rec { homepage = http://beets.radbox.org; license = licenses.mit; maintainers = with maintainers; [ aszlig iElectric pjones ]; + platforms = platforms.linux; }; } -- GitLab From 02c25001953eaebbdea13fb28a865c958860ce97 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 26 Sep 2015 11:00:02 +0200 Subject: [PATCH 296/553] release-notes/15.09: Use