diff options
Diffstat (limited to 'pkgs')
105 files changed, 2613 insertions, 1029 deletions
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 545e7c5047a9..246e02c53c72 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.23.15"; + version = "4.0.16"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; + sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 39cd1a444fa8..e0e620bd05f9 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, - gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, + gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -11,24 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser - flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.defaultIconTheme - hicolor-icon-theme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + buildInputs = [ + curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf + gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta + ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; - preFixup = '' - wrapProgram "$out/bin/gtkpod" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 1afb36571bd9..55c3dfa92e30 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.gnome-themes-standard gnome3.defaultIconTheme + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; @@ -28,8 +28,6 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gobjectIntrospection gtk3 pygobject3 ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index c68f2cd4a35f..e38f38dad78c 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,41 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero +{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, makeWrapper }: +, wrapGAppsHook }: let - major = "3.16"; - minor = "1"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "sound-juicer-${version}"; + pname = "sound-juicer"; + version = "3.16.1"; +in stdenv.mkDerivation rec{ + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3 - gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes - makeWrapper (stdenv.lib.getLib gnome3.dconf) - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" - done - ''; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + buildInputs = [ + glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { description = "A Gnome CD Ripper"; diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 0fb1b77e7081..39d1c266a373 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }: +{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { name = "streamripper-${version}"; @@ -10,13 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libogg libvorbis ]; + buildInputs = [ glib libogg libvorbis libmad ]; meta = with stdenv.lib; { homepage = http://streamripper.sourceforge.net/; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index b0d8ae8d3cf6..1ea4b4d27506 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext -, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 +{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext +, gnome3, libnotify, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , appstream-glib, desktop-file-utils, duplicity @@ -15,20 +15,14 @@ stdenv.mkDerivation rec { }; patches = [ - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils; + }) ]; - postPatch = '' - substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \ - "/bin/rm" \ - "${coreutils}/bin/rm" - ''; - - # couldn't find gio/gdesktopappinfo.h - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_38 gettext intltool itstool + meson ninja pkgconfig vala_0_40 gettext itstool appstream-glib desktop-file-utils libxml2 wrapGAppsHook ]; @@ -40,6 +34,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ duplicity ]; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch index 1cc57e6a54a2..26126fdc9d56 100644 --- a/pkgs/applications/backup/deja-dup/fix-paths.patch +++ b/pkgs/applications/backup/deja-dup/fix-paths.patch @@ -1,12 +1,11 @@ -diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build -index 04b136f3..ed8f7cba 100644 ---- a/deja-dup/nautilus/meson.build -+++ b/deja-dup/nautilus/meson.build -@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'], - link_with: [dirhandling], - dependencies: [nautilus_dep], - install: true, -- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir')) -+ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0')) +--- a/libdeja/tools/duplicity/DuplicityInstance.vala ++++ b/libdeja/tools/duplicity/DuplicityInstance.vala +@@ -159,7 +159,7 @@ + // We already are pretty sure we don't have other duplicities in our + // archive directories, because we use our own and we ensure we only have + // one deja-dup running at a time via DBus. +- Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock"); ++ Posix.system("@coreutils@/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock"); - endif + Process.spawn_async_with_pipes(null, real_argv, real_envp, + SpawnFlags.SEARCH_PATH | diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a4a71c12820e..3c5574388236 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -211,7 +211,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: - (mkJetBrainsProduct { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { @@ -225,8 +225,13 @@ let maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; + }) (attrs: { + patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' + # Webstorm tries to use bundled jre if available. + # Lets prevent this for the moment + rm -r jre64 + ''; }); - in { diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 404160668b45..868dfaf3d12a 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018-02-15"; + version = "2018-03-22"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "f5e39972eb525166dc5b1d963067f79990991a75"; - sha256 = "160a302xg6nfzx49dkis6ij20kyzr63kxvcv8ld3l07l8k69g80r"; + rev = "f8e297acef1be0657b779fea5256f606a6c6a3a3"; + sha256 = "14xmw3lkwzppm9bns55nmyb1lfihzhdyisf6xjqlszdj4mcf94jl"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix new file mode 100644 index 000000000000..ec2498aa69b9 --- /dev/null +++ b/pkgs/applications/editors/texmacs/common.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +rec { + extraFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; + sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7"; + }; + + fullFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz"; + sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f"; + }; + + chineseFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz"; + sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp"; + }; + + japaneseFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz"; + sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn"; + }; + + koreanFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz"; + sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh"; + }; + + postPatch = (if tex == null then '' + gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) + '' else if extraFonts then '' + gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if chineseFonts then '' + gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if japaneseFonts then '' + gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if koreanFonts then '' + gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) + '' else ""); + + + meta = { + description = "WYSIWYW editing platform with special features for scientists"; + longDescription = + '' GNU TeXmacs is a free wysiwyw (what you see is what you want) + editing platform with special features for scientists. The software + aims to provide a unified and user friendly framework for editing + structured documents with different types of content (text, + graphics, mathematics, interactive content, etc.). The rendering + engine uses high-quality typesetting algorithms so as to produce + professionally looking documents, which can either be printed out or + presented from a laptop. + + The software includes a text editor with support for mathematical + formulas, a small technical picture editor and a tool for making + presentations from a laptop. Moreover, TeXmacs can be used as an + interface for many external systems for computer algebra, numerical + analysis, statistics, etc. New presentation styles can be written + by the user and new features can be added to the editor using the + Scheme extension language. A native spreadsheet and tools for + collaborative authoring are planned for later. + ''; + homepage = http://texmacs.org/; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix new file mode 100644 index 000000000000..e319ccf39b1b --- /dev/null +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -0,0 +1,59 @@ +{ stdenv, callPackage, fetchurl, makeWrapper, + guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, + tex ? null, + aspell ? null, + netpbm ? null, + imagemagick ? null, + extraFonts ? false, + chineseFonts ? false, + japaneseFonts ? false, + koreanFonts ? false }: +let + version = "1.99.4"; + common = callPackage ./common.nix { + inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; + }; +in +stdenv.mkDerivation { + name = "TeXmacs-${version}"; + + src= fetchurl { + url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a"; + }; + + patches = [ ./darwin.patch ]; + + buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ]; + + GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile "; + + NIX_LDFLAGS="${zlib}/lib/libz.dylib"; + + buildPhase = '' + substituteInPlace Makefile \ + --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \ + --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true' + make MACOS_BUNDLE + ''; + + installPhase = '' + mkdir -p $out/Applications + cp -R ../distr/TeXmacs-${version}.app $out/Applications + ''; + + inherit (common) postPatch; + + postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " + + "${ghostscript}/bin:" + + (if aspell == null then "" else "${aspell}/bin:") + + (if tex == null then "" else "${tex}/bin:") + + (if netpbm == null then "" else "${netpbm}/bin:") + + (if imagemagick == null then "" else "${imagemagick}/bin:"); + + enableParallelBuilding = true; + + meta = common.meta // { + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/applications/editors/texmacs/darwin.patch b/pkgs/applications/editors/texmacs/darwin.patch new file mode 100644 index 000000000000..2cb33fbbef30 --- /dev/null +++ b/pkgs/applications/editors/texmacs/darwin.patch @@ -0,0 +1,29 @@ +--- a/configure ++++ b/configure +@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; } + CONFIG_QTPIPES="yes" + CONFIG_CXXFLAGS="-I${prefix}/include" + CONFIG_BSHARED="" +- CONFIG_BFLAGS="-framework Cocoa -framework IOKit" ++ CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation" + CONFIG_BPATH="" + CONFIG_SO="dylib" + CONFIG_LIB_PATH="DYLD_LIBRARY_PATH" +@@ -8281,6 +8281,7 @@ _ASEOF + if $QMAKE ${additional_qmake_flags} ; then :; else + as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5 + fi ++ echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file + # Try to compile a simple Qt app. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5 + $as_echo_n "checking whether we can build a simple Qt app... " >&6; } +--- a/src/Plugins/Unix/unix_sys_utils.cpp ++++ b/src/Plugins/Unix/unix_sys_utils.cpp +@@ -17,6 +17,7 @@ + #include <spawn.h> + #include <unistd.h> + #include <sys/wait.h> ++#include <pthread.h> + + // for thread safe strings + #include <string> diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index e51813459c6f..447e729d4f9b 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -1,41 +1,21 @@ -{stdenv, fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype, - tex ? null, - aspell ? null, - ghostscriptX ? null, - extraFonts ? false, - chineseFonts ? false, - japaneseFonts ? false, - koreanFonts ? false }: - -let +{ stdenv, callPackage, + fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype, + tex ? null, + aspell ? null, + ghostscriptX ? null, + extraFonts ? false, + chineseFonts ? false, + japaneseFonts ? false, + koreanFonts ? false }: + +let pname = "TeXmacs"; version = "1.99.2"; - extraFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; - sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7"; - }; - - fullFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz"; - sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f"; - }; - - chineseFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz"; - sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp"; - }; - - japaneseFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz"; - sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn"; - }; - - koreanFontsSrc = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz"; - sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh"; + common = callPackage ./common.nix { + inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { @@ -45,56 +25,21 @@ stdenv.mkDerivation rec { buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ]; - patchPhase = (if tex == null then '' - gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) - '' else if extraFonts then '' - gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if chineseFonts then '' - gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if japaneseFonts then '' - gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if koreanFonts then '' - gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) - '' else ""); - postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + (if aspell == null then "" else "${aspell}/bin:") + (if tex == null then "" else "${tex}/bin:") + "${xmodmap}/bin:${which}/bin"; + inherit (common) postPatch; + postFixup = '' bin="$out/libexec/TeXmacs/bin/texmacs.bin" rpath=$(patchelf --print-rpath "$bin") patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin" ''; - meta = { - description = "WYSIWYW editing platform with special features for scientists"; - longDescription = - '' GNU TeXmacs is a free wysiwyw (what you see is what you want) - editing platform with special features for scientists. The software - aims to provide a unified and user friendly framework for editing - structured documents with different types of content (text, - graphics, mathematics, interactive content, etc.). The rendering - engine uses high-quality typesetting algorithms so as to produce - professionally looking documents, which can either be printed out or - presented from a laptop. - - The software includes a text editor with support for mathematical - formulas, a small technical picture editor and a tool for making - presentations from a laptop. Moreover, TeXmacs can be used as an - interface for many external systems for computer algebra, numerical - analysis, statistics, etc. New presentation styles can be written - by the user and new features can be added to the editor using the - Scheme extension language. A native spreadsheet and tools for - collaborative authoring are planned for later. - ''; - homepage = http://texmacs.org/; - license = stdenv.lib.licenses.gpl2Plus; + meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 0db93f78781d..2af6e93bcfcc 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { libselinux ]; + postPatch = '' + patchShebangs ./configure + ''; + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 9dd0722541f4..633a1d9bd6e6 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -50,13 +50,13 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.8.0"; + version = "5.9.0"; src = fetchFromGitHub { owner = "KDE"; repo = "digikam"; rev = "v${version}"; - sha256 = "1bvidg0fn92xvw5brhb34lm7m4iy4jb5xpvnhbgh8vik2m4n41w1"; + sha256 = "09diw273h9i7rss89ba82yrfy6jb2njv3k0dknrrg7bb998vrw2d"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8fd65770afd5..2555fe409f25 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -130,6 +130,7 @@ let krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libgravatar = callPackage ./libgravatar.nix {}; diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix new file mode 100644 index 000000000000..bec92d55966d --- /dev/null +++ b/pkgs/applications/kde/ksystemlog.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, gettext, kdoctools, + karchive, kconfig, kio +}: + +mkDerivation { + name = "ksystemlog"; + + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; + propagatedBuildInputs = [ karchive kconfig kio ]; + + meta = with lib; { + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix new file mode 100644 index 000000000000..fdb236194f9c --- /dev/null +++ b/pkgs/applications/misc/mucommander/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }: + +let + version = "0.9.2"; + name = "mucommander-${version}"; + + src = fetchFromGitHub { + owner = "mucommander"; + repo = "mucommander"; + rev = version; + sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; + }; + + postPatch = '' + # there is no .git anyway + substituteInPlace build.gradle \ + --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \ + --replace "revision = git.head().id" "revision = 'abcdefgh'" + + # disable gradle plugins with native code and their targets + perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle + perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar)/ ... /^}/" build.gradle + + # fix source encoding + find . -type f -name build.gradle \ + -exec perl -i.bak3 -pe "s#(repositories\.jcenter\(\))# + \1 + compileJava.options.encoding = 'UTF-8' + compileTestJava.options.encoding = 'UTF-8' + #" {} \; + ''; + + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src postPatch; + nativeBuildInputs = [ gradle_3_5 perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon build + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7"; + }; + +in stdenv.mkDerivation { + inherit name src postPatch; + nativeBuildInputs = [ gradle_3_5 perl makeWrapper ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + + # point to offline repo + find . -type f -name build.gradle \ + -exec perl -i.bak3 -pe "s#repositories\.jcenter\(\)# + repositories { mavenLocal(); maven { url '${deps}' } } + #" {} \; + + gradle --offline --no-daemon build + ''; + + installPhase = '' + mkdir $out + tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 + wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre} + ''; + + meta = with stdenv.lib; { + homepage = http://www.mucommander.com/; + description = "Cross-platform file manager"; + license = licenses.gpl3; + maintainers = with maintainers; [ volth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 825a37faf1ef..c7512a8ac271 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft -, fontconfig, conf ? null, patches ? [], extraLibs ? []}: +{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext +, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}: with stdenv.lib; @@ -17,11 +17,12 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out + wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin" ''; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8d08eceb1692..cf5405a4a071 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -130,9 +130,11 @@ let mkdir -p "$out/share" ln -s "${browser}/share/icons" "$out/share/icons" else - mkdir -p "$out/share/icons/hicolor/128x128/apps" - ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \ - "$out/share/icons/hicolor/128x128/apps/${browserName}.png" + for res in 16 32 48 64 128; do + mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" + ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \ + "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + done fi install -D -t $out/share/applications $desktopItem/share/applications/* diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8dbf0e774e47..74f784a1ba1a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.5.2"; + version = "1.6.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1h4qa5i7axkmsai854yvlyh5r038mmjl4pj2rd27mz11if7yf067"; + sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index adf718a70ea1..afba9ab022ad 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,21 +1,18 @@ { qt5, stdenv }: -let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; -in { - stable = mkTelegram { +let + mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; + stableVersion = { stable = true; - version = "1.2.6"; - sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w"; + version = "1.2.14"; + sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "283641"; - archPatchesHash = "0v4213vrabfa2dmwnqgb8n6hl54938mw9glaim3amyslxphmdrfb"; + archPatchesRevision = "310557"; + archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; }; - preview = mkTelegram { +in { + stable = mkTelegram stableVersion; + preview = mkTelegram (stableVersion // { stable = false; - version = "1.2.12"; - sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m"; - # svn ls -v --depth empty svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "308775"; - archPatchesHash = "0ggx64kdadrbd4bw5z0wi0fdg6hni7n9nxz9dp56p8hlw1wgpsls"; - }; + }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 89bc3da56b8a..7027e70f0c88 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -117,16 +117,18 @@ mkDerivation rec { # This is necessary to run Telegram in a pure environment. wrapProgram $out/bin/telegram-desktop \ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ + --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; meta = { - description = "Telegram Desktop messaging app"; + description = "Telegram Desktop messaging app " + + (if stable then "(stable version)" else "(pre-release)"); license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ abbradar garbas primeos ]; + maintainers = with maintainers; [ primeos abbradar garbas ]; }; } diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 71df7a0fb1e7..aa2a971b15f6 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.39"; + version = "1.40"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "1x9qxhqkbyd7kd52ai9p996ppslh73xarn5w4ljaa97wwm5vwwsg"; + sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 32abab8abf8e..b1aa10800d6f 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "4"; - patch = "5"; - tweak = "1"; + patch = "6"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb"; + sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 8726d5130d75..866b8e923378 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54"; + sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl"; + sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; }; }; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index e26471de5761..520510698e3c 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -6,6 +6,7 @@ , gtk3 , granite , gnome3 +, gobjectIntrospection , json-glib , cmake , ninja @@ -26,11 +27,6 @@ stdenv.mkDerivation rec { }; USER = "nix-build-user"; - XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ - "${granite}/share" - "${gnome3.libgee}/share" - ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook @@ -39,6 +35,7 @@ stdenv.mkDerivation rec { ninja gettext libxml2 + gobjectIntrospection # For setup hook ]; buildInputs = [ gtk3 @@ -47,7 +44,6 @@ stdenv.mkDerivation rec { json-glib libgudev libevdev - gnome3.gnome-themes-standard ]; meta = with stdenv.lib; { diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8ab1fbc88731..49588a589937 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -941,8 +941,8 @@ rec { }; ubuntu1710i386 = { - name = "ubuntu-17.10-xenial-i386"; - fullName = "Ubuntu 17.10 Xenial (i386)"; + name = "ubuntu-17.10-artful-i386"; + fullName = "Ubuntu 17.10 Artful (i386)"; packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 864535794f87..7c90b16d86a1 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,7 +1,7 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes +{ stdenv, intltool, fetchurl , pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, gspell }: +, wrapGAppsHook, itstool, libsoup, libxml2 +, gnome3, gspell }: stdenv.mkDerivation rec { name = "gedit-${version}"; @@ -12,24 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; }; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ]; + buildInputs = [ + gtk3 glib + gnome3.defaultIconTheme libsoup + gnome3.libpeas gnome3.gtksourceview + gnome3.gsettings-desktop-schemas gspell + ]; enableParallelBuilding = true; - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gedit"; + attrPath = "gnome3.gedit"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gedit; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 1a8c2f55b1b0..60e8822135ce 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -4,37 +4,36 @@ , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11-kit, openssh }: -stdenv.mkDerivation rec { - name = "seahorse-${version}"; +let + pname = "seahorse"; version = "3.20.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; }; - }; - doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg - gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11-kit vala - openssh ]; + nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.gcr + gnome3.gsettings-desktop-schemas gnupg + gnome3.defaultIconTheme gpgme + libsecret avahi libsoup p11-kit + openssh + ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Seahorse; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 3bc32f99f3ef..6877b20df44d 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,8 +1,8 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit -, sqlite, gcr, isocodes, desktop-file-utils, file -, gdk_pixbuf, gnome-common, gst_all_1, json-glib }: +, sqlite, gcr, isocodes, desktop-file-utils +, gdk_pixbuf, gst_all_1, json-glib }: stdenv.mkDerivation rec { name = "epiphany-${version}"; @@ -13,31 +13,33 @@ stdenv.mkDerivation rec { sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "epiphany"; }; - }; - # Tests need an X display mesonFlags = [ "-Dunit_tests=false" ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ]; + nativeBuildInputs = [ + meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils + ]; - buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify - sqlite isocodes p11-kit icu gnome3.yelp-tools - gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr - glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav json-glib ]; - - enableParallelBuilding = true; + buildInputs = [ + gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + sqlite isocodes p11-kit icu + gdk_pixbuf gnome3.defaultIconTheme gcr + glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav json-glib + ]; postPatch = '' chmod +x post_install.py # patchShebangs requires executable file patchShebangs post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "epiphany"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 8966893bde72..5f6ed213e3e0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" + --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 95fcfac1d751..ee1feb6ddaeb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -11,18 +11,20 @@ stdenv.mkDerivation rec { sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; }; - }; - doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gnome3.defaultIconTheme ]; + nativeBuildInputs = [ + meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool - desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; - buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-dictionary"; + attrPath = "gnome3.gnome-dictionary"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 4dde871ec702..0478877acb4b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk, glib, wrapGAppsHook, libnotify -, itstool, gnome3, gdk_pixbuf, libxml2 +, itstool, gnome3, libxml2 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl - wrapGAppsHook libxml2 ]; - buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - gdk_pixbuf udisks2 gnome3.defaultIconTheme - gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxslt docbook_xsl + wrapGAppsHook libxml2 + ]; + buildInputs = [ + gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.defaultIconTheme + gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 1f7aa4d874ad..f5b33c88f574 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,20 +1,18 @@ { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 -, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib -, gnome3, librsvg, gdk_pixbuf }: +, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils +, gnome3 }: -stdenv.mkDerivation rec { - name = "gnome-screenshot-${version}"; +let + pname = "gnome-screenshot"; version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; }; - }; - doCheck = true; postPatch = '' @@ -22,17 +20,19 @@ stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; - buildInputs = [ bash gtk3 glib libcanberra-gtk3 - gnome3.gsettings-desktop-schemas ]; - - patches = [ - ./prevent-cache-updates.patch + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ + gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; description = "Utility used in the GNOME desktop environment for taking screenshots"; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch b/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch deleted file mode 100644 index 370d09cd2f02..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/build-aux/postinstall.py -+++ b/build-aux/postinstall.py -@@ -8,18 +8,6 @@ - - # Packaging tools define DESTDIR and this isn't needed for them - if 'DESTDIR' not in os.environ: -- print('Updating icon cache...') -- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor') -- if not os.path.exists(icon_cache_dir): -- os.makedirs(icon_cache_dir) -- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir]) -- -- print('Updating desktop database...') -- desktop_database_dir = os.path.join(datadir, 'applications') -- if not os.path.exists(desktop_database_dir): -- os.makedirs(desktop_database_dir) -- subprocess.call(['update-desktop-database', '-q', desktop_database_dir]) -- - print('Compiling GSettings schemas...') - schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas') - if not os.path.exists(schemas_dir): diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index 673140c3e1b6..23a41b6d6ae6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -1,34 +1,31 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: +, gtk3, glib, wrapGAppsHook +, itstool, gnome3, libxml2 }: -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; +let + pname = "gnome-system-log"; + version = "3.9.90"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; }; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; 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; diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index a5ce9ee5e105..a65d0f401f0e 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -6,6 +6,8 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; @@ -13,11 +15,12 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index a9d8b2ad11cb..49bd43e61950 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg -, gdk_pixbuf, file, tracker, nautilus }: +, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg +, gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { name = "totem-${version}"; @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; }; - }; - doCheck = true; # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 @@ -26,14 +22,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; - buildInputs = [ gtk3 glib 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 - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus ]; + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib 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 + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus + ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; @@ -50,11 +46,17 @@ stdenv.mkDerivation rec { patchShebangs . ''; - mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; + mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ]; - GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "totem"; + attrPath = "gnome3.totem"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Movie player for the GNOME desktop based on GStreamer"; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 60b91aaa04a3..691ec2fdb94a 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff -, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 +, gnome3, sqlite +, itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,21 +12,20 @@ stdenv.mkDerivation rec { sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v"; }; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib webkitgtk sqlite + libxml2 libxslt gnome3.yelp-xsl + gnome3.defaultIconTheme + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + passthru = { - updateScript = gnome3.updateScript { packageName = "yelp"; }; + updateScript = gnome3.updateScript { + packageName = "yelp"; + }; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme groff - 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"; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 5a95802b81a7..1994b587fbd3 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -5,18 +5,17 @@ , gnome3, librsvg, gnome-doc-utils, webkitgtk }: let - majorVersion = "0.12"; + pname = "geary"; + version = "0.12.1"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite @@ -28,15 +27,21 @@ stdenv.mkDerivation rec { "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" ]; - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' - ''; + # TODO: This is bad, upstream should fix their code. + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0"; preFixup = '' # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 314539b7f9e6..32da3a9a4b81 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -3,37 +3,49 @@ , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , libsoup }: -stdenv.mkDerivation rec { - name = "gitg-${version}"; +let + pname = "gitg"; version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gitg"; }; - }; - 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"; + enableParallelBuilding = true; - propagatedUserEnvPkgs = [ shared-mime-info - gnome3.gnome-themes-standard ]; + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas - librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; + buildInputs = [ + gtk3 glib json-glib libgee libpeas gnome3.libsoup + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas + libsecret gobjectIntrospection gnome3.adwaita-icon-theme + ]; nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + homepage = https://wiki.gnome.org/Apps/Gitg; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 02f58f81200e..7920c8e1f458 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -8,13 +8,13 @@ , libXmu }: let - version = "0.25.0"; + version = "0.26.2"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; + sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo base gui freetype x11 libXmu ]; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 4d9f763acc4e..40c79274aae4 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -11,13 +11,13 @@ , pkgconfig, portaudio }: let - version = "1.24.9"; + version = "1.25.1"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; + sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index 5075ec5500c1..9f1b0ef47fe5 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,13 +1,13 @@ { fetchurl, base, back, gsmakeDerivation, gui }: let - version = "1.2.22"; + version = "1.2.23"; in gsmakeDerivation { name = "gorm-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi"; + sha256 = "18pf9vvzvdk8bg4lhjb96y1kdkmb9ahmvrqv2581vn45pjxmmlnb"; }; buildInputs = [ base back gui ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48fa8c0e3035..4d85a26227ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -344,7 +344,6 @@ self: super: { orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; persistent-redis = dontCheck super.persistent-redis; - pure-zlib = dontCheck super.pure-zlib; # https://github.com/NixOS/nixpkgs/issues/37499 pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server @@ -1006,4 +1005,7 @@ self: super: { # https://github.com/fpco/inline-c/issues/72 inline-c = dontCheck super.inline-c; + # https://github.com/GaloisInc/pure-zlib/issues/6 + pure-zlib = doJailbreak super.pure-zlib; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index b39efcbde77d..d953236784ee 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -659,31 +659,14 @@ self: super: { sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; }); - # https://github.com/jgm/pandoc-types/issues/37 - pandoc-types = self.pandoc-types_1_17_4_2; - - ## Need latest git version to support current haddock-library versions. - pandoc = overrideSrc super.pandoc { - version = "2.1.2-git"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = "pandoc"; - rev = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec"; - sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a"; - }; - }; - - # Fix missing semigroup instance. - json = appendPatch super.json (pkgs.fetchpatch - { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch; - sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z"; - }); - # Older versions don't compile. brick = self.brick_0_35; - timezone-olson = self.timezone-olson_0_1_9; - matrix = self.matrix_0_3_6_1; getopt-generics = self.getopt-generics_0_13_0_2; + HaTeX = self.HaTeX_3_19_0_0; + json = self.json_0_9_2; + matrix = self.matrix_0_3_6_1; + pandoc = self.pandoc_2_1_3; + pandoc-types = self.pandoc-types_1_17_4_2; # https://github.com/xmonad/xmonad/issues/155 xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch @@ -691,4 +674,7 @@ self: super: { sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp"; })) self.semigroups; + # https://github.com/xmonad/xmonad-contrib/issues/235 + xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch); + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 901d49a4faed..00505f31b462 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2957,6 +2957,7 @@ dont-distribute-packages: ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] + asciidiagram: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2975,6 +2976,7 @@ dont-distribute-packages: atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + atom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3023,6 +3025,7 @@ dont-distribute-packages: aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3073,6 +3076,7 @@ dont-distribute-packages: barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3081,6 +3085,7 @@ dont-distribute-packages: batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] + battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3149,6 +3154,7 @@ dont-distribute-packages: bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3244,6 +3250,7 @@ dont-distribute-packages: bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeping-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3552,6 +3559,7 @@ dont-distribute-packages: cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] + codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3707,6 +3715,7 @@ dont-distribute-packages: CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] + corenlp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-object: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3775,6 +3784,7 @@ dont-distribute-packages: cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + csg: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3803,6 +3813,7 @@ dont-distribute-packages: dag: [ i686-linux, x86_64-linux, x86_64-darwin ] damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] + danibot: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3858,6 +3869,7 @@ dont-distribute-packages: data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3899,6 +3911,7 @@ dont-distribute-packages: ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dde: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4106,6 +4119,7 @@ dont-distribute-packages: dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] dual: [ i686-linux, x86_64-linux, x86_64-darwin ] + dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4507,9 +4521,11 @@ dont-distribute-packages: friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] + frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] + fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4540,6 +4556,7 @@ dont-distribute-packages: futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] + fuzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4635,6 +4652,7 @@ dont-distribute-packages: gf: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4642,6 +4660,7 @@ dont-distribute-packages: ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4667,12 +4686,18 @@ dont-distribute-packages: ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-atk: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-dbusmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-dbusmenugtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gobject: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4750,6 +4775,7 @@ dont-distribute-packages: GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5188,10 +5214,12 @@ dont-distribute-packages: haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-gi: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5546,6 +5574,7 @@ dont-distribute-packages: HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlrdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hls: [ i686-linux, x86_64-linux, x86_64-darwin ] hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5757,6 +5786,7 @@ dont-distribute-packages: HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5977,6 +6007,7 @@ dont-distribute-packages: imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] + imm: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5992,6 +6023,7 @@ dont-distribute-packages: inch: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + incremental-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] indents: [ i686-linux, x86_64-linux, x86_64-darwin ] indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6478,6 +6510,7 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] + lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6790,6 +6823,7 @@ dont-distribute-packages: mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-subclasses: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7104,6 +7138,7 @@ dont-distribute-packages: open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-symbology: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7130,6 +7165,7 @@ dont-distribute-packages: OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] openweathermap: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] + opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] optional: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7316,6 +7352,7 @@ dont-distribute-packages: pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] + picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7377,6 +7414,7 @@ dont-distribute-packages: plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] plots: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7677,6 +7715,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasterific-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7847,6 +7886,7 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ] rfc: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7911,6 +7951,7 @@ dont-distribute-packages: rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] + rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ] RtMidi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7973,6 +8014,7 @@ dont-distribute-packages: scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + scc: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8348,6 +8390,7 @@ dont-distribute-packages: spake2: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparrow: [ i686-linux, x86_64-linux, x86_64-darwin ] sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8522,12 +8565,14 @@ dont-distribute-packages: superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] superevent: [ i686-linux, x86_64-linux, x86_64-darwin ] + supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] superrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] sv: [ i686-linux, x86_64-linux, x86_64-darwin ] SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ] + svg-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVGFonts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8771,6 +8816,7 @@ dont-distribute-packages: timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + timerep: [ i686-linux, x86_64-linux, x86_64-darwin ] timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9042,6 +9088,7 @@ dont-distribute-packages: vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9486,5 +9533,7 @@ dont-distribute-packages: zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] + ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] + zxcvbn-c: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be3d3ae673fd..ac04f2d7ceaa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3393,8 +3393,8 @@ self: { ({ mkDerivation, base, parsec, pretty }: mkDerivation { pname = "CoreErlang"; - version = "0.0.3"; - sha256 = "111012wpnfa3bm9r5xnfhm5xjq8ppsnwx01a6njbvmqi9hcba3nc"; + version = "0.0.4"; + sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z"; libraryHaskellDepends = [ base parsec pretty ]; homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; @@ -6643,8 +6643,8 @@ self: { }: mkDerivation { pname = "Gifcurry"; - version = "3.0.0.0"; - sha256 = "1x7hbfjcly41sk3bins3z522651v1fqybb64dj1a6f6lvglx6ms8"; + version = "3.0.0.1"; + sha256 = "0c6wk6kngrpmjwxwixynxfvr92ycvxmivvcvbk171x4a47zcg4sq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -12735,6 +12735,8 @@ self: { pname = "MonadRandom"; version = "0.5.1"; sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy"; + revision = "1"; + editedCabalFile = "19242r11a7iqr8dnbxsac04c3ylh7xkan70pdv5k3jzcmfwn4shd"; libraryHaskellDepends = [ base fail mtl primitive random transformers transformers-compat ]; @@ -14008,6 +14010,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; + "OpenGLRaw_3_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, libGL + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.3.0.0"; + sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ libGL ]; + 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) libGL;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -27188,14 +27208,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs_0_3_0_1" = callPackage + "apecs_0_3_0_2" = callPackage ({ mkDerivation, async, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.3.0.1"; - sha256 = "04vqhkikyxgyzm61jlw21ycg3iv5fsx24q31a7gy5cxh5fqmw76k"; + version = "0.3.0.2"; + sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -29012,6 +29032,7 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -29541,6 +29562,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async + , microlens, microlens-th, monad-logger, safe-exceptions, stm + , test-framework, test-framework-hunit, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "async-refresh"; + version = "0.3.0.0"; + sha256 = "1j9llc84f93srw80pyldcglzmssl0l961bzlwsrvbaa84ldhcs6s"; + libraryHaskellDepends = [ + base formatting lifted-async microlens microlens-th monad-logger + safe-exceptions stm text unliftio unliftio-core + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger stm test-framework + test-framework-hunit text + ]; + homepage = "https://github.com/mtesseract/async-refresh"; + description = "Package implementing core logic for refreshing of expiring data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-refresh-tokens" = callPackage ({ mkDerivation, async-refresh, base, bytestring, criterion , formatting, HUnit, lifted-async, microlens, microlens-th @@ -29564,6 +29609,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh-tokens_0_4_0_0" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, microlens, microlens-th, monad-logger + , safe-exceptions, test-framework, test-framework-hunit, text + , unliftio, unliftio-core + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.4.0.0"; + sha256 = "1py7ips87gbwdhxdfv0xh4hkgw0my4nkkz4w1vwcb3s296a439v7"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting microlens microlens-th + monad-logger safe-exceptions text unliftio unliftio-core + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger test-framework + test-framework-hunit unliftio + ]; + homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; + description = "Package implementing core logic for refreshing of expiring access tokens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-timer" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework @@ -29824,6 +29893,7 @@ self: { ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atom-msp430" = callPackage @@ -31318,6 +31388,7 @@ self: { homepage = "https://github.com/rcook/aws-easy#readme"; description = "AWS Easy: Helper functions for working with amazonka"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-ec2" = callPackage @@ -32538,6 +32609,7 @@ self: { homepage = "https://github.com/hvr/base-noprelude"; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-orphans" = callPackage @@ -33004,6 +33076,7 @@ self: { ]; description = "Public API definitions of BattlePlace.io service"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "battleship-combinatorics" = callPackage @@ -34105,6 +34178,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; + revision = "1"; + editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -35070,6 +35145,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage @@ -35643,21 +35719,19 @@ self: { }) {}; "biohazard" = callPackage - ({ mkDerivation, async, attoparsec, base, base-prelude, binary - , bytestring, containers, directory, exceptions, filepath, hashable - , primitive, random, scientific, stm, text, transformers, unix - , unordered-containers, vector, vector-algorithms, vector-th-unbox - , zlib + ({ mkDerivation, async, attoparsec, base, base-prelude, bytestring + , containers, exceptions, hashable, primitive, stm, text + , transformers, unix, unordered-containers, vector + , vector-algorithms, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "1.0.0"; - sha256 = "0cc855d3h1fh52ldvqzwf3f834g8singavvpk1ir157fgg8qjz3g"; + version = "1.0.1"; + sha256 = "0gzsrrapv3ih598qqacnipqgxxzxmci98rzvc54jxv3hajsnxkqb"; libraryHaskellDepends = [ - async attoparsec base base-prelude binary bytestring containers - directory exceptions filepath hashable primitive random scientific - stm text transformers unix unordered-containers vector - vector-algorithms vector-th-unbox zlib + async attoparsec base base-prelude bytestring containers exceptions + hashable primitive stm text transformers unix unordered-containers + vector vector-algorithms vector-th-unbox zlib ]; homepage = "https://bitbucket.org/ustenzel/biohazard"; description = "bioinformatics support library"; @@ -37864,6 +37938,7 @@ self: { homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bool-extras" = callPackage @@ -39586,8 +39661,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.0.0"; - sha256 = "03z27wx9g8pmx07r2cc5mzp3p7qpzq7gp590k9kd3kq1q9dx2096"; + version = "0.3.1.0"; + sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40187,6 +40262,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit_0_3_0_1" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default-class, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit"; + version = "0.3.0.1"; + sha256 = "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + librarySystemDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; + description = "Streaming compression/decompression via conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -43011,10 +43114,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.1"; - sha256 = "178d1sbfvscbmgwm5basbzciflrj6i6w55w1pmm6wyiibfbcwapf"; - revision = "1"; - editedCabalFile = "0wik7fy8qs1971bxziap6lkc8pxl83mz642gprh07qrx3kfx0qs1"; + version = "0.3.0.2"; + sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44918,10 +45019,11 @@ self: { }: mkDerivation { pname = "chronologique"; - version = "0.3.0.0"; - sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + version = "0.3.0.1"; + sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14"; libraryHaskellDepends = [ base hourglass time vector ]; testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; + homepage = "https://github.com/afcowie/chronologique/"; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -46287,14 +46389,12 @@ self: { }) {}; "cld2" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, base, bytestring, hashable, text }: mkDerivation { pname = "cld2"; - version = "0.1.0.1"; - sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; - revision = "1"; - editedCabalFile = "1gfgnhy9ahyq7y74mpc6gsmir8v0c2d6z81klw1zhack6pmnql30"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.1"; + sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd"; + libraryHaskellDepends = [ base bytestring hashable text ]; homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; @@ -47550,6 +47650,7 @@ self: { homepage = "https://github.com/hkgumbs/codec-beam#readme"; description = "Erlang VM byte code assembler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codec-libevent" = callPackage @@ -47588,25 +47689,26 @@ self: { "codec-rpm" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-combinators, conduit-extra, cpio-conduit, hspec + , conduit, conduit-extra, cpio-conduit, exceptions, hspec , hspec-attoparsec, HUnit, lzma-conduit, mtl, parsec, pretty , resourcet, text }: mkDerivation { pname = "codec-rpm"; - version = "0.2.0"; - sha256 = "1n977xndg2ii866a868rvbi581p0gbz5zpy1glrg6n9znm6y9l4h"; + version = "0.2.1"; + sha256 = "00ywr4frndvw3chlxpqdx2rimd7jjdyzmjlm1kvw23qbgfyd60is"; libraryHaskellDepends = [ - attoparsec attoparsec-binary base bytestring conduit - conduit-combinators conduit-extra cpio-conduit lzma-conduit mtl - parsec pretty resourcet text + attoparsec attoparsec-binary base bytestring conduit conduit-extra + cpio-conduit exceptions lzma-conduit mtl parsec pretty resourcet + text ]; testHaskellDepends = [ - attoparsec base bytestring hspec hspec-attoparsec HUnit text + attoparsec attoparsec-binary base bytestring hspec hspec-attoparsec + HUnit parsec pretty text ]; homepage = "https://github.com/weldr/codec-rpm"; description = "A library for manipulating RPM files"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -48855,8 +48957,8 @@ self: { }: mkDerivation { pname = "compactable"; - version = "0.1.1.1"; - sha256 = "0dbjwsbn5wgwwzl90wvcqf2c6968j5bkg1nzdll03nxklqnv3m9b"; + version = "0.1.2.0"; + sha256 = "0kh36h1zfdlhvcz8xzf3c4af0rbypa7p421rl0xsig914r5z519j"; libraryHaskellDepends = [ base bifunctors containers transformers vector ]; @@ -50139,6 +50241,8 @@ self: { pname = "conduit-audio"; version = "0.2.0.3"; sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1"; + revision = "1"; + editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx"; libraryHaskellDepends = [ base conduit vector ]; homepage = "http://github.com/mtolly/conduit-audio"; description = "Combinators to efficiently slice and dice audio streams"; @@ -50153,6 +50257,8 @@ self: { pname = "conduit-audio-lame"; version = "0.1.2.1"; sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za"; + revision = "1"; + editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr"; libraryHaskellDepends = [ base bytestring conduit conduit-audio resourcet transformers vector ]; @@ -50172,6 +50278,8 @@ self: { pname = "conduit-audio-samplerate"; version = "0.1.0.3"; sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi"; + revision = "1"; + editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw"; libraryHaskellDepends = [ base conduit conduit-audio resourcet transformers vector ]; @@ -50191,6 +50299,8 @@ self: { pname = "conduit-audio-sndfile"; version = "0.1.2.1"; sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z"; + revision = "1"; + editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg"; libraryHaskellDepends = [ base conduit conduit-audio hsndfile hsndfile-vector resourcet transformers @@ -51168,6 +51278,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constrictor" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "constrictor"; + version = "0.1.0.1"; + sha256 = "05km6cxk5c9k2m22x6379jnlvcxr9j6m52y3xqvjjvxkps2ppc9c"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/chessai/constrictor.git"; + description = "strict versions of many things in base"; + license = stdenv.lib.licenses.mit; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -51392,8 +51514,8 @@ self: { }: mkDerivation { pname = "content-store"; - version = "0.2.0"; - sha256 = "1xdv572mq2nc7nckq79c5bw64ldqrqahd0y8wiffwywbcwi8gyi9"; + version = "0.2.1"; + sha256 = "1c3l2fmznx3f1853scnpf6c60bbm1z99lkpxx36ldxrxizj2lmaj"; libraryHaskellDepends = [ aeson base bytestring cond conduit conduit-combinators conduit-extra cryptonite directory filepath htoml lzma-conduit @@ -51406,7 +51528,7 @@ self: { ]; homepage = "https://github.com/weldr/content-store"; description = "Store and retrieve data from an on-disk store"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52277,23 +52399,26 @@ self: { }) {}; "corenlp-parser" = callPackage - ({ mkDerivation, aeson, base, cryptonite, data-default, directory - , process, raw-strings-qq, rocksdb-haskell, safe-exceptions, store - , string-class, temporary, text, unordered-containers + ({ mkDerivation, aeson, async, base, cryptonite, data-default + , directory, process, raw-strings-qq, rocksdb, rocksdb-haskell + , safe-exceptions, split, store, string-class, temporary, text + , unordered-containers }: mkDerivation { pname = "corenlp-parser"; - version = "0.3.0.0"; - sha256 = "1mcw9nw74lca0p5kdr4mva6mz165dyipfqgc7i46kjk6pxlpcp0n"; + version = "0.3.0.1"; + sha256 = "14xjfcnk58mwgxywdlzdl53xdzf91scx0hmx8arhxkn6vr04akwp"; libraryHaskellDepends = [ - aeson base cryptonite data-default directory process raw-strings-qq - rocksdb-haskell safe-exceptions store string-class temporary text - unordered-containers + aeson async base cryptonite data-default directory process + raw-strings-qq rocksdb-haskell safe-exceptions split store + string-class temporary text unordered-containers ]; + librarySystemDepends = [ rocksdb ]; homepage = "https://github.com/k-bx/corenlp-parser#readme"; description = "Launches CoreNLP and parses the JSON output"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) rocksdb;}; "coroutine-enumerator" = callPackage ({ mkDerivation, base, enumerator, monad-coroutine }: @@ -54566,6 +54691,7 @@ self: { homepage = "https://github.com/dzhus/csg#readme"; description = "Analytical CSG (Constructive Solid Geometry) library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-catalog" = callPackage @@ -55532,6 +55658,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "cve" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "cve"; + version = "0.1.0.0"; + sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "github.com/chessai/cve.git"; + description = "simple and efficient cve datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cyclotomic" = callPackage ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -55748,6 +55886,7 @@ self: { executableHaskellDepends = [ base optparse-applicative ]; description = "Basic Slack bot framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dao" = callPackage @@ -56465,6 +56604,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-clist_0_1_2_1" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "data-clist"; + version = "0.1.2.1"; + sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s"; + libraryHaskellDepends = [ base deepseq QuickCheck ]; + homepage = "https://github.com/sw17ch/data-clist"; + description = "Simple functional ring type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-concurrent-queue" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -57757,6 +57909,7 @@ self: { ]; description = "An efficient implementation of maps from strings to arbitrary values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-structure-inferrer" = callPackage @@ -58922,19 +59075,31 @@ self: { }) {}; "dde" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, criterion, free-vector-spaces, lens, linear + , vector + }: mkDerivation { pname = "dde"; - version = "0.0.1"; - sha256 = "1mv3i56l3al386g6jr1dpkjx0mwpq25maqkw7zv8qdnshkg1x33f"; + version = "0.1.0"; + sha256 = "0kqcs758rdv186mqk17i66lmzzb34a4fd125669sh9gx255lbwya"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base vector ]; - executableHaskellDepends = [ base vector ]; - testHaskellDepends = [ base vector ]; + libraryHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + executableHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + testHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + benchmarkHaskellDepends = [ + base criterion free-vector-spaces lens linear vector + ]; homepage = "https://github.com/masterdezign/dde#readme"; description = "Delay differential equations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dead-code-detection" = callPackage @@ -60148,6 +60313,8 @@ self: { pname = "derive-storable"; version = "0.1.1.1"; sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2"; + revision = "1"; + editedCabalFile = "1rf8k42k35lq7rq4g506s06cn3fn94m39934gn0mcbznbqhmvd8v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -60161,8 +60328,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.0.0"; - sha256 = "1s0pm6crwbp3j4dfv5mf3lr75l0cvzy019968gbi4hml8v9wd6iw"; + version = "0.2.1.0"; + sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghc-paths ghci hspec QuickCheck @@ -61629,8 +61796,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.23"; - sha256 = "14mzv2bc7ndqqkx1nqb3km78h1ysjmry9d6s40nic8r2qgf9y2an"; + version = "1.1.24"; + sha256 = "01zizzhq9abyka21600234wj8yy9crx4n8qywiry4gjmq7l8gzm5"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -63983,6 +64150,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "doctest-driver-gen_0_2_0_1" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "doctest-driver-gen"; + version = "0.2.0.1"; + sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base doctest ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; + description = "Generate driver file for doctest's cabal integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -64098,6 +64282,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dom-parser_3_1_0" = callPackage + ({ mkDerivation, base, case-insensitive, containers, data-default + , hspec, lens, mtl, scientific, semigroups, shakespeare, text + , transformers, xml-conduit, xml-lens + }: + mkDerivation { + pname = "dom-parser"; + version = "3.1.0"; + sha256 = "1hra4sh34dr1gv4z55dg3f8s2g9l2qb7nlb0j4w0imr71fp5rqfp"; + libraryHaskellDepends = [ + base case-insensitive containers lens mtl scientific semigroups + text transformers xml-conduit xml-lens + ]; + testHaskellDepends = [ + base data-default hspec lens semigroups shakespeare text + xml-conduit + ]; + homepage = "https://github.com/typeable/dom-parser"; + description = "Simple monadic DOM parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dom-selector" = callPackage ({ mkDerivation, base, blaze-html, containers, html-conduit, parsec , QuickCheck, template-haskell, text, th-lift, xml-conduit @@ -64793,8 +65000,8 @@ self: { }: mkDerivation { pname = "drinkery"; - version = "0.2"; - sha256 = "0bfdd916ab27fqhsly2z2dmjhfvyz9q5w78qpdryi69d0gimfb8g"; + version = "0.2.2"; + sha256 = "1cw8jq1j2yirrk80rk2n1m17avxf3xqln96gnih8xzip248q9bjj"; libraryHaskellDepends = [ base exceptions mtl transformers ]; benchmarkHaskellDepends = [ base conduit conduit-combinators exceptions gauge list-t ListT @@ -65170,6 +65377,7 @@ self: { homepage = "https://github.com/k0ral/dublincore-xml-conduit"; description = "XML streaming parser/renderer for the Dublin Core standard elements"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "duckling" = callPackage @@ -66761,8 +66969,29 @@ self: { pname = "ekg"; version = "0.4.0.14"; sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; + revision = "3"; + editedCabalFile = "1llpsbki0v9p0c820qwv6m4433wfrxfhv8yxrg2xyrrxr8g0p42a"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath network snap-core + snap-server text time transformers unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ekg_0_4_0_15" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, network, snap-core, snap-server, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "ekg"; + version = "0.4.0.15"; + sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; revision = "1"; - editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp"; + editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -66771,6 +67000,7 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-bosun" = callPackage @@ -66780,8 +67010,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.11"; - sha256 = "0663m2riq23dwhsvgqi0mcy6h7hb24fgk315h7mi656bj5lzllx6"; + version = "1.0.12"; + sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -66907,6 +67137,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; + revision = "2"; + editedCabalFile = "02lx17l8dch793n83dgalv2r77nrlcj6k4xgpxaxzwr3nyprk2vj"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -67001,6 +67233,8 @@ self: { pname = "ekg-statsd"; version = "0.2.2.0"; sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862"; + revision = "1"; + editedCabalFile = "1fnazaqdp0d7w5mfx038yv8isyw00dahis66dkyrigd57vrj3f8f"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -68009,8 +68243,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.19"; - sha256 = "1z3gnd3cfgp3mlbxlbaqv5m21fv0qqjyzzqi3qkrrggy0y71yq0b"; + version = "1.2.20"; + sha256 = "1kx16zpfbish8mcpr6j5s7c63w277kyhcykvcfq2xgh1npg4p0z7"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring errors free monad-loops mwc-random stm stm-delay text transformers @@ -68049,8 +68283,8 @@ self: { }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.5"; - sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa"; + version = "1.0.6"; + sha256 = "1lv9gzz61fcba2y0mqmcml1shk8qjxlw8c1fis4w7xs2xgrwbjbm"; libraryHaskellDepends = [ base bytestring containers engine-io io-streams lifted-base snap-core unordered-containers websockets websockets-snap @@ -70121,6 +70355,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "except-exceptions" = callPackage + ({ mkDerivation, base, exceptions, transformers }: + mkDerivation { + pname = "except-exceptions"; + version = "0.1"; + sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs"; + libraryHaskellDepends = [ base exceptions transformers ]; + homepage = "https://github.com/thumphries/except-exceptions"; + description = "Safely deal with exceptions in ExceptT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exception-hierarchy" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -75804,6 +76050,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_2" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, semigroups, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.2"; + sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific semigroups text time transformers + ]; + testHaskellDepends = [ base hspec semigroups ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -77096,6 +77361,7 @@ self: { homepage = "https://github.com/noughtmare/frpnow-vty"; description = "Program terminal applications with vty and frpnow!"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frquotes" = callPackage @@ -77204,6 +77470,7 @@ self: { homepage = "https://github.com/fpco/fsnotify-conduit#readme"; description = "Get filesystem notifications as a stream of events"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fst" = callPackage @@ -77946,6 +78213,7 @@ self: { homepage = "http://github.com/joom/fuzzy"; description = "Filters a list based on a fuzzy string search"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzy-timings" = callPackage @@ -80392,6 +80660,7 @@ self: { homepage = "http://felsin9.de/nnis/ghc-datasize"; description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-dump-core" = callPackage @@ -80603,6 +80872,7 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-imported-from" = callPackage @@ -81710,6 +81980,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -81735,6 +82006,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage @@ -81756,6 +82028,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {dbusmenu-glib = null;}; "gi-dbusmenugtk3" = callPackage @@ -81779,6 +82052,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {dbusmenu-gtk3 = null;}; "gi-gdk" = callPackage @@ -81934,6 +82208,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -81955,6 +82230,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gst" = callPackage @@ -84120,10 +84396,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.25"; - sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb"; - revision = "2"; - editedCabalFile = "10n3vhnb77ai3qw2xdkwlhjr3wa6146djk6780l2nc8yfg4axi9j"; + version = "2.26"; + sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -84402,6 +84676,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-game" = callPackage @@ -91251,8 +91526,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.5.0"; - sha256 = "05xhiwrq6v8v0hy08mhxbslj3ncvyi1jm8m5lv8xqngwcn3yax44"; + version = "1.6.0"; + sha256 = "1ajwzyh3x185lvn22vi3wnfprf9fq0k1kxjxz575h87xwnq46y4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92285,6 +92560,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hamilton_0_1_0_3" = callPackage + ({ mkDerivation, ad, ansi-wl-pprint, base, containers + , finite-typelits, ghc-typelits-knownnat, hmatrix, hmatrix-gsl + , hmatrix-vector-sized, optparse-applicative, typelits-witnesses + , vector, vector-sized, vty + }: + mkDerivation { + pname = "hamilton"; + version = "0.1.0.3"; + sha256 = "06yvmm9641v74kd265csycwp6ywyc19mx0r0csycljcfghhj6xiw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ad base hmatrix hmatrix-gsl hmatrix-vector-sized typelits-witnesses + vector-sized + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers finite-typelits + ghc-typelits-knownnat hmatrix optparse-applicative vector + vector-sized vty + ]; + homepage = "https://github.com/mstksg/hamilton#readme"; + description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hamlet" = callPackage ({ mkDerivation, base, shakespeare }: mkDerivation { @@ -94716,6 +95018,7 @@ self: { homepage = "https://github.com/phoityne/haskell-dap"; description = "haskell-dap is a GHCi having DAP interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-disque" = callPackage @@ -94921,6 +95224,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs.gnome3) gobjectIntrospection;}; @@ -100373,6 +100677,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "herms_1_8_2_1" = callPackage + ({ mkDerivation, ansi-terminal, base, brick, directory, microlens + , microlens-th, optparse-applicative, semigroups, split, vty + }: + mkDerivation { + pname = "herms"; + version = "1.8.2.1"; + sha256 = "0njp1jsz4clb6qyz00xrpw7av4109gx5wd4h180q794vi8xw6v4j"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + ansi-terminal base brick directory microlens microlens-th + optparse-applicative semigroups split vty + ]; + homepage = "https://github.com/JackKiefer/herms"; + description = "A command-line manager for delicious kitchen recipes"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hero-club-five-tenets" = callPackage ({ mkDerivation, base, random, text }: mkDerivation { @@ -102017,6 +102342,8 @@ self: { pname = "hills"; version = "0.1.2.6"; sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh"; + revision = "1"; + editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102920,6 +103247,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hjsonschema_1_8_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, file-embed, filepath, hashable, hjsonpointer, hspec + , http-client, http-client-tls, http-types, pcre-heavy, profunctors + , protolude, QuickCheck, safe-exceptions, scientific, semigroups + , text, unordered-containers, vector, wai-app-static, warp + }: + mkDerivation { + pname = "hjsonschema"; + version = "1.8.0"; + sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl"; + revision = "1"; + editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i"; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed filepath hashable + hjsonpointer http-client http-client-tls http-types pcre-heavy + profunctors protolude QuickCheck safe-exceptions scientific + semigroups text unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring directory filepath hjsonpointer hspec + profunctors protolude QuickCheck semigroups text + unordered-containers vector wai-app-static warp + ]; + homepage = "https://github.com/seagreen/hjsonschema"; + description = "JSON Schema library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjugement" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, text, transformers @@ -103501,6 +103858,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlrdb" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite + , hashable, hedis, hlrdb-core, memory, random, store, time-exts + , unordered-containers + }: + mkDerivation { + pname = "hlrdb"; + version = "0.1.0.0"; + sha256 = "1kqm14kd5app34438b3w9h1nxr6fp1dvrf58xrbv2xn2y65jb5jc"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptonite hashable hedis + hlrdb-core memory random store time-exts unordered-containers + ]; + homepage = "https://github.com/identicalsnowflake/hlrdb"; + description = "High-level Redis Database"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hlrdb-core" = callPackage + ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl + , profunctors, random, unordered-containers + }: + mkDerivation { + pname = "hlrdb-core"; + version = "0.1.0.0"; + sha256 = "1gy5sycr4han0i0lk8m3rl99pagd9slfry0b94c05cj6kai6c9ss"; + libraryHaskellDepends = [ + base bytestring hashable hedis lens mtl profunctors random + unordered-containers + ]; + homepage = "https://github.com/identicalsnowflake/hlrdb-core"; + description = "High-level Redis Database Core API"; + license = stdenv.lib.licenses.mit; + }) {}; + "hls" = callPackage ({ mkDerivation, base, containers, hcg-minus, hps }: mkDerivation { @@ -108716,6 +109109,7 @@ self: { homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; @@ -111004,13 +111398,34 @@ self: { pname = "htaglib"; version = "1.1.1"; sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3"; + revision = "1"; + editedCabalFile = "0znih19z9ly4m1nadwkalq28xz0vy6pc0yyamyz2fz5s5nv69lr0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring text transformers ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ base directory filepath hspec ]; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) taglib;}; + + "htaglib_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , hspec-discover, taglib, text, transformers + }: + mkDerivation { + pname = "htaglib"; + version = "1.2.0"; + sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -113380,6 +113795,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree_0_1_0_1" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit + , hw-hspec-hedgehog, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree"; + version = "0.1.0.1"; + sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell-works/hw-fingertree#readme"; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-fingertree-strict" = callPackage ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog , QuickCheck, test-framework, test-framework-hunit @@ -113399,6 +113834,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree-strict_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.0.2"; + sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme"; + description = "Generic strict finger-tree structure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, vector }: mkDerivation { @@ -116448,6 +116903,7 @@ self: { homepage = "https://github.com/k0ral/imm"; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "immortal" = callPackage @@ -116887,6 +117343,7 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -118843,6 +119300,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.2.0"; + sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive semigroups text + vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + homepage = "https://github.com/andrewthad/haskell-ip#readme"; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -121392,8 +121877,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.10"; - sha256 = "1rhg6hrk0pzy9xx6hhy39xmnpz931a6wq93sjgpvlzlm3hyfwq0x"; + version = "1.0.11"; + sha256 = "000a528gmkb25zcl7am6qh8fjrq2v2l71c27fxzm6wpf0ml0vv7z"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -122862,16 +123347,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "kanji_3_2_1" = callPackage + "kanji_3_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion , deepseq, hashable, HUnit-approx, microlens, microlens-aeson - , microlens-platform, optparse-applicative, protolude, tasty - , tasty-hunit, text + , optparse-applicative, tasty, tasty-hunit, text, transformers }: mkDerivation { pname = "kanji"; - version = "3.2.1"; - sha256 = "1x9mrjsj73kwk0y7m1j9n9d4pbcrjg066njpasb1vi69w6h2flbs"; + version = "3.3.0"; + sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122879,7 +123363,7 @@ self: { ]; executableHaskellDepends = [ aeson aeson-pretty base containers microlens microlens-aeson - microlens-platform optparse-applicative protolude text + optparse-applicative text transformers ]; testHaskellDepends = [ aeson base containers HUnit-approx tasty tasty-hunit text @@ -123927,8 +124411,8 @@ self: { pname = "keys"; version = "3.12"; sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl"; - revision = "1"; - editedCabalFile = "1lbl62y3alhpgkf2knh4q5pcby54kblb68cbx2i77fbdwz8jbka7"; + revision = "2"; + editedCabalFile = "0cy2fdxxqg0bgkb8xhnw6zws00d78bpk48xv7zzmvnj549l819ib"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -125557,8 +126041,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; - revision = "1"; - editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl"; + revision = "3"; + editedCabalFile = "041hv4z4xxqidnlr5jgkwp13vj4lr9dvqlrgavl3dmsd07vfj0bc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -130794,8 +131278,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.4"; - sha256 = "0l1qm1n3sh6shzcl4g00w705gx0xy8qwnj68dlm18hsa9y0z572h"; + version = "0.6.5"; + sha256 = "1bdqja3favvxxlqxyh4r07xhkgsxan7lg8vb0nrahkfbifa4m6by"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -131611,6 +132095,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "load-font" = callPackage + ({ mkDerivation, base, c2hs, fltkhs, text }: + mkDerivation { + pname = "load-font"; + version = "0.1.0.0"; + sha256 = "1xva9cxwscjyqpx5yvbicyizk4y439wdv8gzxir2jwkangpvrby5"; + revision = "2"; + editedCabalFile = "0qmz9kmb1cc3cvidxvspa186nkby4m060f6y9v23s3dqp3wd93mm"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base fltkhs text ]; + homepage = "https://github.com/deech/load-font#load-font"; + description = "A cross platform library for loading bundled fonts into your application"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "loadavg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -131751,8 +132254,8 @@ self: { }: mkDerivation { pname = "locators"; - version = "0.2.4.2"; - sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4"; + version = "0.2.4.3"; + sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4"; libraryHaskellDepends = [ base bytestring cereal containers cryptohash ]; @@ -131860,6 +132363,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lockpool" = callPackage + ({ mkDerivation, base, clock, stm }: + mkDerivation { + pname = "lockpool"; + version = "0.1.0.0"; + sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi"; + libraryHaskellDepends = [ base clock stm ]; + homepage = "https://github.com/chessai/lockpool.git"; + description = "set a maximum on the number of concurrent actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log" = callPackage ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg , exceptions, hpqtypes, http-client, http-types, log-base @@ -132180,6 +132696,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_5" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.5"; + sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -132238,6 +132778,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect-extra-handler_1_1_4" = callPackage + ({ mkDerivation, base, exceptions, logging-effect, time + , wl-pprint-text + }: + mkDerivation { + pname = "logging-effect-extra-handler"; + version = "1.1.4"; + sha256 = "0932i0qrwrr2j7w40bf3q5dlazz4800drc0chvr1kpbpk6b4njim"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base exceptions logging-effect time wl-pprint-text + ]; + executableHaskellDepends = [ base logging-effect wl-pprint-text ]; + homepage = "https://github.com/jship/logging-effect-extra#readme"; + description = "Handy logging handler combinators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, call-stack, hspec, transformers }: mkDerivation { @@ -135564,14 +136124,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_1_3_0" = callPackage + "massiv_0_1_4_0" = callPackage ({ mkDerivation, base, data-default, data-default-class, deepseq , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector }: mkDerivation { pname = "massiv"; - version = "0.1.3.0"; - sha256 = "0bpy370004rvsz7qq41x7cdim8l4rj79zlz7jzpw7casm6ly0473"; + version = "0.1.4.0"; + sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -141063,6 +141623,8 @@ self: { pname = "mongoDB"; version = "2.3.0.5"; sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9"; + revision = "2"; + editedCabalFile = "0bx2vdwp53c9dgil09qg22hd1j1dilwqcg6ighp28ajmnxkyl8j0"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -141316,6 +141878,7 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -141640,7 +142203,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "morte_1_6_17" = callPackage + "morte_1_6_18" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, formatting, http-client , http-client-tls, microlens, microlens-mtl, mtl @@ -141650,8 +142213,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.17"; - sha256 = "1sw986mprhlbgzz3zgjlr3mynj4caj3dyl7b6ln7y6y8jb567h3n"; + version = "1.6.18"; + sha256 = "1cnwk2rihbywwkpxw7bd22zh33hkffpaza7d4crr5x2p7rdvhmjp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142311,8 +142874,8 @@ self: { pname = "mtl-compat"; version = "0.2.1.3"; sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34"; - revision = "3"; - editedCabalFile = "0igfsrc7q326ggvw47xwq1xffa4r225akla0nwgmqhd7y1n5753c"; + revision = "4"; + editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5"; libraryHaskellDepends = [ base mtl ]; doHaddock = false; homepage = "https://github.com/haskell-compat/mtl-compat"; @@ -143956,6 +144519,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mysql;}; + "mysql_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + }: + mkDerivation { + pname = "mysql"; + version = "0.1.5"; + sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring containers ]; + librarySystemDepends = [ mysql ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/paul-rouse/mysql"; + description = "A low-level MySQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mysql;}; + "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql , mysql-simple @@ -144056,6 +144636,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mysql-simple_0_4_5" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , blaze-textual, bytestring, containers, hspec, mysql, old-locale + , pcre-light, text, time + }: + mkDerivation { + pname = "mysql-simple"; + version = "0.4.5"; + sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder blaze-textual + bytestring containers mysql old-locale pcre-light text time + ]; + testHaskellDepends = [ base blaze-builder hspec text ]; + homepage = "https://github.com/paul-rouse/mysql-simple"; + description = "A mid-level MySQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-simple-quasi" = callPackage ({ mkDerivation, base, haskell-src-meta, mysql-simple , template-haskell @@ -145520,8 +146120,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "3"; - editedCabalFile = "1j0s7r9hzisi8zacs505rxh9pk05m5hrrcxn8jnh7w8yphyqbv4j"; + revision = "4"; + editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -150016,6 +150616,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_1_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, semigroups, text + , time, time-locale-compat, transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.1.0"; + sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant dotenv hspec hspec-discover + multiset postgresql-simple product-profunctors profunctors + QuickCheck semigroups text time transformers + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -150160,6 +150788,7 @@ self: { libraryHaskellDepends = [ attoparsec base conduit mtl text ]; homepage = "https://github.com/alphaHeavy/open-symbology"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-typerep" = callPackage @@ -151006,6 +151635,7 @@ self: { homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -152281,8 +152911,8 @@ self: { pname = "pagination"; version = "0.2.1"; sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; - revision = "1"; - editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5"; + revision = "2"; + editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -152519,34 +153149,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml + "pandoc-citeproc_0_14_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat + , bytestring, Cabal, containers, data-default, directory, filepath + , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec + , process, rfc5051, setenv, split, syb, tagsoup, temporary, text + , time, unordered-containers, vector, xml-conduit, yaml }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.2"; - sha256 = "1dz3ybvi7bydpjfwpk72whmy9agz6g1xa60nazs1r9im97apfgw5"; + version = "0.14.3"; + sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; 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 unordered-containers vector - xml-conduit yaml + aeson base base-compat bytestring containers data-default directory + filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec + rfc5051 setenv split syb tagsoup text time unordered-containers + vector xml-conduit yaml ]; executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml + aeson aeson-pretty attoparsec base base-compat bytestring filepath + pandoc pandoc-types syb text yaml ]; testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml + aeson base base-compat bytestring containers directory filepath mtl + pandoc pandoc-types process temporary text yaml ]; doCheck = false; homepage = "https://github.com/jgm/pandoc-citeproc"; @@ -153450,6 +154080,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "papillon_0_1_0_6" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, monads-tf + , template-haskell, transformers + }: + mkDerivation { + pname = "papillon"; + version = "0.1.0.6"; + sha256 = "1j0sxac7pgwfbgb545ysjsw7haz6m41m6gz5z8v3xawjhx662nib"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monads-tf template-haskell transformers + ]; + executableHaskellDepends = [ + base directory filepath monads-tf template-haskell transformers + ]; + homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; + description = "packrat parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pappy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -157388,6 +158040,7 @@ self: { homepage = "https://bitbucket.org/blamario/picoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "picosat" = callPackage @@ -158517,6 +159170,8 @@ self: { pname = "pipes-random"; version = "1.0.0.4"; sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl"; + revision = "1"; + editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h"; libraryHaskellDepends = [ base mwc-random pipes vector ]; homepage = "https://github.com/fosskers/pipes-random"; description = "Producers for handling randomness"; @@ -159098,8 +159753,8 @@ self: { }: mkDerivation { pname = "playlists-http"; - version = "0.2.0.0"; - sha256 = "0hx55vqcqfkfjds7hh4l1i60al9d65q55wg9jfns3qml5z8pqik1"; + version = "0.2.1.0"; + sha256 = "1kzc1awfqk979h2hmpqh2pjiy33v140pibbp703hqbq0fkrynj2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159325,6 +159980,7 @@ self: { homepage = "https://github.com/ocramz/plot-light-examples"; description = "Example binaries for plot-light"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -159724,10 +160380,8 @@ self: { }: mkDerivation { pname = "pointful"; - version = "1.0.9"; - sha256 = "1mmc7kjspak2597d9jzkqgga4gh9v5dljkifbgminx8rchiq263a"; - revision = "1"; - editedCabalFile = "13lwn5zy44cbmax8ic1j8dhrzn7hxws5mcjrjyjwqcn2abmwc2js"; + version = "1.0.11.0"; + sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161245,6 +161899,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-simple-url_0_2_1_0" = callPackage + ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "postgresql-simple-url"; + version = "0.2.1.0"; + sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; + libraryHaskellDepends = [ + base network-uri postgresql-simple split + ]; + testHaskellDepends = [ + base postgresql-simple tasty tasty-quickcheck + ]; + homepage = "https://github.com/futurice/postgresql-simple-url"; + description = "Parse postgres:// url into ConnectInfo"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-syntax" = callPackage ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase , text @@ -162743,6 +163417,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prim-array_0_2_2" = callPackage + ({ mkDerivation, base, ghc-prim, primitive, semigroups }: + mkDerivation { + pname = "prim-array"; + version = "0.2.2"; + sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3"; + libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; + homepage = "https://github.com/andrewthad/prim-array#readme"; + description = "Primitive byte array with type variable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prim-spoon" = callPackage ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck , spoon @@ -164071,8 +164758,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.3"; - sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61"; + version = "5.3.4"; + sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165269,8 +165956,8 @@ self: { }: mkDerivation { pname = "pure-zlib"; - version = "0.6"; - sha256 = "1igbg3d5l8sf53kpx0451dha5lr099hpqgwy7jfjkyjvxzxi8y5b"; + version = "0.6.1"; + sha256 = "0dqc35ca1668j2xfwmz8bqgbyld9gw3b0bld8s5gy6id7qfn7d26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165393,6 +166080,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "purescript-bridge_0_12_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.12.0.0"; + sha256 = "1kh3ydqn7vs3ybda9ic8gbmzzjigiiibls9w1nh5ffgwf42dij7j"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -166723,6 +167431,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_4_2" = callPackage + ({ mkDerivation, aeson, base, bifunctors, containers, primitive + , QuickCheck, semigroupoids, semigroups, tagged, transformers + , vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.4.2"; + sha256 = "1whin052j39gdvqy1kvfrqiyfa76amclp6pschqd6xmmw2vly491"; + libraryHaskellDepends = [ + aeson base bifunctors containers primitive QuickCheck semigroupoids + semigroups tagged transformers + ]; + testHaskellDepends = [ + aeson base primitive QuickCheck tagged transformers vector + ]; + homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -168669,6 +169399,7 @@ self: { ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rate-limit" = callPackage @@ -171000,8 +171731,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "1"; - editedCabalFile = "1w8aqqq6j1lhwpi2d0qj9h32cia3nr9l43a0mspqawb1nsmpjyic"; + revision = "2"; + editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi"; libraryHaskellDepends = [ base regex-applicative text ]; homepage = "https://github.com/phadej/regex-applicative-text#readme"; description = "regex-applicative on text"; @@ -171986,6 +172717,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "relevant-time" = callPackage + ({ mkDerivation, aeson, base, chronos, text, torsor }: + mkDerivation { + pname = "relevant-time"; + version = "0.1.0.0"; + sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk"; + libraryHaskellDepends = [ aeson base chronos text torsor ]; + homepage = "https://github.com/chessai/relevant-time.git"; + description = "humanised relevant time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "relit" = callPackage ({ mkDerivation, base, regex-base, template-haskell }: mkDerivation { @@ -173831,31 +174574,33 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, base, bifunctors, binary - , blaze-html, classy-prelude, containers, data-default - , freer-simple, hedis, http-api-data, http-client, http-client-tls - , http-types, lens, lifted-async, markdown, monad-control - , natural-transformation, network-uri, postgresql-simple - , resource-pool, servant, servant-blaze, servant-client - , servant-docs, servant-server, servant-swagger, simple-logger - , string-conversions, swagger2, temporary, text, time-units - , unliftio, unliftio-core, unordered-containers, url, uuid-types - , vector, wai, wai-cors, wai-extra, wreq + ({ mkDerivation, aeson, aeson-diff, attoparsec, base, binary + , blaze-html, bytestring, classy-prelude, containers, data-default + , envy, hedis, http-api-data, http-client, http-client-tls + , http-types, lens, lifted-async, markdown, miso, monad-control + , mono-traversable, mtl, natural-transformation, network + , network-uri, postgresql-typed, resource-pool, servant + , servant-blaze, servant-client, servant-docs, servant-server + , servant-swagger, simple-logger, swagger2, temporary, text + , text-conversions, time, time-units, unliftio, unliftio-core + , unordered-containers, url, uuid-types, wai, wai-cli, wai-cors + , wai-extra, warp, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.24"; - sha256 = "05spf71r2zyc9pyx5kr2jsamyzga1y46831n6fmhad98bjswgr6q"; + version = "0.0.0.25"; + sha256 = "1yzi8cb90iy54wi463cpk9h961k53cilgdjcf252yw4qsvxcqh5i"; libraryHaskellDepends = [ - aeson aeson-diff base bifunctors binary blaze-html classy-prelude - containers data-default freer-simple hedis http-api-data + aeson aeson-diff attoparsec base binary blaze-html bytestring + classy-prelude containers data-default envy hedis http-api-data http-client http-client-tls http-types lens lifted-async markdown - monad-control natural-transformation network-uri postgresql-simple - resource-pool servant servant-blaze servant-client servant-docs - servant-server servant-swagger simple-logger string-conversions - swagger2 temporary text time-units unliftio unliftio-core - unordered-containers url uuid-types vector wai wai-cors wai-extra - wreq + miso monad-control mono-traversable mtl natural-transformation + network network-uri postgresql-typed resource-pool servant + servant-blaze servant-client servant-docs servant-server + servant-swagger simple-logger swagger2 temporary text + text-conversions time time-units unliftio unliftio-core + unordered-containers url uuid-types wai wai-cli wai-cors wai-extra + warp wreq ]; homepage = "https://github.com/RobertFischer/rfc#README.md"; description = "Robert Fischer's Common library"; @@ -173897,6 +174642,7 @@ self: { doHaddock = false; description = "Parse and display time according to RFC3339 (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rfc5051" = callPackage @@ -175284,16 +176030,17 @@ self: { }) {}; "row-types" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, text - , unordered-containers + ({ mkDerivation, base, constraints, criterion, deepseq, hashable + , text, unordered-containers }: mkDerivation { pname = "row-types"; - version = "0.2.0.0"; - sha256 = "158k4q6b1ca7d8fkznl09mdd29z7w5clxh48i3b3m1bcmhjmcfmh"; + version = "0.2.2.0"; + sha256 = "1xv42yzv0xrb1bwqlmpmk7wwmq2mcf6d73g91aycq99hjq18bmcq"; libraryHaskellDepends = [ - base deepseq hashable text unordered-containers + base constraints deepseq hashable text unordered-containers ]; + testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Open Records and Variants"; license = stdenv.lib.licenses.mit; @@ -175508,6 +176255,7 @@ self: { ]; description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss2irc" = callPackage @@ -177016,6 +177764,34 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_13" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.13"; + sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "https://github.com/swift-nav/libsbp"; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -177385,6 +178161,7 @@ self: { homepage = "http://trac.haskell.org/SCC/"; description = "Streaming component combinators"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scenegraph" = callPackage @@ -179400,8 +180177,8 @@ self: { }: mkDerivation { pname = "sentiwordnet-parser"; - version = "0.1.1.0"; - sha256 = "0mb5c0n2i0gyyk94j4lnfpxzh8v2vxlq7dbp1v5gmz5ws7s9pfll"; + version = "0.2.0.0"; + sha256 = "0gbzzrd5wivxrcha8w0ncgqz7qr29f4aclz4i7z607lz2lywrifm"; libraryHaskellDepends = [ base Decimal hashable parsers safe string-class text trifecta unordered-containers vector @@ -179896,6 +180673,8 @@ self: { pname = "servant"; version = "0.13"; sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230"; + revision = "1"; + editedCabalFile = "1l1a52xard2ax9avh1ic893gykhlvrvgw0cncjsaqvi9rvkd047y"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -180354,6 +181133,8 @@ self: { pname = "servant-client"; version = "0.13"; sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93"; + revision = "1"; + editedCabalFile = "0kdymqs9k90ig840bbj58znmfzlgr81jk7pfj1ygdvikjz1k1lpk"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl @@ -180382,6 +181163,8 @@ self: { pname = "servant-client-core"; version = "0.13"; sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp"; + revision = "1"; + editedCabalFile = "0zxkc0p436clpmh1y30d3ybqw12q2pk2gzfyjjgh17yvhzxzddnb"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri @@ -180465,6 +181248,8 @@ self: { pname = "servant-docs"; version = "0.11.2"; sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; + revision = "1"; + editedCabalFile = "0pm5gclgwna9bw3avjfp1pghzbk0a32sbd9v3fh321gmsax1h4zi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180631,6 +181416,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-foreign_0_11_1" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.11.1"; + sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-generate" = callPackage + ({ mkDerivation, base, servant, servant-server }: + mkDerivation { + pname = "servant-generate"; + version = "0.1"; + sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw"; + revision = "1"; + editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4"; + libraryHaskellDepends = [ base servant servant-server ]; + homepage = "https://github.com/alpmestan/servant-generate"; + description = "Utilities for generating mock server implementations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-generic" = callPackage ({ mkDerivation, base, network-uri, servant, servant-server, text , warp @@ -180771,6 +181588,8 @@ self: { pname = "servant-js"; version = "0.9.3.2"; sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; + revision = "1"; + editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181254,6 +182073,8 @@ self: { pname = "servant-server"; version = "0.13"; sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy"; + revision = "1"; + editedCabalFile = "0kf88s2wkijfznp0sk3mrfyhr9rnq3kqpsl26di953ynxgd6z4yd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -184103,8 +184924,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.10.0.0"; - sha256 = "00hspcdh7si0bykfdyxclklv622izl8jm6nwic4z5j15rmqa62b7"; + version = "0.10.0.1"; + sha256 = "1fixv7gymd03bnn8aysyyr7jwp1j943xyd69659xcjmljknd1h5m"; libraryHaskellDepends = [ array async base bytestring exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -184925,6 +185746,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-bool_0_1_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleton-bool"; + version = "0.1.4"; + sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/phadej/singleton-bool#readme"; + description = "Type level booleans"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-dict" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -185657,8 +186491,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.8.1.0"; - sha256 = "1dzk9xcif3g14qqksj7h343ka3b19fcgijbnhmivpgjdgychkyk2"; + version = "0.9.0.0"; + sha256 = "19619ladqp1faqdn4z2yrxvffpcr9k0s942s6rjg73i229hccv8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186547,6 +187381,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-core_1_0_3_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , network, network-uri, old-locale, parallel, QuickCheck, random + , readable, regex-posix, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector + , zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.3.2"; + sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath hashable HUnit io-streams lifted-base + monad-control mtl network network-uri old-locale random readable + regex-posix text time transformers transformers-base unix-compat + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl network network-uri old-locale + parallel QuickCheck random readable regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unix-compat unordered-containers + vector zlib + ]; + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-cors" = callPackage ({ mkDerivation, snap-core }: mkDerivation { @@ -186763,6 +187633,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-server_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.1.0.0"; + sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; + configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + benchmarkHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + criterion io-streams io-streams-haproxy snap-core vector + ]; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -188112,8 +189024,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.8"; - sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q"; + version = "1.3.9"; + sha256 = "1bn0x8l288rgq1x04a6xlaky8zwzqzs5zpbv80fvnnzqb4810035"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -188811,8 +189723,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.0"; - sha256 = "1qjrzfwcscdaz828l1rm0nyr7965kj5bbk777n8l2ylk287xnyjb"; + version = "0.0.1.1"; + sha256 = "14apx9pxbl9s9i5d8i7x3y9wyzdyx3gspz4l4h4vaddg996pq0il"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -188833,6 +189745,7 @@ self: { ]; description = "Unified streaming dependency management for web apps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparse" = callPackage @@ -194935,6 +195848,7 @@ self: { testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -195132,6 +196046,7 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -195356,6 +196271,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob + , hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.2.1"; + sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers generics-sop hashable + http-media insert-ordered-containers lens mtl network scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances text time unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -195452,6 +196399,33 @@ self: { license = "LGPL"; }) {}; + "swish_0_9_2_1" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.9.2.1"; + sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse semigroups text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; + description = "A semantic web toolkit"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sws" = callPackage ({ mkDerivation, base, bytestring, cryptonite, directory, filepath , hourglass, http-types, network, resourcet, transformers, wai @@ -198455,8 +199429,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "tasty-travis"; - version = "0.2.0"; - sha256 = "1k0cgjbj2dgf5d8j13ns2nk9kw74ixa62bwk7wmj1gr1yfwv1klx"; + version = "0.2.0.1"; + sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "https://github.com/merijn/tasty-travis"; @@ -201575,6 +202549,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-format" = callPackage + ({ mkDerivation, base, Earley, haskell-src-meta, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "th-format"; + version = "0.1.0.0"; + sha256 = "0vyvw9m28xb2playrzc533173p26jnlr8w1sbjc9w81y17676z3x"; + libraryHaskellDepends = [ + base Earley haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + homepage = "https://github.com/mtesseract/th-format#readme"; + description = "Template Haskell based support for format strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-inline-io-action" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -201931,20 +202922,19 @@ self: { }) {}; "themoviedb" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, either - , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit - , text, text-binary, time, time-locale-compat, transformers + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, mtl, tasty, tasty-hunit, text + , text-binary, time, time-locale-compat, transformers }: mkDerivation { pname = "themoviedb"; - version = "1.1.3.0"; - sha256 = "0bw3y1vlh36dnsc8npx3nf00n86qbz61xfkjvlp1knidda3q0d1c"; + version = "1.1.4.0"; + sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring either http-client http-client-tls - http-types mtl text text-binary time time-locale-compat - transformers + aeson base binary bytestring http-client http-client-tls http-types + mtl text text-binary time time-locale-compat transformers ]; executableHaskellDepends = [ base text time time-locale-compat transformers @@ -202340,6 +203330,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-gui_0_8_2_3" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, file-embed, filepath, hashable + , network-uri, safe, snap-core, snap-server, stm, template-haskell + , text, transformers, unordered-containers, vault, vector + , websockets, websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.2.3"; + sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions file-embed filepath hashable network-uri safe snap-core + snap-server stm template-haskell text transformers + unordered-containers vault vector websockets websockets-snap + ]; + homepage = "http://wiki.haskell.org/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { @@ -203497,6 +204513,7 @@ self: { homepage = "https://github.com/HugoDaniel/timerep"; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -205177,6 +206194,8 @@ self: { pname = "transformers-compat"; version = "0.6.0.6"; sha256 = "0fdnc8qnm42llp3nyfmg7ij6wscrigb43x3f2w1d38dvjkycyags"; + revision = "1"; + editedCabalFile = "0spzhq7c53vrgxlnakavq2fag3zjss76fbmz1hkzgk5bcmk7mlq7"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base deriving-compat hspec QuickCheck tagged transformers @@ -205238,8 +206257,8 @@ self: { }: mkDerivation { pname = "transformers-eff"; - version = "0.2.0.0"; - sha256 = "1na8gvbhbsdfkxvhy57f3qi91rksjin10lr8nsar4nimrd7nmghn"; + version = "0.2.1.0"; + sha256 = "0miam7n85ch39v7pym8m53nxyymwwnc5v52lip4x4h0vffpnq8lx"; libraryHaskellDepends = [ base free list-transformer mmorph transformers ]; @@ -205264,6 +206283,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-either_0_1_0" = callPackage + ({ mkDerivation, base, exceptions, text, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.1.0"; + sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm"; + libraryHaskellDepends = [ base exceptions text transformers ]; + homepage = "http://github.com/tmcgilchrist/transformers-either/"; + description = "An Either monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-fix" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -206677,6 +207709,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_7" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , semigroups, stm, system-fileio, system-filepath, temporary, text + , time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.7"; + sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -208434,6 +209490,35 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tz_0_1_3_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, thyme, time, timezone-olson, timezone-series + , tzdata, vector + }: + mkDerivation { + pname = "tz"; + version = "0.1.3.1"; + sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b"; + libraryHaskellDepends = [ + base binary bytestring containers data-default deepseq + template-haskell time tzdata vector + ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th time tzdata + ]; + benchmarkHaskellDepends = [ + base criterion lens thyme time timezone-olson timezone-series + ]; + preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; + homepage = "https://github.com/nilcons/haskell-tz"; + description = "Efficient time zone handling"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tzdata" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, HUnit , test-framework, test-framework-hunit, test-framework-th, unix @@ -212392,6 +213477,7 @@ self: { ]; description = "A package to parse VCF files inspired in similar python libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcs-revision" = callPackage @@ -212850,6 +213936,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vector-shuffling" = callPackage + ({ mkDerivation, base, random, vector }: + mkDerivation { + pname = "vector-shuffling"; + version = "1"; + sha256 = "19brlcbxha2mpmciabjw1npdi2xcpvfhd8wjn2ssfcdl0pd2n2ln"; + libraryHaskellDepends = [ base random vector ]; + homepage = "https://github.com/metrix-ai/vector-shuffling"; + description = "Algorithms for vector shuffling"; + license = stdenv.lib.licenses.mit; + }) {}; + "vector-sized" = callPackage ({ mkDerivation, base, deepseq, finite-typelits, vector }: mkDerivation { @@ -212862,6 +213960,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_0_0_0" = callPackage + ({ mkDerivation, base, deepseq, finite-typelits + , indexed-list-literals, primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.0.0.0"; + sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls"; + libraryHaskellDepends = [ + base deepseq finite-typelits indexed-list-literals primitive vector + ]; + homepage = "http://github.com/expipiplus1/vector-sized#readme"; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -212981,8 +214096,8 @@ self: { pname = "vectortiles"; version = "1.3.0"; sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0"; - revision = "1"; - editedCabalFile = "04h85s069i8sgh382h0j4vx6zlx15yi3q7xmb7pnq8vhfamszsaq"; + revision = "2"; + editedCabalFile = "0c3xkk3xks9c4kn1l6d58v0qsg7q3pdjwdwgpwd93npcjl3isc19"; libraryHaskellDepends = [ base bytestring containers deepseq hashable protocol-buffers protocol-buffers-descriptor text transformers unordered-containers @@ -213121,6 +214236,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_3_2" = callPackage + ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec + , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.3.2"; + sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base checkers microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vgrep" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th , containers, directory, doctest, fingertree, generic-deriving @@ -213211,8 +214344,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.14"; - sha256 = "19x112bpc7fw3dqfpgp0bi6cw01vr8csfyqixi68128ij3b6csm0"; + version = "0.0.0.15"; + sha256 = "10ihmdba4rbji13lihmxf2yw77nii63k4mz6a0d03lzcw2bppr1a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -213287,8 +214420,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.3.0"; - sha256 = "0023jrn5my1wgyspf4nq4m3xr7i4w277p4328j6l8hq7fda04ig4"; + version = "0.2.4.0"; + sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215732,6 +216865,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-transformers_0_1_0" = callPackage + ({ mkDerivation, base, exceptions, extractable-singleton + , monad-control-aligned, transformers, wai, wai-websockets + , websockets + }: + mkDerivation { + pname = "wai-transformers"; + version = "0.1.0"; + sha256 = "14l5ihyvg2n0kmmkxy0r5mx1jk3p5jhv1vynsnnrb2md1g4318qp"; + libraryHaskellDepends = [ + base exceptions extractable-singleton monad-control-aligned + transformers wai wai-websockets websockets + ]; + homepage = "https://github.com/athanclark/wai-transformers#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-util" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , http-accept, http-types, network-uri, text, transformers, wai @@ -217733,6 +218884,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wilton-ffi" = callPackage + ({ mkDerivation, aeson, base, bytestring }: + mkDerivation { + pname = "wilton-ffi"; + version = "0.1.0.0"; + sha256 = "0l7smpizp4r59nfk73vyl1vrpgdnf8cfgny9r981bpn6bnv1iv7f"; + revision = "1"; + editedCabalFile = "0fkfffxfph1nip54j9f5hd05339mmg19hn7jwggsi4qmdpf2jd0y"; + libraryHaskellDepends = [ aeson base bytestring ]; + homepage = "https://github.com/wilton-iot/wilton-ffi#readme"; + description = "Haskell modules support for Wilton JavaScript runtime"; + license = stdenv.lib.licenses.mit; + }) {}; + "win-hp-path" = callPackage ({ mkDerivation, base, process, split }: mkDerivation { @@ -218019,6 +219184,8 @@ self: { pname = "wl-pprint"; version = "1.2"; sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"; + revision = "1"; + editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -226035,10 +227202,8 @@ self: { }: mkDerivation { pname = "zip-stream"; - version = "0.1.0.1"; - sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq"; - revision = "1"; - editedCabalFile = "1g3yr6ggcxgzzdpaj7zn48k7mqfdnnz697f3midw2br1dnhv7zdf"; + version = "0.1.1"; + sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226540,8 +227705,8 @@ self: { pname = "ztail"; version = "1.2"; sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; - revision = "3"; - editedCabalFile = "0j22pyi86qw5y4fgxygg9fndlwk8j9c2671bbbk3nws5xzkda1sm"; + revision = "4"; + editedCabalFile = "1x8vaflxrmkwqig8wvbbkc761l52y5h45sclnidm5zmwxrv1j3zd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226550,6 +227715,26 @@ self: { ]; description = "Multi-file, colored, filtered log tailer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ztail_1_2_0_1" = callPackage + ({ mkDerivation, array, base, bytestring, filepath, hinotify + , process, regex-posix, time, unix, unordered-containers + }: + mkDerivation { + pname = "ztail"; + version = "1.2.0.1"; + sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring filepath hinotify process regex-posix time + unix unordered-containers + ]; + description = "Multi-file, colored, filtered log tailer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zuramaru" = callPackage @@ -226600,6 +227785,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; } diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch new file mode 100644 index 000000000000..3917c2f0afd7 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch @@ -0,0 +1,107 @@ +From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001 +From: Michiel Derhaeg <derhaeg.michiel@gmail.com> +Date: Tue, 20 Mar 2018 22:06:18 +0100 +Subject: [PATCH] update to work with GHC 8.4.1 + +--- + XMonad/Hooks/FadeWindows.hs | 6 +++++- + XMonad/Hooks/WallpaperSetter.hs | 6 +++++- + XMonad/Layout/Mosaic.hs | 6 +++++- + xmonad-contrib.cabal | 5 +++-- + 5 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs +index 4b8e62b6..01d06792 100644 +--- a/XMonad/Hooks/FadeWindows.hs ++++ b/XMonad/Hooks/FadeWindows.hs +@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask + ,asks) + import Control.Monad.State (gets) + import qualified Data.Map as M +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + import Graphics.X11.Xlib.Extras (Event(..)) + +@@ -134,6 +135,9 @@ instance Monoid Opacity where + r `mappend` OEmpty = r + _ `mappend` r = r + ++instance Semigroup Opacity where ++ (<>) = mappend ++ + -- | A FadeHook is similar to a ManageHook, but records window opacity. + type FadeHook = Query Opacity + +diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs +index 00a3b1c3..d4f5ccb2 100644 +--- a/XMonad/Hooks/WallpaperSetter.hs ++++ b/XMonad/Hooks/WallpaperSetter.hs +@@ -41,7 +41,8 @@ import Data.Ord (comparing) + import Control.Monad + import Control.Applicative + import Data.Maybe +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + -- $usage + -- This module requires imagemagick and feh to be installed, as these are utilized +@@ -86,6 +87,9 @@ instance Monoid WallpaperList where + mappend (WallpaperList w1) (WallpaperList w2) = + WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) + ++instance Semigroup WallpaperList where ++ (<>) = mappend ++ + -- | Complete wallpaper configuration passed to the hook + data WallpaperConf = WallpaperConf { + wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) +diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs +index 05655d4c..da44fc50 100644 +--- a/XMonad/Layout/Mosaic.hs ++++ b/XMonad/Layout/Mosaic.hs +@@ -38,7 +38,8 @@ import Control.Monad(mplus) + import Data.Foldable(Foldable,foldMap, sum) + import Data.Function(on) + import Data.List(sortBy) +-import Data.Monoid(Monoid,mempty, mappend) ++import Data.Monoid(Monoid,mempty, mappend, (<>)) ++import Data.Semigroup + + + -- $usage +@@ -202,6 +203,9 @@ instance Monoid (Tree a) where + mappend x Empty = x + mappend x y = Branch x y + ++instance Semigroup (Tree a) where ++ (<>) = mappend ++ + makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a + makeTree _ [] = Empty + makeTree _ [x] = Leaf x +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index dde3ccda..c401c6e6 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -36,7 +36,7 @@ cabal-version: >= 1.6 + build-type: Simple + bug-reports: https://github.com/xmonad/xmonad-contrib/issues + +-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 ++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 + + source-repository head + type: git +@@ -66,7 +66,8 @@ library + unix, + X11>=1.6.1 && < 1.9, + xmonad>=0.13 && < 0.14, +- utf8-string ++ utf8-string, ++ semigroups + + if flag(use_xft) + build-depends: X11-xft >= 0.2 diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1d2b79074fb4..6ea3ac73a4b1 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -65,9 +65,9 @@ in stdenv.mkDerivation ({ ''; postPatch = '' - ${postPatch} - patchShebangs make + + ${postPatch} ''; preConfigure = '' @@ -88,9 +88,9 @@ in stdenv.mkDerivation ({ # (PDFs are generated only when fop is available). postInstall = '' - ${postInstall} - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + + ${postInstall} ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 6a2fdbdea436..cf42c9a7b683 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool ]; - propagatedBuildInputs = [ gmp ]; - - patches = [ ./cpp-4.5.patch ]; + propagatedBuildInputs = [ + gmp + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. Adding them here will add + # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, + # see below. + libtool + ]; - postInstall = '' - wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" - ''; - preBuild = '' - sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c - ''; + patches = [ ./cpp-4.5.patch ]; # Guile needs patching to preset results for the configure tests # about pthreads, which work only in native builds. @@ -45,6 +45,22 @@ stdenv.mkDerivation rec { fi ''; + preBuild = '' + sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c + ''; + + + postInstall = '' + wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" + '' + # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for + # why `--with-libunistring-prefix' and similar options coming from + # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. + + '' + sed -i "$out/lib/pkgconfig/guile"-*.pc \ + -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g" + ''; + # One test fails. # ERROR: file: "libtest-asmobs", message: "file not found" # This is fixed here: diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 815e0f20b54e..c72572139c68 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.14"; + version = "0.15"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0qx72w6lwskp18q608f95j5dcxb9xr4q4mzdkxp01sgib8v2v56l"; + sha256 = "0c2vfib4fmljy98c3s3s7jmpjlqxvsbv7wf6qxr38kamwzbryrjj"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index dae8657388f7..ad601359019e 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.8"; + name = "asio-1.12.0"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6"; + sha256 = "1bfk746kcs3cmvfvxjp3w9y6zpybjj8s002jjd3snrp2syd0nd9c"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 53ec9949f170..d3e2f6c9c983 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.9"; + version = "19.10"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc"; + sha256 = "0sgxblf4n33b8wgblyblmrkwydvy1yh7fzll1b6c4zgkz675w0m5"; }; postPatch = '' diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 0e4e897e27a4..edea352ae2dd 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; - version = "2.2.2"; + version = "2.3.2"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; + sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index ace1d687a91b..a1a9b10fca63 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,46 +1,40 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl -, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, shared-mime-info, libintlOrEmpty, gobjectIntrospection, doCheck ? false, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 +, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: let pname = "gdk-pixbuf"; - version = "2.36.11"; + version = "2.36.7"; + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf"; + sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; - outputs = [ "out" "dev" "man" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" ]; setupHook = ./setup-hook.sh; enableParallelBuilding = true; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info ++ libintlOrEmpty; + buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty; - nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobjectIntrospection makeWrapper - ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - mesonFlags = [ - # with_ & enable_will be removed in the future - "-Dwith_docs=true" - "-Denable_jasper=true" - "-Dx11=true" # will be added in the future (default atm) - "-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}" - ]; + configureFlags = "--with-libjasper --with-x11" + + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" + ; - postPatch = '' - chmod +x build-aux/* # patchShebangs only applies to executables - patchShebangs build-aux + # on darwin, tests don't link + preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' + substituteInPlace Makefile --replace "docs tests" "docs" ''; postInstall = @@ -48,17 +42,6 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - - # We require runtime access to shared-mime-info - ${stdenv.lib.optionalString (!stdenv.isDarwin) '' - for f in $dev/bin/*; do - wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - done - wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ''} - - # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ - $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 8b75f85852eb..d54b05b1c828 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; license = with licenses; [ lgpl2 gpl2 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 258157c11789..106de68d367a 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ln -s ${appliance} $out/lib/guestfs ''; - doInstallCheck = true; + doInstallCheck = appliance != null; installCheckPhase = '' export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 0583d94ef7f4..8719f19acc1d 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoconf, automake, fetchFromGitHub, glib, intltool, json_c, libtool, pkgconfig}: +{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}: let version = "1.3.0"; @@ -12,6 +12,14 @@ in stdenv.mkDerivation rec { sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc"; }; + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch; + sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi"; + }) + ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; buildInputs = [ glib ]; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 0f2ca3712975..80acaf57d625 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librsync-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x"; + sha256 = "1qnr4rk93mhggqjh2025clmlhhgnjhq983p1vbh8i1g8aiqdnapi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 35f675a305af..d43519f4a2f3 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { name = "netcdf-fortran-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "4170fc018c9ee8222e317215c6a273542623185f5f6ee00d37bbb4e024e4e998"; + sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4"; }; buildInputs = [ netcdf hdf5 curl gfortran ]; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index d4699b1c5062..59cc9438a9f1 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "0s5xiyvnvxc2k0zkyb12mm5cwn61lavyxlfpknlx5f243g1xi6f6"; + sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index 59c12e53ed22..dac65e1c2f9a 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }: +{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: with stdenv.lib; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - buildInputs = [ libgcrypt libgpgerror libksba zlib ]; + buildInputs = [ libgcrypt libgpgerror libksba zlib ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 90174bf749ad..57580de2401b 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -29,15 +29,13 @@ in stdenv.mkDerivation rec { alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 ]; - patches = [ - ./fix-paths.patch - ]; - mesonFlags = [ "-Denable_docs=true" "-Denable_gstreamer=true" ]; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; diff --git a/pkgs/development/libraries/pipewire/fix-paths.patch b/pkgs/development/libraries/pipewire/fix-paths.patch deleted file mode 100644 index 5a07c6271e14..000000000000 --- a/pkgs/development/libraries/pipewire/fix-paths.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -1,4 +1,4 @@ --systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir') -+systemd_user_services_dir = join_paths(get_option('prefix'), 'etc', 'systemd', 'user') - - install_data(sources : 'pipewire.socket', install_dir : systemd_user_services_dir) - diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix new file mode 100644 index 000000000000..072de0f9fa06 --- /dev/null +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg +, withData ? true, poppler_data +, qt5Support ? false, qtbase ? null +, introspectionSupport ? false, gobjectIntrospection ? null +, utils ? false +, minimal ? false, suffix ? "glib" +}: + +let + version = "0.61.0"; + mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; +in +stdenv.mkDerivation rec { + name = "poppler-${suffix}-${version}"; + + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + sha256 = "0zrbb1b77k6bm2qdnra08jnbyllv6vj29790igmp6fzs59xf3kak"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + + # TODO: reduce propagation to necessary libs + propagatedBuildInputs = with lib; + [ zlib freetype fontconfig libjpeg openjpeg ] + ++ optionals (!minimal) [ cairo lcms curl ] + ++ optional qt5Support qtbase + ++ optional introspectionSupport gobjectIntrospection; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + + cmakeFlags = [ + (mkFlag true "XPDF_HEADERS") + (mkFlag (!minimal) "GLIB") + (mkFlag (!minimal) "CPP") + (mkFlag (!minimal) "LIBCURL") + (mkFlag utils "UTILS") + (mkFlag qt5Support "QT5") + ]; + + meta = with lib; { + homepage = https://poppler.freedesktop.org/; + description = "A PDF rendering library"; + + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9a3d24fc0b28..1f360f075886 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + cmakeFlags = [ (mkFlag true "XPDF_HEADERS") (mkFlag (!minimal) "GLIB") diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index a626abc6577b..f9b3de36b2c4 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -19,23 +19,18 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection + spice-protocol celt_0_5_1 openssl libpulseaudio pixman libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy polkit acl usbutils ]; - nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala ]; + nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - - # put polkit action in the $out/share/polkit-1/actions - preAutoreconf = '' - substituteInPlace configure.ac \ - --replace 'POLICYDIR=`''${PKG_CONFIG} polkit-gobject-1 --variable=policydir`' "POLICYDIR=$out/share/polkit-1/actions" - ''; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; configureFlags = [ "--with-gtk3" + "--enable-introspection" "--enable-vala" ]; diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index d208f26ab670..a94f2745894b 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -12,6 +12,7 @@ , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null +, signMethod ? null , generateIPA ? false , generateXCArchive ? false , enableWirelessDistribution ? false @@ -21,7 +22,7 @@ , title ? null }: -assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; +assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; let @@ -82,13 +83,34 @@ stdenv.mkDerivation { # Do the building export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' + # Create export plist file + cat > "${name}.plist" <<EOF + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> + <plist version="1.0"> + <dict> + <key>provisioningProfiles</key> + <dict> + <key>${bundleId}</key> + <string>$PROVISIONING_PROFILE</string> + </dict> + <key>method</key> + <string>${signMethod}</string> + ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' + <key>compileBitcode</key> + <false/> + ''} + </dict> + </plist> + EOF + # Produce an IPA file - xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa" - + xcodebuild -exportArchive -archivePath "${name}.xcarchive" -exportOptionsPlist "${name}.plist" -exportPath $out + # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products @@ -99,6 +121,10 @@ stdenv.mkDerivation { echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} ''} + ${stdenv.lib.optionalString generateXCArchive '' + mkdir -p $out + mv "${name}.xcarchive" $out + ''} # Delete our temp keychain ${deleteKeychain} diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix new file mode 100644 index 000000000000..3b9a2c15b6e9 --- /dev/null +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy +, face_recognition_models, scipy, stdenv, flake8, tox, pytest, glibcLocales +}: + +buildPythonPackage rec { + pname = "face_recognition"; + version = "1.2.1"; + + src = fetchFromGitHub { + repo = pname; + owner = "ageitgey"; + rev = "fe421d4acd76e8a19098e942b7bd9c3bbef6ebc4"; # no tags available in Git, pure revs are pushed to pypi + sha256 = "0wv5qxkg7xv1cr43zhhbixaqgj08xw2l7yvwl8g3fb2kdxyndw1c"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" + ''; + + propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models scipy ]; + + checkInputs = [ flake8 tox pytest glibcLocales ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://github.com/ageitgey/face_recognition; + maintainers = with maintainers; [ ma27 ]; + description = "The world's simplest facial recognition api for Python and the command line"; + }; +} diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix new file mode 100644 index 000000000000..960bffb903d6 --- /dev/null +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, stdenv, fetchPypi }: + +buildPythonPackage rec { + pname = "face_recognition_models"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp"; + }; + + # no module named `tests` as no tests are available + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ageitgey/face_recognition_models; + license = licenses.cc0; + maintainers = with maintainers; [ ma27 ]; + description = "Trained models for the face_recognition python library"; + }; +} diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index d4e7de2872d4..37c5774bba25 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -24,16 +24,16 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.4.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "dd431fad9bdd25aa9ff8265da096ef770475e21bf1d327982611a7de5cd904ca"; + sha256 = "01l6yp78sp27vns4cxh8ybr7x0pixxn97cp0i3w6s0lv1v8l6qbx"; }; LC_ALL = "en_US.utf8"; - buildInputs = [ nose glibcLocales ] + checkInputs = [ nose glibcLocales ] ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ @@ -44,8 +44,8 @@ buildPythonPackage rec { # disable warning_filters preCheck = lib.optionalString (!isPy3k) '' echo "" > setup.cfg - cat setup.cfg ''; + checkPhase = '' runHook preCheck mkdir tmp diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix new file mode 100644 index 000000000000..31697750a702 --- /dev/null +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }: + +let + binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); + +in stdenv.mkDerivation rec { + name = "hyper-haskell-${version}"; + version = "0.1.0.2"; + + src = fetchFromGitHub { + owner = "HeinrichApfelmus"; + repo = "hyper-haskell"; + rev = "v${version}"; + sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb"; + }; + + propagatedBuildInputs = extra-packages; + + buildCommand = '' + mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages + + # Electron app + cp -R $src/app $out + + # Desktop Launcher + cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop + cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg + cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml + + # install example worksheets with backend set to nix + for worksheet in "$src/worksheets/"*.hhs; do + ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet` + done + + # install electron wrapper script + cat > $out/bin/hyper-haskell <<EOF + #!${stdenv.shell} + export PATH="${binPath}:\$PATH" + exec ${electron}/bin/electron $out/app "\$@" + EOF + chmod 755 $out/bin/hyper-haskell + ''; + + meta = with stdenv.lib; { + description = "The strongly hyped graphical interpreter for the Haskell programming language"; + homepage = "https://github.com/HeinrichApfelmus/hyper-haskell"; + license = licenses.bsd3; + maintainers = [ maintainers.rvl ]; + }; +} diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix new file mode 100644 index 000000000000..ff82127f0c4b --- /dev/null +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -0,0 +1,21 @@ +{ stdenv, ghcWithPackages, makeWrapper, packages }: + +let +hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); +in stdenv.mkDerivation { + name = "hyper-haskell-server-with-packages"; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${hyperHaskellEnv}/bin/hyper-haskell-server $out/bin/hyper-haskell-server \ + --set NIX_GHC ${hyperHaskellEnv}/bin/ghc \ + --set NIX_GHCPKG ${hyperHaskellEnv}/bin/ghc-pkg \ + --set NIX_GHC_LIBDIR ${hyperHaskellEnv}/lib/ghc-* + ''; + + # trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; +} diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index e7d5aaceb2bb..66b0467657a2 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/avrdude/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix new file mode 100644 index 000000000000..7a6d6c3861df --- /dev/null +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }: + +stdenv.mkDerivation rec { + + name = "brlaser"; + + src = fetchFromGitHub { + owner = "pdewacht"; + repo = "brlaser"; + rev = "a52149823373e11f918d9e6a56eda7242935c99b"; + sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6"; + }; + + buildInputs = [ cmake zlib cups ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DCUPS_SERVER_BIN=$out/lib/cups/ -DCUPS_DATA_DIR=$out/share/cups/" + ''; + + meta = with stdenv.lib; { + description = "A CUPS driver for Brother laser printers"; + longDescription = + '' + Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. + + This driver is known to work with these printers: + + Brother DCP-1510 + Brother DCP-7030 + Brother DCP-7040 + Brother DCP-7055 + Brother DCP-7055W + Brother DCP-7065DN + Brother HL-L2300D + Brother MFC-7360N + ''; + homepage = https://github.com/pdewacht/brlaser; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ StijnDW ]; + }; +} diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 7eee7ca3121a..c38d9b03a6e9 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.1"; + version = "3.93.0.174"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0l662l66ja8dsakcgwg6ab69lkl0va0r5h74dr6yjdsy0q4h2m7h"; + sha256 = "0fkvcpx2vhyr3z74r5mcpjh293w3cfm07axj8dj84nl2hi6im8b6"; }; preferLocalBuild = true; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c97f1b54622a..5d0728b7e240 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -17,13 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus glib linuxHeaders systemd ]; - enableParallelBuilding = true; - - prePatch = '' - substituteInPlace meson.build \ - --replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \ - --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')" "'$out/lib/systemd/user'" - ''; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README @@ -32,8 +27,6 @@ stdenv.mkDerivation rec { -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' ''; - checkPhase = "ninja test"; - doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 87cb17329e8c..2c5fd70ac95c 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.54"; + name = "hdparm-9.55"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "0ghnhdj7wfw6acfyhdawpfa5n9kvkvzgi1fw6i7sghgbjx5nhyjd"; + sha256 = "1ivdvrzimaayiq03by8mcq0mhmdljndj06h012zkdpw34irnpixm"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 5994a0816008..58abf35e92b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.122"; + version = "4.4.123"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hxph2bn2wdamk1p5sxl2szgsk4aybb0245x1rvf85a6skhjqc7g"; + sha256 = "115mvgwcx2syjrn943k4qqyvqkysdm6rgq97dhf1gcxf671qb204"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3bcfa3912aa2..0b18a624167b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.88"; + version = "4.9.89"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "094cxc86ajnsai1vwy76mmg7l3b9lvhk6mw6746lsr3fnzv1fkq7"; + sha256 = "0a9l2gkyr1nhaak6vyjwgjn01ywpxwa8zp5fhw8rjnfk44bf2hql"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index cb0b9b10be1c..94885efef900 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.11"; + version = "4.15.12"; revision = "a"; - sha256 = "09xyg3i2m5cv9cpl3pry579p40iphzsn1pif7046rvc7zfrjzl8d"; + sha256 = "1n0sqhqvm9p6w1yh7si8rw84qxf9c5kch7pvjyrp51ir1xh7grfr"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 8a5171824d0d..93e2c097ff74 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -8,11 +8,11 @@ # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { - name = "pcmciautils-017"; + name = "pcmciautils-018"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz"; - sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3"; + sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; buildInputs = [udev yacc sysfsutils kmod flex]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 55368ac9a4dc..86e756a0db37 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -4,14 +4,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.12.0"; in +let version = "9.12.1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9"; + sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index a78b3d59095e..0fcb5047549d 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "nextcloud-news-updater-${version}"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz"; - sha256 = "00pscz0p4s10y1ymb6sm0gx4a5wdbhimn30582x8i28n58nnl8j0"; + sha256 = "14jj3w417wfsm1ki34d980b0s6vfn8i29g4c66qb2fizdq1d0z6q"; }; doCheck = false; diff --git a/pkgs/servers/openpts/bugs.patch b/pkgs/servers/openpts/bugs.patch deleted file mode 100644 index d818bafbc9f3..000000000000 --- a/pkgs/servers/openpts/bugs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp openpts-0.2.6-cvs-patched/src/fsm.c openpts-0.2.6-current/src/fsm.c ---- openpts-0.2.6-cvs-patched/src/fsm.c 2012-01-05 03:49:15.000000000 -0500 -+++ openpts-0.2.6-current/src/fsm.c 2012-01-09 12:11:17.338706205 -0500 -@@ -934,7 +934,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W - /* event */ - event = eventWrapper->event; - if (event != NULL) { -- // len = snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType); -+ snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType); - } else { - LOG(LOG_ERR, "NULL event\n"); // TODO(munetoh) - xfree(buf); diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix deleted file mode 100644 index 27731af3803e..000000000000 --- a/pkgs/servers/openpts/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, trousers, openssl, libxml2, libuuid, gettext, perl }: - -stdenv.mkDerivation rec { - name = "openpts-${version}"; - version = "0.2.6"; - - src = fetchurl { - url = "http://jaist.dl.osdn.jp/openpts/54410/openpts-${version}.tar.gz"; - sha256 = "1b5phshl49fxr5y3g5zz75gm0n4cw8i7n29x5f1a95xkwrjpazi0"; - }; - - # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/ - patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ]; - - preConfigure = '' - substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl"; - $SHELL bootstrap.sh - ''; - - configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ]; - - NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss -Wno-deprecated-declarations"; - - preInstall = '' - mkdir -p $out - mkdir -p $out/etc - cp -p dist/ptsc.conf.in $out/etc/ptsc.conf - cp -p dist/ptsv.conf.in $out/etc/ptsv.conf - mkdir -p $out/share/openpts/models - cp -p models/*.uml $out/share/openpts/models/ - - mkdir -p $out/share/openpts/tpm_emulator - cp dist/tpm_emulator/README.rhel $out/share/openpts/tpm_emulator/README - cp dist/tpm_emulator/binary_bios_measurements $out/share/openpts/tpm_emulator/ - cp dist/tpm_emulator/tcsd $out/share/openpts/tpm_emulator/ - - mkdir -p $out/share/openpts/tboot - cp dist/tboot/README.fedora15 $out/share/openpts/tboot/README - cp dist/tboot/ptsc.conf.fedora15 $out/share/openpts/tboot/ptsc.conf - cp dist/tboot/tcsd.conf.fedora15 $out/share/openpts/tboot/tcsd.conf - cp dist/tboot/tcsd.fedora15 $out/share/openpts/tboot/tcsd - ''; - - meta = { - description = "TCG Platform Trust Service (PTS)"; - homepage = http://sourceforge.jp/projects/openpts; - license = stdenv.lib.licenses.cpl10; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - }; -} diff --git a/pkgs/servers/openpts/ptsc.patch b/pkgs/servers/openpts/ptsc.patch deleted file mode 100644 index b6fcde740744..000000000000 --- a/pkgs/servers/openpts/ptsc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urNp openpts-0.2.6-patched/src/ptsc.c openpts-0.2.6-current/src/ptsc.c ---- openpts-0.2.6-patched/src/ptsc.c 2012-08-21 15:57:07.733841433 -0400 -+++ openpts-0.2.6-current/src/ptsc.c 2012-08-21 16:13:26.479732504 -0400 -@@ -457,7 +457,10 @@ void ptsc_lock(void) { - exit(1); - } - oldgrp = getegid(); -- setegid(grp.gr_gid); -+ if(setegid(grp.gr_gid) != 0){ -+ LOG(LOG_ERR, "setegid fail"); -+ exit(1); -+ } - } - - oldmask = umask(0); -@@ -467,7 +470,10 @@ void ptsc_lock(void) { - } - if (grpent) { - chmod(LOCK_DIR, 02775); -- setegid(oldgrp); -+ if(setegid(oldgrp) != 0){ -+ LOG(LOG_ERR, "setegid fail"); -+ exit(1); -+ } - } - fd = open(LOCK_FILE, O_RDWR | O_CREAT | O_TRUNC, 0660); - if (fd < 0) { - diff --git a/pkgs/servers/openpts/tboot.patch b/pkgs/servers/openpts/tboot.patch deleted file mode 100644 index 6ecee5839202..000000000000 --- a/pkgs/servers/openpts/tboot.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urNp openpts-0.2.6-patched/src/tboot2iml.c openpts-0.2.6-current/src/tboot2iml.c ---- openpts-0.2.6-patched/src/tboot2iml.c 2012-07-23 16:30:12.381361421 -0400 -+++ openpts-0.2.6-current/src/tboot2iml.c 2012-07-23 17:25:59.053945778 -0400 -@@ -531,7 +531,7 @@ int sinit_acm_hash(char *filename, int s - - - int sha1sum_unzip(char *filename, int *filesize, BYTE *digest) { -- FILE *fp; -+ gzFile fp; - char buf[2048]; - SHA_CTX sha_ctx; - int len; -@@ -541,7 +541,7 @@ int sha1sum_unzip(char *filename, int *f - - /* open */ - fp = gzopen(filename, "rb"); -- if (fp == NULL) { -+ if (fp == Z_NULL) { - LOG(LOG_ERR, "File %s does not exist\n", filename); - return 0; - } diff --git a/pkgs/servers/openpts/zlib.patch b/pkgs/servers/openpts/zlib.patch deleted file mode 100644 index 7fa3fce10fe9..000000000000 --- a/pkgs/servers/openpts/zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp openpts-0.2.6-cvs-patched/src/Makefile.am openpts-0.2.6-current/src/Makefile.am ---- openpts-0.2.6-cvs-patched/src/Makefile.am 2012-01-05 03:49:15.000000000 -0500 -+++ openpts-0.2.6-current/src/Makefile.am 2012-01-09 14:12:02.507361732 -0500 -@@ -30,7 +30,7 @@ localedir = $(datadir)/locale - - - AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBXML2_CFLAGS) $(TSS_CFLAGS) -I../include -DLOCALEDIR=\"$(localedir)\" --AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lopenpts -+AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lz -lopenpts - # $(LIBINTL) -lopenpts - - if HAVE_LIBUUID diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix new file mode 100644 index 000000000000..876cc01592e9 --- /dev/null +++ b/pkgs/servers/serviio/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "serviio-${version}"; + version = "1.9"; + + src = fetchurl { + url = "http://download.serviio.org/releases/${name}-linux.tar.gz"; + sha256 = "0vi9dwpdrk087gpi0xib0hwpvdmaf9g99nfdfx2r3wmmdzw7wysl"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out + cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out + ''; + + meta = with stdenv.lib; { + homepage = http://serviio.org; + description = "UPnP Media Streaming Server"; + longDescription = '' + Serviio is a free media server. It allows you to stream your media files (music, video or images) + to any DLNA-certified renderer device (e.g. a TV set, Bluray player, games console) on your home network. + ''; + license = licenses.unfree; + maintainers = [ maintainers.thpham ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index b0e3492c0da1..2d0e1a529dac 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop , withLibevent ? true, luaevent ? null -, withZlib ? true, luazlib ? null , withDBI ? true, luadbi ? null # use withExtraLibs to add additional dependencies of community modules , withExtraLibs ? [ ] +, withOnlyInstalledCommunityModules ? [ ] , withCommunityModules ? [ ] }: assert withLibevent -> luaevent != null; -assert withZlib -> luazlib != null; assert withDBI -> luadbi != null; with stdenv.lib; @@ -16,7 +15,6 @@ with stdenv.lib; let libs = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent - ++ optional withZlib luazlib ++ optional withDBI luadbi ++ withExtraLibs; getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; @@ -27,21 +25,22 @@ let in stdenv.mkDerivation rec { - version = "0.9.12"; + version = "0.10.0"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"; + sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l"; }; communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "9a3e51f348fe"; - sha256 = "09g4vi52rv0r3jzcm0bsgp4ngqq6iapfbxfh0l7qj36qnajp4vm6"; + rev = "150a7bd59043"; + sha256 = "0nfx3lngcy88nd81gb7v4kh3nz1bzsm67bxgpd2lprk54diqcrz1"; }; - buildInputs = [ lua5 makeWrapper libidn openssl ]; + buildInputs = [ lua5 makeWrapper libidn openssl ] + ++ optional withDBI luadbi; configureFlags = [ "--ostype=linux" @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ - '') withCommunityModules} + '') (withCommunityModules ++ withOnlyInstalledCommunityModules)} wrapProgram $out/bin/prosody \ --set LUA_PATH '${luaPath};' \ --set LUA_CPATH '${luaCPath};' @@ -62,11 +61,13 @@ stdenv.mkDerivation rec { --set LUA_CPATH '${luaCPath};' ''; + passthru.communityModules = withCommunityModules; + meta = { description = "Open-source XMPP application server written in Lua"; license = licenses.mit; - homepage = http://www.prosody.im; + homepage = https://prosody.im; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6ac152cb7b8c..cbfdd56cca10 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.9"; + version = "2.2.0"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm"; + sha256 = "0yvb9iwwmjxvck2in3ymqszaddz502v2ryk50qs0wskhbhdh96c7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9af7de8b35e4..043ea44bb8c8 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus -, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40 , libgudev, sane-backends, udev, gnome3, makeWrapper }: stdenv.mkDerivation rec { - name = "colord-1.4.1"; + name = "colord-1.4.2"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; + sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c"; }; - enableParallelBuilding = true; - mesonFlags = [ "-Denable-sane=true" "-Denable-vala=true" @@ -23,19 +21,20 @@ stdenv.mkDerivation rec { "-Denable-docs=false" ]; - patches = [ - ./fix-build-paths.patch - ]; - - nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; + nativeBuildInputs = [ meson pkgconfig vala_0_40 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; - buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus - bash-completion argyllcms libgudev sane-backends ]; + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + postFixup = '' wrapProgram "$out/libexec/colord-session" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch deleted file mode 100644 index d4bf0f36ad74..000000000000 --- a/pkgs/tools/misc/colord/fix-build-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/contrib/session-helper/meson.build -+++ b/contrib/session-helper/meson.build -@@ -21,7 +21,7 @@ - output : 'colord-session.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), - ) - endif - ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,13 +8,13 @@ - - if get_option('enable-systemd') - install_data('colord.conf', -- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') -+ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') - ) - endif - - if get_option('enable-bash-completion') - install_data('colormgr', -- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') -+ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') - ) - endif - -@@ -31,7 +31,7 @@ - output : 'colord.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), - ) - endif - -@@ -50,5 +50,5 @@ - output : 'org.freedesktop.ColorManager.conf', - configuration : con2, - install: true, -- install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , -+ install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') , - ) ---- a/meson.build -+++ b/meson.build -@@ -258,6 +258,3 @@ - subdir('policy') - subdir('rules') - subdir('src') -- --meson.add_install_script('meson_post_install.sh', -- localstatedir, get_option('with-daemon-user')) ---- a/rules/meson.build -+++ b/rules/meson.build -@@ -9,5 +9,5 @@ - sensor_rules_in, - '95-cd-devices.rules', - ], -- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') -+ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') - ) ---- a/src/plugins/meson.build -+++ b/src/plugins/meson.build -@@ -66,7 +66,7 @@ - install_dir: join_paths(get_option('libdir'), 'colord-plugins'), - c_args : [ - cargs, -- '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), -+ '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'), - ], - dependencies : [ - gio, diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 592707be20ab..e7e40bc851e2 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.18.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "0qdld8jy1rkpfzbfhnssr58q1gciln3pw9m6fj0jarfgja4gj31l"; + sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs"; }; doCheck = true; diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix deleted file mode 100644 index 554aa0bccee2..000000000000 --- a/pkgs/tools/misc/nixbot/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication rec { - name = "nixbot-unstable-2016-10-09"; - - src = fetchFromGitHub { - owner = "domenkozar"; - repo = "nixbot"; - rev = "dc490e4954cb08f0eff97f74ad39dedb54670aa9"; - sha256 = "1l8rlhd2b7x5m79vb2vgszachygasv0pk8drnwgxyvsn0k88xcan"; - }; - - propagatedBuildInputs = with python3Packages; [ - pygit2 pyramid waitress github3_py - ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Github bot for reviewing/testing pull requests with the help of Hydra"; - maintainers = with maintainers; [ domenkozar fpletz globin ]; - license = licenses.asl20; - homepage = https://github.com/domenkozar/nixbot; - }; -} diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index e008c9183c98..1b306bc5e363 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,26 +1,30 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}: + +let + pname = "gupnp-tools"; + version = "0.8.13"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "gupnp-tools-${version}"; - majorVersion = "0.8"; - version = "${majorVersion}.13"; src = fetchurl { - url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av - gnome2.gnome_icon_theme makeWrapper]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ]; - postInstall = '' - for program in gupnp-av-cp gupnp-universal-cp; do - wrapProgram "$out/bin/$program" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" - done - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Set of utilities and demos to work with UPnP"; + homepage = https://wiki.gnome.org/Projects/GUPnP; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 064364e37ac3..999a269d0b78 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd }: +, libmbim, libqmi, systemd, fetchpatch }: stdenv.mkDerivation rec { name = "ModemManager-${version}"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; + patches = [ + # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) + (fetchpatch { + url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; + sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; + }) + ]; + configureFlags = [ "--with-polkit" "--with-udev-base-dir=$(out)/lib/udev" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c352ed0f6e7b..85fbb8894ecc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3904,8 +3904,6 @@ with pkgs; nitrogen = callPackage ../tools/X11/nitrogen {}; - nixbot = callPackage ../tools/misc/nixbot {}; - notify-desktop = callPackage ../tools/misc/notify-desktop {}; nkf = callPackage ../tools/text/nkf {}; @@ -5032,10 +5030,15 @@ with pkgs; tewisay = callPackage ../tools/misc/tewisay { }; - texmacs = callPackage ../applications/editors/texmacs { - tex = texlive.combined.scheme-small; - extraFonts = true; - }; + texmacs = if stdenv.isDarwin + then callPackage ../applications/editors/texmacs/darwin.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; + tex = texlive.combined.scheme-small; + extraFonts = true; + } else callPackage ../applications/editors/texmacs { + tex = texlive.combined.scheme-small; + extraFonts = true; + }; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; @@ -8140,7 +8143,7 @@ with pkgs; shards = callPackage ../development/tools/build-managers/shards { }; - shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; + shellcheck = haskellPackages.ShellCheck; schemaspy = callPackage ../development/tools/database/schemaspy { }; @@ -10914,6 +10917,7 @@ with pkgs; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; poppler_gi = lowPrio (poppler.override { introspectionSupport = true; @@ -12269,8 +12273,9 @@ with pkgs; hyp = callPackage ../servers/http/hyp/default.nix { }; prosody = callPackage ../servers/xmpp/prosody { - lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib luadbi; + # _compat can probably be removed on next minor version after 0.10.0 + lua5 = lua5_2_compat; + inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi; }; biboumi = callPackage ../servers/xmpp/biboumi { }; @@ -12439,7 +12444,6 @@ with pkgs; oauth2_proxy = callPackage ../servers/oauth2_proxy { }; openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; }; - openpts = callPackage ../servers/openpts { }; openresty = callPackage ../servers/http/openresty { }; @@ -15920,10 +15924,7 @@ with pkgs; grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; - gtkpod = callPackage ../applications/audio/gtkpod { - gnome = gnome3; - inherit (gnome2) libglade; - }; + gtkpod = callPackage ../applications/audio/gtkpod { }; jbidwatcher = callPackage ../applications/misc/jbidwatcher { java = if stdenv.isLinux then jre else jdk; @@ -16051,6 +16052,20 @@ with pkgs; hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; + hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { + inherit (haskellPackages) ghcWithPackages; + packages = self: with self; []; + }; + + hyper-haskell = callPackage ../development/tools/haskell/hyper-haskell { + hyper-haskell-server = hyper-haskell-server-with-packages.override { + packages = self: with self; [ + hyper-extra diagrams csound-catalog + ]; + }; + extra-packages = [ csound ]; + }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -16284,7 +16299,7 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; + kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -16433,6 +16448,7 @@ with pkgs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; + poppler = poppler_0_61; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc @@ -16761,6 +16777,8 @@ with pkgs; mtpaint = callPackage ../applications/graphics/mtpaint { }; + mucommander = callPackage ../applications/misc/mucommander { }; + multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; multimon-ng = callPackage ../applications/misc/multimon-ng { }; @@ -20621,6 +20639,8 @@ with pkgs; snapscanFirmware = config.sane.snapscanFirmware or null; }; + brlaser = callPackage ../misc/cups/drivers/brlaser { }; + brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { }; mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; @@ -20639,6 +20659,8 @@ with pkgs; seafile-shared = callPackage ../misc/seafile-shared { }; + serviio = callPackage ../servers/serviio {}; + slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 0cc4482f402a..a23de670836b 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -167,15 +167,14 @@ let }; luaevent = buildLuaPackage rec { - version = "0.4.3"; + version = "0.4.4"; name = "luaevent-${version}"; - disabled = isLua52; src = fetchFromGitHub { owner = "harningt"; repo = "luaevent"; rev = "v${version}"; - sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik"; + sha256 = "1krzxr0jkv3gmhpckp02byhdd9s5dd0hpyqc8irc8i79dd8x0p53"; }; preBuild = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 688af3e28e70..13554ff6ee68 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6350,19 +6350,19 @@ let self = _self // overrides; _self = with self; { }; GSSAPI = buildPerlPackage rec { - name = "GSSAPPI-0.28"; + name = "GSSAPI-0.28"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz"; + url = "mirror://cpan/authors/id/A/AG/AGROLMS/${name}.tar.gz"; sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx"; }; buildInputs = [ TestPod ]; - propagatedBuildInputs = [ pkgs.heimdalFull ]; + propagatedBuildInputs = [ pkgs.krb5Full.dev ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "Perl extension providing access to the GSSAPIv2 library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - makeMakerFlags = "--gssapiimpl ${pkgs.heimdalFull.out}"; + makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}"; }; Gtk2 = buildPerlPackage rec { @@ -16529,11 +16529,14 @@ let self = _self // overrides; _self = with self; { }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.59"; + name = "YAML-LibYAML-0.69"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "0m4zr6gm5rzwvxwd2x7rklr659jl8gsa5bxc5h25904nbvpj9x4x"; + url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; + sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33"; }; + preBuild = '' + sed -i 's/FULLPERL *= "/FULLPERL = /' LibYAML/Makefile + ''; }; WebServiceLinode = buildPerlModule rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a86c79da03d1..25aa2e9514f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4184,6 +4184,10 @@ in { }; }; + face_recognition = callPackage ../development/python-modules/face_recognition { }; + + face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + faker = callPackage ../development/python-modules/faker { }; fake_factory = buildPythonPackage rec { |