diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c17739825bc6..3c9df2e6e821 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -923,6 +923,28 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`).
+### How to override a Python package using overlays?
+
+To alter a python package using overlays, you would use the following approach:
+
+```nix
+self: super:
+rec {
+ python = super.python.override {
+ packageOverrides = python-self: python-super: {
+ bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: {
+ src = self.pkgs.fetchgit {
+ url = "https://github.com/bepasty/bepasty-server";
+ sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps";
+ rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d";
+ };
+ });
+ };
+ };
+ pythonPackages = python.pkgs;
+}
+```
+
## Contributing
### Contributing guidelines
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 0919699b41e3..8dd1c210b7fa 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -45,6 +45,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Apple Public Source License 2.0";
};
+ arphicpl = {
+ fullName = "Arphic Public License";
+ url = https://www.freedesktop.org/wiki/Arphic_Public_License/;
+ };
+
artistic1 = spdx {
spdxId = "Artistic-1.0";
fullName = "Artistic License 1.0";
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index f55f3d712727..22557bdfeefb 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -90,7 +90,7 @@ runTests {
testIsStorePath = {
expr =
let goodPath =
- "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
+ "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
in {
storePath = isStorePath goodPath;
storePathAppendix = isStorePath
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 6d9bc915ba03..0fe91435ce8c 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -131,9 +131,9 @@ in {
path = mkIf (!isMLocate) [ pkgs.su ];
script =
''
- install -m ${if isMLocate then "0750" else "0755"} -o root -g ${if isMLocate then "mlocate" else "root"} -d $(dirname ${cfg.output})
+ mkdir -m 0755 -p ${dirOf cfg.output}
exec ${cfg.locate}/bin/updatedb \
- ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \
+ ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
'';
environment = {
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 6746f3fec698..792a4c8375d9 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -22,19 +22,9 @@ in {
environment.systemPackages = [ pkgs.autorandr ];
- # systemd.unitPackages = [ pkgs.autorandr ];
+ systemd.packages = [ pkgs.autorandr ];
+
systemd.services.autorandr = {
- unitConfig = {
- Description = "autorandr execution hook";
- After = [ "sleep.target" ];
- StartLimitInterval = "5";
- StartLimitBurst = "1";
- };
- serviceConfig = {
- ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default default";
- Type = "oneshot";
- RemainAfterExit = false;
- };
wantedBy = [ "sleep.target" ];
};
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 0272b6ceff20..ca375c935e83 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -14,8 +14,8 @@ let
acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
options {
- listen-on {any;};
- listen-on-v6 {any;};
+ listen-on { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOn} };
+ listen-on-v6 { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} };
allow-query { cachenetworks; };
blackhole { badnetworks; };
forward first;
@@ -96,6 +96,22 @@ in
";
};
+ listenOn = mkOption {
+ default = ["any"];
+ type = types.listOf types.str;
+ description = "
+ Interfaces to listen on.
+ ";
+ };
+
+ listenOnIpv6 = mkOption {
+ default = ["any"];
+ type = types.listOf types.str;
+ description = "
+ Ipv6 interfaces to listen on.
+ ";
+ };
+
zones = mkOption {
default = [];
description = "
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index cf47aed9fa99..1681439a7287 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -64,11 +64,21 @@ let
)) + ":" + (makeSearchPathOutput "bin" "sbin" [
pkgs.mdadm pkgs.utillinux
]);
+ font = if lib.last (lib.splitString "." cfg.font) == "pf2"
+ then cfg.font
+ else "${convertedFont}";
});
bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}
(concatMap (args: args.devices) cfg.mirroredBoots);
+ convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}
+ (builtins.concatStringsSep " "
+ ([ "${realGrub}/bin/grub-mkfont"
+ cfg.font
+ "--output" "$out"
+ ] ++ (optional (cfg.fontSize!=null) "--size ${toString cfg.fontSize}")))
+ );
in
{
@@ -276,7 +286,7 @@ in
extraInitrd = mkOption {
type = types.nullOr types.path;
default = null;
- example = "/boot/extra_initrafms.gz";
+ example = "/boot/extra_initramfs.gz";
description = ''
The path to a second initramfs to be supplied to the kernel.
This ramfs will not be copied to the store, so that it can
@@ -305,6 +315,24 @@ in
'';
};
+ font = mkOption {
+ type = types.nullOr types.path;
+ default = "${realGrub}/share/grub/unicode.pf2";
+ description = ''
+ Path to a TrueType, OpenType, or pf2 font to be used by Grub.
+ '';
+ };
+
+ fontSize = mkOption {
+ type = types.nullOr types.int;
+ example = literalExample 16;
+ default = null;
+ description = ''
+ Font size for the grub menu. Ignored unless font
+ is set to a ttf or otf font.
+ '';
+ };
+
gfxmodeEfi = mkOption {
default = "auto";
example = "1024x768";
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 5fcac5c8c6a4..1edb9e0d229b 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -67,6 +67,7 @@ my $gfxmodeEfi = get("gfxmodeEfi");
my $gfxmodeBios = get("gfxmodeBios");
my $bootloaderId = get("bootloaderId");
my $forceInstall = get("forceInstall");
+my $font = get("font");
$ENV{'PATH'} = get("path");
die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -281,7 +282,7 @@ else {
insmod vbe
fi
insmod font
- if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
+ if loadfont " . $grubBoot->path . "/converted-font.pf2; then
insmod gfxterm
if [ \"\${grub_platform}\" = \"efi\" ]; then
set gfxmode=$gfxmodeEfi
@@ -294,6 +295,9 @@ else {
fi
";
+ if ($font) {
+ copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
+ }
if ($splashImage) {
# FIXME: GRUB 1.97 doesn't resize the background image if it
# doesn't match the video resolution.
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index e3a3b6f88cf2..73608a0e27f2 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -167,7 +167,7 @@ let
--replace /sbin/blkid ${extraUtils}/bin/blkid \
--replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
--replace /sbin/mdadm ${extraUtils}/bin/mdadm \
- --replace /bin/sh ${extraUtils}/bin/sh \
+ --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \
--replace /usr/bin/readlink ${extraUtils}/bin/readlink \
--replace /usr/bin/basename ${extraUtils}/bin/basename \
--replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm
diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix
index f988ec02af72..3bfdf89e0cf5 100644
--- a/nixos/modules/tasks/bcache.nix
+++ b/nixos/modules/tasks/bcache.nix
@@ -4,6 +4,8 @@
environment.systemPackages = [ pkgs.bcache-tools ];
+ services.udev.packages = [ pkgs.bcache-tools ];
+
boot.initrd.extraUdevRulesCommands = ''
cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/
'';
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 3b94235889cf..28155fd23178 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A range of synthesiser, electric piano and organ emulations";
homepage = http://bristol.sourceforge.net;
license = licenses.gpl3;
- platforms = platforms.linux;
+ platforms = ["x86_64-linux" "i686-linux"];
maintainers = [ maintainers.goibhniu ];
};
}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7eb34b47c768..d599bc123150 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,17 +1,19 @@
{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, python, unzip, p7zip
-, androidsdk, jdk
+, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses
}:
assert stdenv.isLinux;
+with stdenv.lib;
+
let
mkJetBrainsProduct = callPackage ./common.nix { };
# Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass }:
- (mkJetBrainsProduct rec {
+ lib.overrideDerivation (mkJetBrainsProduct rec {
inherit name version src wmClass jdk;
product = "CLion";
meta = with stdenv.lib; {
@@ -21,9 +23,35 @@ let
Enhancing productivity for every C and C++
developer on Linux, OS X and Windows.
'';
- maintainers = with maintainers; [ edwtjo ];
+ maintainers = with maintainers; [ edwtjo mic92 ];
platforms = platforms.linux;
};
+ }) (attrs: {
+ postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
+ (
+ cd $out/clion-${version}
+ # bundled cmake does not find libc
+ rm -rf bin/cmake
+ ln -s ${cmake} bin/cmake
+
+ lldbLibPath=$out/clion-${version}/bin/lldb/lib
+ interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+ ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
+
+ patchelf --set-interpreter $interp \
+ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
+ bin/lldb/bin/lldb-server
+ patchelf --set-interpreter $interp \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
+ bin/lldb/LLDBFrontend
+ patchelf \
+ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \
+ bin/lldb/lib/liblldb.so
+
+ patchelf --set-interpreter $interp bin/gdb/bin/gdb
+ patchelf --set-interpreter $interp bin/gdb/bin/gdbserver
+ )
+ '';
});
buildDataGrip = { name, version, src, license, description, wmClass }:
@@ -209,12 +237,12 @@ in
gogland = buildGogland rec {
name = "gogland-${version}";
- version = "171.4424.55";
+ version = "171.4694.35";
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "0l5pn2wj541v1xc58bpipkl483zrhwjr37grkwiwx2j4iygrikq7";
+ sha256 = "0q2f8bi2i49j0xcpn824sihz2015jhn338cjaqy0jd988nxik6jk";
};
wmClass = "jetbrains-gogland";
};
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 47fb24ca2cc6..50103de4d050 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
makeWrapper, libXScrnSaver, libxkbfile }:
let
- version = "1.12.2";
+ version = "1.13.0";
channel = "stable";
plat = {
@@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "0221s8vx32haqr31wkkm637gya3vljbkim59i7a2hhwxh2gcs2fk";
- "x86_64-linux" = "0p6ck2lc9lln96lib5r5yfbrd04rgsbzhvf1lx2kykn428ddxi9s";
- "x86_64-darwin" = "1s7hyr245v4z2g357m7ajnh8y1cqixricpkx329xls4292qb7rh4";
+ "i686-linux" = "069pv0w8yhsv50glpcxzypsjc7mxmrcrv25c75rnv43yiyamjvyi";
+ "x86_64-linux" = "0cjkkvd5rs82yji0kpnbvzgwz5qvh9x6bmjd51rrvjz84dbwhgzq";
+ "x86_64-darwin" = "1qbxv5drqrx9k835a6zj3kkbh4sga5r9y0gf9bq16g3gf0dd9bwq";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
new file mode 100644
index 000000000000..ea2af2b09509
--- /dev/null
+++ b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
@@ -0,0 +1,12 @@
+diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt
+--- kdenlive-17.04.1-upstream/CMakeLists.txt 2017-06-10 00:06:44.773146595 -0400
++++ kdenlive-17.04.1/CMakeLists.txt 2017-06-10 00:07:35.766596566 -0400
+@@ -79,7 +79,7 @@
+ check_include_files(malloc.h HAVE_MALLOC_H)
+ check_include_files(pthread.h HAVE_PTHREAD_H)
+
+-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
++find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick )
+ find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
+
+ find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 3c18772f0392..e543a3d84bf3 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -34,6 +34,9 @@
let
unwrapped = kdeApp {
name = "kdenlive";
+ patches = [
+ ./kdenlive-cmake-concurrent-module.patch
+ ];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 11ef001ef54b..f90784759941 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,12 +4,12 @@ assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "IPMIView-${version}";
- version = "2.12.0";
- buildVersion = "160804";
+ version = "2.13.0";
+ buildVersion = "170504";
src = fetchurl {
url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
- sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
+ sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6";
};
buildInputs = [ patchelf makeWrapper ];
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
new file mode 100644
index 000000000000..df253b3b4ceb
--- /dev/null
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus
+, gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd
+, perlPackages, wrapGAppsHook, xdg_utils }:
+
+stdenv.mkDerivation rec {
+ name = "tilix-${version}";
+ version = "1.6.1";
+
+ src = fetchFromGitHub {
+ owner = "gnunn1";
+ repo = "tilix";
+ rev = "${version}";
+ sha256 = "10nw3q6s941dm44bkfryl1xclr1xy1vjr2n8w7g6kfahpcazf8f8";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils
+ wrapGAppsHook
+ ];
+ buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ];
+
+ preBuild = ''
+ makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5")
+ '';
+
+ postInstall = with gnome3; ''
+ ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+
+ preFixup = ''
+ substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \
+ --replace "Exec=tilix" "Exec=$out/bin/tilix"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tiling terminal emulator following the Gnome Human Interface Guidelines.";
+ homepage = "https://gnunn1.github.io/tilix-web";
+ licence = licenses.mpl20;
+ maintainer = with maintainers; [ midchildan ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 32f4f8f32b36..e1a068393b14 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -3,10 +3,12 @@
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
+, traySupport ? false, gnome2 ? null
}:
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk_pixbuf != null;
+assert traySupport -> gnome2 != null;
with stdenv.lib;
@@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
pkgconfig readline libuuid libmesode
glib openssl expat ncurses libotr curl
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
- ++ optionals notifySupport [ libnotify gdk_pixbuf ];
+ ++ optionals notifySupport [ libnotify gdk_pixbuf ]
+ ++ optionals traySupport [ gnome2.gtk ];
meta = {
description = "A console based XMPP client";
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index d6640b6c5bb6..41dd8595c30d 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -1,32 +1,38 @@
-{stdenv, fetchurl, unzip, libX11, libcxxabi, glib, xorg, qt4, fontconfig, phonon, freetype, zlib, libpng12, libICE, libXrender, cups, lib}:
+{ stdenv, fetchurl, fetchFromGitHub
+, libX11, glib, xorg, fontconfig, freetype
+, zlib, libpng12, libICE, libXrender, cups }:
+
+let
+ bits = if stdenv.system == "x86_64-linux" then "x86_64"
+ else "x86";
-stdenv.mkDerivation rec{
- name = "wpsoffice-${version}";
version = "10.1.0.5672";
+in stdenv.mkDerivation rec{
+ name = "wpsoffice-${version}";
src = fetchurl {
- name = "${name}.tar.gz";
- url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5672~a21_x86_64.tar.xz";
- sha1 = "7e9b17572ed5cea50af24f01457f726fc558a515";
+ name = "${name}.tar.xz";
+ url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz";
+ sha256 = if bits == "x86_64" then
+ "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
+ "1dk400ap5qwdhjvn8lnk602f5akayr391fkljxdkrpn5xac01m97";
};
meta = {
description = "Office program originally named Kingsoft Office";
homepage = http://wps-community.org/;
- platforms = [ "x86_64-linux" ];
- # Binary for i686 is also available if someone can package it
- license = lib.licenses.unfreeRedistributable;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = [];
+ license = stdenv.lib.licenses.unfreeRedistributable;
};
libPath = stdenv.lib.makeLibraryPath [
libX11
- libcxxabi
libpng12
glib
xorg.libSM
xorg.libXext
fontconfig
- phonon
zlib
freetype
libICE
@@ -34,19 +40,36 @@ stdenv.mkDerivation rec{
libXrender
];
- phases = [ "unpackPhase" "installPhase" ];
+ dontPatchELF = true;
installPhase = ''
- cp -r . "$out"
- chmod +x "$out/office6/wpp"
- patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wpp"
- chmod +x "$out/office6/wps"
- patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wps"
- chmod +x "$out/office6/et"
- patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/et"
- mkdir -p "$out/bin/"
- ln -s "$out/office6/wpp" "$out/bin/wpspresentation"
- ln -s "$out/office6/wps" "$out/bin/wpswriter"
- ln -s "$out/office6/et" "$out/bin/wpsspreadsheets"
+ prefix=$out/opt/kingsoft/wps-office
+ mkdir -p $prefix
+ cp -r . $prefix
+
+ # Avoid forbidden reference error due use of patchelf
+ rm -r $PWD
+
+ mkdir $out/bin
+ for i in wps wpp et; do
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --force-rpath --set-rpath "$prefix/office6:$libPath" \
+ $prefix/office6/$i
+
+ substitute $prefix/$i $out/bin/$i \
+ --replace /opt/kingsoft/wps-office $prefix
+ chmod +x $out/bin/$i
+
+ substituteInPlace $prefix/resource/applications/wps-office-$i.desktop \
+ --replace /usr/bin $out/bin
+ done
+
+ # China fonts
+ mkdir -p $prefix/resource/fonts/wps-office $out/etc/fonts/conf.d
+ ln -s $prefix/fonts/* $prefix/resource/fonts/wps-office
+ ln -s $prefix/fontconfig/*.conf $out/etc/fonts/conf.d
+
+ ln -s $prefix/resource $out/share
'';
}
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 3ce183d90e26..3c7480e51812 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,30 +5,15 @@ with lib;
stdenv.mkDerivation rec {
name = "runc-${version}";
- version = "1.0.0-rc2";
+ version = "1.0.0-rc3";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk";
+ sha256 = "14hdhnni0rz3g0bhcaq95zn2zrhyds0mq2pm2padbamg4bgq4r1c";
};
- patches = [
- # Two patches to fix CVE-2016-9962
- # From https://bugzilla.suse.com/show_bug.cgi?id=1012568
- (fetchpatch {
- name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch";
- url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw";
- sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck";
- })
- (fetchpatch {
- name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch";
- url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw";
- sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl";
- })
- ];
-
outputs = [ "out" "man" ];
hardeningDisable = ["fortify"];
@@ -37,7 +22,16 @@ stdenv.mkDerivation rec {
makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
+ preConfigure = ''
+ # Extract the source
+ cd "$NIX_BUILD_TOP"
+ mkdir -p "go/src/github.com/opencontainers"
+ mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
+ export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+ '';
+
preBuild = ''
+ cd go/src/github.com/opencontainers/runc
patchShebangs .
substituteInPlace libcontainer/apparmor/apparmor.go \
--replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index d32e82f100e2..83fe3ef163a3 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -1,5 +1,16 @@
-{ fetchFromGitHub, stdenv }:
+{ fetchFromGitHub, stdenv, perl, makeWrapper
+, iproute, acpi, sysstat, alsaUtils
+, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
+ "load_average" "memory" "volume" "wifi" ]
+}:
+with stdenv.lib;
+
+let
+ perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ];
+ contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
+
+in
stdenv.mkDerivation rec {
name = "i3blocks-gaps-${version}";
version = "1.4";
@@ -14,6 +25,22 @@ stdenv.mkDerivation rec {
makeFlags = "all";
installFlags = "PREFIX=\${out} VERSION=${version}";
+ buildInputs = optional (contains_any scripts perlscripts) perl;
+ nativeBuildInputs = [ makeWrapper ];
+
+ postFixup = ''
+ wrapProgram $out/libexec/i3blocks/bandwidth \
+ --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
+ wrapProgram $out/libexec/i3blocks/battery \
+ --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
+ wrapProgram $out/libexec/i3blocks/cpu_usage \
+ --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
+ wrapProgram $out/libexec/i3blocks/iface \
+ --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
+ wrapProgram $out/libexec/i3blocks/volume \
+ --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
+ '';
+
meta = with stdenv.lib; {
description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps";
homepage = https://github.com/Airblader/i3blocks-gaps;
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 60f13ce440c3..88bf7762dd87 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -1,5 +1,19 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, perl, makeWrapper
+, iproute, acpi, sysstat, xset, playerctl
+, cmus, openvpn, lm_sensors, alsaUtils
+, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
+ "keyindicator" "load_average" "mediaplayer" "memory"
+ "openvpn" "temperature" "volume" "wifi" ]
+}:
+with stdenv.lib;
+
+let
+ perlscripts = [ "battery" "cpu_usage" "keyindicator"
+ "mediaplayer" "openvpn" "temperature" ];
+ contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
+
+in
stdenv.mkDerivation rec {
name = "i3blocks-${version}";
version = "1.4";
@@ -12,7 +26,31 @@ stdenv.mkDerivation rec {
buildFlags = "SYSCONFDIR=/etc all";
installFlags = "PREFIX=\${out} VERSION=${version}";
- meta = with stdenv.lib; {
+ buildInputs = optional (contains_any scripts perlscripts) perl;
+ nativeBuildInputs = [ makeWrapper ];
+
+ postFixup = ''
+ wrapProgram $out/libexec/i3blocks/bandwidth \
+ --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
+ wrapProgram $out/libexec/i3blocks/battery \
+ --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
+ wrapProgram $out/libexec/i3blocks/cpu_usage \
+ --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
+ wrapProgram $out/libexec/i3blocks/iface \
+ --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
+ wrapProgram $out/libexec/i3blocks/keyindicator \
+ --prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)}
+ wrapProgram $out/libexec/i3blocks/mediaplayer \
+ --prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])}
+ wrapProgram $out/libexec/i3blocks/openvpn \
+ --prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)}
+ wrapProgram $out/libexec/i3blocks/temperature \
+ --prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)}
+ wrapProgram $out/libexec/i3blocks/volume \
+ --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
+ '';
+
+ meta = {
description = "A flexible scheduler for your i3bar blocks";
homepage = https://github.com/vivien/i3blocks;
license = licenses.gpl3;
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 7a8a161712d6..8ed30b37fc7f 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -18,6 +18,10 @@ if test -n "$http_proxy"; then
export HOME="$PWD"
fi;
+if test -z "$LC_ALL"; then
+ export LC_ALL="en_US.UTF-8"
+fi;
+
# Pipe the "p" character into Subversion to force it to accept the
# server's certificate. This is perfectly safe: we don't care
# whether the server is being spoofed --- only the cryptographic
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 6ed34ec02763..8a1085affd3c 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, subversion, sshSupport ? false, openssh ? null}:
+{stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "",
ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
@@ -31,7 +31,7 @@ else
stdenv.mkDerivation {
name = name_;
builder = ./builder.sh;
- buildInputs = [subversion];
+ buildInputs = [ subversion glibcLocales ];
outputHashAlgo = "sha256";
outputHashMode = "recursive";
diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
new file mode 100644
index 000000000000..b392ac79b2da
--- /dev/null
+++ b/pkgs/data/fonts/arphic/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, mkfontscale, mkfontdir }:
+
+{
+ arphic-ukai = stdenv.mkDerivation rec {
+ name = "arphic-ukai-${version}";
+
+ version = "0.2.20080216.2";
+
+ src = fetchurl {
+ url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
+ sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml";
+ };
+
+ buildInputs = [ mkfontscale mkfontdir ];
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''
+ install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
+ cd $out/share/fonts
+ mkfontdir
+ mkfontscale
+ '';
+
+ meta = with stdenv.lib; {
+ description = "CJK Unicode font Kai style";
+ homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
+
+ license = licenses.arphicpl;
+ maintainers = [ maintainers.changlinli ];
+ platforms = platforms.all;
+ };
+ };
+
+ arphic-uming = stdenv.mkDerivation rec {
+ name = "arphic-uming-${version}";
+
+ version = "0.2.20080216.2";
+
+ src = fetchurl {
+ url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
+ sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3";
+ };
+
+ buildInputs = [ mkfontscale mkfontdir ];
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''
+ install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
+ cd $out/share/fonts
+ mkfontdir
+ mkfontscale
+ '';
+
+ meta = with stdenv.lib; {
+ description = "CJK Unicode font Ming style";
+ homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
+
+ license = licenses.arphicpl;
+ maintainers = [ maintainers.changlinli ];
+ platforms = platforms.all;
+ };
+ };
+}
diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index b6b63e316152..9793ff9c2502 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
+{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2, withGtk3 ? false, gtk3 }:
stdenv.mkDerivation rec {
name = "lxappearance-0.6.3";
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ libX11 gtk2 ];
+ buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) ];
+
+ patches = [ ./lxappearance-0.6.3-xdg.system.data.dirs.patch ];
+
+ configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
meta = {
description = "A lightweight program for configuring the theme and fonts of gtk applications";
diff --git a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch b/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
new file mode 100644
index 000000000000..a63882aa2a7a
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
@@ -0,0 +1,27 @@
+--- lxappearance-0.6.3/src/widget-theme.c.orig 2016-02-20 20:48:38.000000000 -0200
++++ lxappearance-0.6.3/src/widget-theme.c 2017-06-09 17:37:53.369555085 -0300
+@@ -66,6 +66,7 @@
+ static void load_themes()
+ {
+ char* dir;
++ const gchar * const * dirs;
+ GSList* themes = NULL, *l;
+ GtkTreeIter sel_it = {0};
+ GtkTreeSelection* tree_sel;
+@@ -85,6 +86,16 @@
+ themes = load_themes_in_dir(dir, themes);
+ g_free(dir);
+
++ /* load from sharedata theme dirs */
++ dirs = g_get_system_data_dirs();
++ while (*dirs != NULL)
++ {
++ dir = g_build_filename(*dirs, "themes", NULL);
++ themes = load_themes_in_dir(dir, themes);
++ g_free(dir);
++ dirs++;
++ }
++
+ themes = g_slist_sort(themes, (GCompareFunc)strcmp);
+ for(l = themes; l; l=l->next)
+ {
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 8dae4190237c..6fa9c991dbd9 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -89,6 +89,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { };
xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { };
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
+ xfce4_namebar_plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
xfce4_mailwatch_plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
index 42f155f39e25..fbc841db1fc6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
installPhase = "python waf install";
- postFixup = "wrapPythonPrograms";
+ postFixup = ''
+ wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
+ '';
meta = with stdenv.lib; {
homepage = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
new file mode 100644
index 000000000000..5822ff173c97
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
@@ -0,0 +1,35 @@
+{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }:
+
+stdenv.mkDerivation rec {
+ ver = "0.3.1";
+ rev = "07a23b3";
+ name = "xfce4-namebar-plugin-${ver}";
+
+ src = fetchFromGitHub {
+ owner = "TiZ-EX1";
+ repo = "xfce4-namebar-plugin";
+ rev = rev;
+ sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
+ };
+
+ buildInputs = [ pkgconfig python2 vala gtk2 libwnck libxfce4util xfce4panel ];
+
+ postPatch = ''
+ substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+ substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+ '';
+
+ configurePhase = "python waf configure --prefix=$out";
+
+ buildPhase = "python waf build";
+
+ installPhase = "python waf install";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin;
+ description = "A plugins which integrates titlebar and window controls into the xfce4-panel";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.volth ];
+ };
+}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3bcb3e708ec5..9b017cad114a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # LTS Haskell 8.16
+ # LTS Haskell 8.17
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -161,7 +161,7 @@ default-package-overrides:
- amqp ==0.14.1
- annotated-wl-pprint ==0.7.0
- anonymous-sums ==0.6.0.0
- - ansi-terminal ==0.6.3
+ - ansi-terminal ==0.6.3.1
- ansi-wl-pprint ==0.6.7.3
- ansigraph ==0.3.0.2
- app-settings ==0.2.0.11
@@ -182,7 +182,7 @@ default-package-overrides:
- async-extra ==0.1.0.0
- async-refresh ==0.2.0
- async-refresh-tokens ==0.1.0
- - atom-basic ==0.2.4
+ - atom-basic ==0.2.5
- atom-conduit ==0.4.0.1
- atomic-primops ==0.8.0.4
- atomic-write ==0.2.0.5
@@ -645,7 +645,7 @@ default-package-overrides:
- exhaustive ==1.1.4
- exp-pairs ==0.1.5.2
- expiring-cache-map ==0.0.6.1
- - explicit-exception ==0.1.8
+ - explicit-exception ==0.1.9
- extensible ==0.3.7
- extensible-effects ==1.11.0.4
- extensible-exceptions ==0.1.1.4
@@ -697,7 +697,7 @@ default-package-overrides:
- fold-debounce ==0.2.0.5
- fold-debounce-conduit ==0.1.0.5
- foldl ==1.2.5
- - foldl-statistics ==0.1.4.3
+ - foldl-statistics ==0.1.4.4
- folds ==0.7.3
- FontyFruity ==0.5.3.2
- force-layout ==0.4.0.6
@@ -942,8 +942,8 @@ default-package-overrides:
- hashmap ==1.3.2
- hashtables ==1.2.1.1
- haskeline ==0.7.4.0
- - haskell-gi ==0.20.1
- - haskell-gi-base ==0.20.2
+ - haskell-gi ==0.20.2
+ - haskell-gi-base ==0.20.3
- haskell-import-graph ==1.0.1
- haskell-lexer ==1.0.1
- haskell-names ==0.8.0
@@ -1104,7 +1104,7 @@ default-package-overrides:
- http-api-data ==0.3.7.1
- http-client ==0.5.7.0
- http-client-openssl ==0.2.0.5
- - http-client-tls ==0.3.4.2
+ - http-client-tls ==0.3.5
- http-common ==0.8.2.0
- http-conduit ==2.2.3.1
- http-date ==0.0.6.1
@@ -1465,7 +1465,7 @@ default-package-overrides:
- netwire ==5.0.2
- netwire-input ==0.0.6
- netwire-input-glfw ==0.0.6
- - network ==2.6.3.1
+ - network ==2.6.3.2
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
- network-attoparsec ==0.12.2
@@ -1599,7 +1599,7 @@ default-package-overrides:
- pipes-category ==0.2.0.1
- pipes-concurrency ==2.0.7
- pipes-csv ==1.4.3
- - pipes-extras ==1.0.9
+ - pipes-extras ==1.0.10
- pipes-fluid ==0.5.0.3
- pipes-group ==1.0.6
- pipes-misc ==0.2.5.0
@@ -1747,7 +1747,7 @@ default-package-overrides:
- reform-happstack ==0.2.5.1
- reform-hsp ==0.2.7.1
- RefSerialize ==0.4.0
- - regex ==1.0.0.0
+ - regex ==1.0.1.0
- regex-applicative ==0.3.3
- regex-applicative-text ==0.1.0.1
- regex-base ==0.93.2
@@ -1755,9 +1755,11 @@ default-package-overrides:
- regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.94.4
- regex-pcre-builtin ==0.94.4.8.8.35
+ - regex-pcre-text ==0.94.0.1
- regex-posix ==0.95.2
- regex-tdfa ==1.2.2
- regex-tdfa-text ==1.0.0.3
+ - regex-with-pcre ==1.0.1.0
- reinterpret-cast ==0.1.0
- relational-query ==0.8.4.0
- relational-query-HDBC ==0.6.0.3
@@ -1876,7 +1878,7 @@ default-package-overrides:
- shelly ==1.6.8.3
- shortcut-links ==0.4.2.0
- should-not-typecheck ==2.1.0
- - show-prettyprint ==0.1.2
+ - show-prettyprint ==0.1.2.1
- sibe ==0.2.0.5
- signal ==0.1.0.3
- silently ==1.2.5
@@ -1913,6 +1915,7 @@ default-package-overrides:
- socks ==0.5.5
- solga ==0.1.0.2
- solga-swagger ==0.1.0.2
+ - sort ==1.0.0.0
- sorted-list ==0.2.0.0
- sourcemap ==0.1.6
- sparkle ==0.4.0.2
@@ -2014,7 +2017,7 @@ default-package-overrides:
- system-posix-redirect ==1.1.0.1
- syz ==0.2.0.0
- tabular ==0.2.2.7
- - tagchup ==0.4.0.5
+ - tagchup ==0.4.1
- tagged ==0.8.5
- tagged-binary ==0.2.0.0
- tagged-identity ==0.1.2
@@ -2024,7 +2027,7 @@ default-package-overrides:
- tagsoup ==0.14.1
- tagstream-conduit ==0.5.5.3
- tar ==0.5.0.3
- - tar-conduit ==0.1.0
+ - tar-conduit ==0.1.1
- tardis ==0.4.1.0
- tasty ==0.11.2.1
- tasty-ant-xml ==1.0.5
@@ -2061,7 +2064,7 @@ default-package-overrides:
- terminal-progress-bar ==0.1.1
- terminal-size ==0.3.2.1
- terminfo ==0.4.1.0
- - test-fixture ==0.5.0.0
+ - test-fixture ==0.5.0.1
- test-framework ==0.8.1.1
- test-framework-hunit ==0.3.0.2
- test-framework-quickcheck2 ==0.3.0.3
@@ -2146,7 +2149,7 @@ default-package-overrides:
- tuple ==0.3.0.2
- tuple-th ==0.2.5
- tuples-homogenous-h98 ==0.1.1.0
- - turtle ==1.3.4
+ - turtle ==1.3.5
- turtle-options ==0.1.0.4
- twitter-feed ==0.2.0.11
- twitter-types ==0.7.2.2
@@ -2205,7 +2208,7 @@ default-package-overrides:
- unlit ==0.4.0.0
- unordered-containers ==0.2.8.0
- unsafe ==0.0
- - uri-bytestring ==0.2.3.1
+ - uri-bytestring ==0.2.3.2
- uri-encode ==1.5.0.5
- uri-templater ==0.2.1.0
- url ==2.1.3
@@ -2216,7 +2219,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - utility-ht ==0.0.13
+ - utility-ht ==0.0.14
- uu-interleaved ==0.2.0.0
- uu-parsinglib ==2.9.1.1
- uuid ==1.3.13
@@ -2240,7 +2243,7 @@ default-package-overrides:
- vector-th-unbox ==0.2.1.6
- vectortiles ==1.2.0.5
- verbosity ==0.2.3.0
- - versions ==3.0.2
+ - versions ==3.0.2.1
- vhd ==0.2.2
- ViennaRNAParser ==1.3.2
- viewprof ==0.0.0.1
@@ -2350,7 +2353,7 @@ default-package-overrides:
- xlsx ==0.4.3
- xlsx-tabular ==0.2.2
- xml ==1.3.14
- - xml-basic ==0.1.1.3
+ - xml-basic ==0.1.2
- xml-conduit ==1.4.0.4
- xml-conduit-parse ==0.3.1.0
- xml-conduit-writer ==0.1.1.1
@@ -2511,34 +2514,34 @@ package-maintainers:
dont-distribute-packages:
# hard restrictions that really belong into meta.platforms
- alsa-mixer: [ i686-linux, x86_64-linux ]
- alsa-pcm: [ i686-linux, x86_64-linux ]
- alsa-seq: [ i686-linux, x86_64-linux ]
+ alsa-mixer: [ x86_64-darwin ]
+ alsa-pcm: [ x86_64-darwin ]
+ alsa-seq: [ x86_64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ]
- bindings-directfb: [ i686-linux, x86_64-linux ]
+ bindings-directfb: [ x86_64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ]
- freenect: [ i686-linux, x86_64-linux ]
- FTGL: [ i686-linux, x86_64-linux ]
- gi-ostree: [ i686-linux, x86_64-linux ]
- hcwiid: [ i686-linux, x86_64-linux ]
- hfsevents: [ i686-linux, x86_64-linux ]
- HFuse: [ i686-linux, x86_64-linux ]
+ freenect: [ x86_64-darwin ]
+ FTGL: [ x86_64-darwin ]
+ gi-ostree: [ x86_64-darwin ]
+ hcwiid: [ x86_64-darwin ]
+ hfsevents: [ x86_64-darwin ]
+ HFuse: [ x86_64-darwin ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ]
- lio-fs: [ i686-linux, x86_64-linux ]
- midi-alsa: [ i686-linux, x86_64-linux ]
- pam: [ i686-linux, x86_64-linux ]
- PortMidi: [ i686-linux, x86_64-linux ]
- Raincat: [ i686-linux, x86_64-linux ]
+ lio-fs: [ x86_64-darwin ]
+ midi-alsa: [ x86_64-darwin ]
+ pam: [ x86_64-darwin ]
+ PortMidi: [ x86_64-darwin ]
+ Raincat: [ x86_64-darwin ]
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ]
- rtlsdr: [ i686-linux, x86_64-linux ]
- rubberband: [ i686-linux, x86_64-linux ]
- sdl2-mixer: [ i686-linux, x86_64-linux ]
- sdl2-ttf: [ i686-linux, x86_64-linux ]
- tokyotyrant-haskell: [ i686-linux, x86_64-linux ]
+ rtlsdr: [ x86_64-darwin ]
+ rubberband: [ x86_64-darwin ]
+ sdl2-mixer: [ x86_64-darwin ]
+ sdl2-ttf: [ x86_64-darwin ]
+ tokyotyrant-haskell: [ x86_64-darwin ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2549,9 +2552,9 @@ dont-distribute-packages:
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ]
- xattr: [ i686-linux, x86_64-linux ]
+ xattr: [ x86_64-darwin ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin ]
- xmobar: [ i686-linux, x86_64-linux ]
+ xmobar: [ x86_64-darwin ]
# Depens on shine, which is a ghcjs project.
shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2693,7 +2696,6 @@ dont-distribute-packages:
al: [ i686-linux, x86_64-linux, x86_64-darwin ]
AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ]
align-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
- Allure: [ i686-linux, x86_64-linux, x86_64-darwin ]
alms: [ i686-linux, x86_64-linux, x86_64-darwin ]
alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ]
alpha: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5905,7 +5907,6 @@ dont-distribute-packages:
lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ]
- LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ]
LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ]
Lambdajudge: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8e7d19e089fd..6b5812cd07f5 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -12,17 +12,19 @@ let
haskellPackages = makePackageSet {
package-set = initialPackages;
- inherit ghc;
+ inherit ghc extensible-self;
};
commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
-in
-
- makeExtensible
+ extensible-self = makeExtensible
(extends overrides
(extends packageSetConfig
(extends compilerConfig
(extends commonConfiguration
- (extends nixConfiguration haskellPackages)))))
+ (extends nixConfiguration haskellPackages)))));
+
+in
+
+ extensible-self
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7d21996fe1cd..9516aca53663 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,8 +34,7 @@
, license
, maintainers ? []
, doCoverage ? false
-# TODO Do we care about haddock when cross-compiling?
-, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
+, doHaddock ? (!ghc.isHaLVM or true)
, passthru ? {}
, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 093dc45ddd8f..057df5adf584 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -860,7 +860,6 @@ self: {
homepage = "http://allureofthestars.com";
description = "Near-future Sci-Fi roguelike and tactical squad game";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"AndroidViewHierarchyImporter" = callPackage
@@ -1377,8 +1376,8 @@ self: {
}:
mkDerivation {
pname = "BioHMM";
- version = "1.1.6";
- sha256 = "0id4lnxff5a774yzhwfhj0gxk5qxgxa8z8igv1z4n7s981lc2xxm";
+ version = "1.2.0";
+ sha256 = "1mrk5w10601gvfghmmrkmxvnr5jcwnlnk05q1bfb8akiyc2d4pbh";
libraryHaskellDepends = [
base colour diagrams-cairo diagrams-lib directory either-unwrap
filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -5048,7 +5047,7 @@ self: {
librarySystemDepends = [ ftgl ];
description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) ftgl;};
"FTGL-bytestring" = callPackage
@@ -7175,8 +7174,8 @@ self: {
}:
mkDerivation {
pname = "HFitUI";
- version = "0.1.0.0";
- sha256 = "0g3isg6cacwkx0xmwnxpck7j1z58pykdzq9lqgzl4279an4j7vwx";
+ version = "0.1.1.0";
+ sha256 = "03v03adcqyf0ppbhx8jxmp1f4pzmqs5s43as21add2yl13rkwzm7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -7220,7 +7219,7 @@ self: {
homepage = "https://github.com/m15k/hfuse";
description = "HFuse is a binding for the Linux FUSE library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) fuse;};
"HGE2D" = callPackage
@@ -8675,8 +8674,8 @@ self: {
pname = "HaRe";
version = "0.8.4.0";
sha256 = "1yqm2vwai3ss5r4brfgmx90kqifwvy5m8jrldb49b88aix3p4ckk";
- revision = "1";
- editedCabalFile = "0l303mkjls5m3dx0g3wlwdc97pi6av2xlpabq21mmamgb5whasx2";
+ revision = "2";
+ editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -9749,6 +9748,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) openssl;};
+ "HsOpenSSL_0_11_4_9" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+ , openssl, time
+ }:
+ mkDerivation {
+ pname = "HsOpenSSL";
+ version = "0.11.4.9";
+ sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ base bytestring integer-gmp network time
+ ];
+ librarySystemDepends = [ openssl ];
+ testHaskellDepends = [ base bytestring ];
+ homepage = "https://github.com/vshabanov/HsOpenSSL";
+ description = "Partial OpenSSL binding for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) openssl;};
+
"HsOpenSSL-x509-system" = callPackage
({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
mkDerivation {
@@ -10949,7 +10968,6 @@ self: {
homepage = "https://lambdahack.github.io";
description = "A game engine library for roguelike dungeon crawlers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"LambdaINet" = callPackage
@@ -14138,7 +14156,7 @@ self: {
homepage = "http://github.com/ninegua/PortMidi";
description = "A binding for PortMedia/PortMidi";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) alsaLib;};
"PostgreSQL" = callPackage
@@ -14884,6 +14902,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "RSA_2_3_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, crypto-api
+ , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged
+ , test-framework, test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "RSA";
+ version = "2.3.0";
+ sha256 = "0csk933gb2ayijxx6ar110lmsbvgyn7p5bqln3g2qbfxz73nvrzf";
+ libraryHaskellDepends = [
+ base binary bytestring crypto-api crypto-pubkey-types SHA
+ ];
+ testHaskellDepends = [
+ base binary bytestring crypto-api crypto-pubkey-types DRBG
+ QuickCheck SHA tagged test-framework test-framework-quickcheck2
+ ];
+ description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Raincat" = callPackage
({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl
, OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time
@@ -14901,7 +14940,7 @@ self: {
homepage = "http://raincat.bysusanlin.com/";
description = "A puzzle game written in Haskell with a cat in lead role";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {};
"Random123" = callPackage
@@ -17205,8 +17244,8 @@ self: {
pname = "TestExplode";
version = "0.1.0.0";
sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
- revision = "3";
- editedCabalFile = "0158f7h9panmpsymc8bwaflbd23zc2d0ndb0pdarqglh06x8wa4c";
+ revision = "4";
+ editedCabalFile = "04qpbdcpfayghrc4hgy9bacg3s5cqfhjgmbmdba00wmqlja0yz8d";
libraryHaskellDepends = [
base containers directory fgl graphviz interpolatedstring-perl6 mtl
process text
@@ -20731,6 +20770,8 @@ self: {
pname = "adler32";
version = "0.1.1.0";
sha256 = "1v18d4xfbgqflx957xy6wiv7zhkgimpy85fy49d91p2ifkmbk32p";
+ revision = "1";
+ editedCabalFile = "087fykdlay78g9zg1w6a36xwd4pizcyi5wqzvj7cw5sh6gq493km";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ zlib ];
testHaskellDepends = [ base bytestring hspec ];
@@ -21033,6 +21074,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "aeson-compat_0_3_7" = callPackage
+ ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
+ , base-compat, base-orphans, bytestring, containers, exceptions
+ , hashable, nats, QuickCheck, quickcheck-instances, scientific
+ , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+ , time, time-locale-compat, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson-compat";
+ version = "0.3.7";
+ sha256 = "053wa7j82pymr633vakpdandrddg083zcmv76g9sbawcsfiw5whv";
+ libraryHaskellDepends = [
+ aeson attoparsec attoparsec-iso8601 base base-compat bytestring
+ containers exceptions hashable nats scientific semigroups tagged
+ text time time-locale-compat unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base base-compat base-orphans bytestring
+ containers exceptions hashable nats QuickCheck quickcheck-instances
+ scientific semigroups tagged tasty tasty-hunit tasty-quickcheck
+ text time time-locale-compat unordered-containers vector
+ ];
+ homepage = "https://github.com/phadej/aeson-compat#readme";
+ description = "Compatibility layer for aeson";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-diff" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, doctest
, edit-distance-vector, filepath, Glob, hashable, hlint, mtl
@@ -21645,8 +21714,10 @@ self: {
}:
mkDerivation {
pname = "agda-snippets";
- version = "2.5.1";
- sha256 = "1mjn415halclsqph57s2a577w52d79jmwqcnmzvfdy3x0zzdbllx";
+ version = "2.5.2";
+ sha256 = "1bfjbxgmy0nxfjcsqqp4snshmx3ka7rjij4pdw46ax6jlsap2w1f";
+ revision = "1";
+ editedCabalFile = "1lyagh0psry89lh7j8r7gq9ar1a4zgs75mdfrm40wym9h3hcwm1d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -21665,8 +21736,8 @@ self: {
}:
mkDerivation {
pname = "agda-snippets-hakyll";
- version = "0.1.2.1";
- sha256 = "1kxnsciaqrv58vl6335fcn3gf5a98r85q9f83knsxl62nxr2x6wz";
+ version = "0.1.2.2";
+ sha256 = "1bwia22d78wjm33vhsxrx5jchcjvqwl95d1ikkhm9dhraba38z1h";
libraryHaskellDepends = [
agda-snippets base directory filepath hakyll network-uri pandoc
pandoc-types
@@ -22094,6 +22165,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "alerta" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, containers
+ , data-default, http-api-data, http-client, servant, servant-client
+ , servant-server, text, time
+ }:
+ mkDerivation {
+ pname = "alerta";
+ version = "0.1.0.3";
+ sha256 = "0phw1l11v1dhim7njc5rrxlkacmk5wwm2vw9jcvkyh2j1bz5gx5g";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base containers data-default http-api-data
+ http-client servant servant-client servant-server text time
+ ];
+ homepage = "https://github.com/mjhopkins/alerta-client";
+ description = "Bindings to the alerta REST API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"alex" = callPackage
({ mkDerivation, array, base, Cabal, containers, directory
, filepath, happy, process, QuickCheck
@@ -22590,7 +22679,7 @@ self: {
homepage = "https://github.com/ttuegel/alsa-mixer";
description = "Bindings to the ALSA simple mixer API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) alsaLib;};
"alsa-pcm" = callPackage
@@ -22611,7 +22700,7 @@ self: {
homepage = "http://www.haskell.org/haskellwiki/ALSA";
description = "Binding to the ALSA Library API (PCM audio)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) alsaLib;};
"alsa-pcm-tests" = callPackage
@@ -22647,7 +22736,7 @@ self: {
homepage = "http://www.haskell.org/haskellwiki/ALSA";
description = "Binding to the ALSA Library API (MIDI sequencer)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) alsaLib;};
"alsa-seq-tests" = callPackage
@@ -24141,7 +24230,7 @@ self: {
hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
}) {};
- "amazonka-s3-streaming_0_2_0_2" = callPackage
+ "amazonka-s3-streaming_0_2_0_3" = callPackage
({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
, bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
, http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
@@ -24149,8 +24238,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-s3-streaming";
- version = "0.2.0.2";
- sha256 = "0bhr141kjwrrk0cd6052np1q0y6jw2yd1wxrpgkrk41wl26makrr";
+ version = "0.2.0.3";
+ sha256 = "1pndy65mk3kjl51jr75k1dk182wsbzfd2q9zsvcxpalfs0nsaf30";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -25027,8 +25116,8 @@ self: {
pname = "ansi-pretty";
version = "0.1.2.1";
sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
- revision = "2";
- editedCabalFile = "0rds13k27ycmm3vcg503fc32ddwdn078hxlb2fa274sxc3wd443x";
+ revision = "3";
+ editedCabalFile = "046w5nybk8fyhicw5wy7qchbx9k4sib189afj2gysrsblj0ki864";
libraryHaskellDepends = [
aeson ansi-wl-pprint array base bytestring containers generics-sop
nats scientific semigroups tagged text time unordered-containers
@@ -25040,20 +25129,6 @@ self: {
}) {};
"ansi-terminal" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "ansi-terminal";
- version = "0.6.3";
- sha256 = "1m9s5h8cj5gh23ybkl1kim3slmlprmk3clrbrnnb078afamlwg6s";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base ];
- homepage = "https://github.com/feuerbach/ansi-terminal";
- description = "Simple ANSI terminal support, with Windows compatibility";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "ansi-terminal_0_6_3_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "ansi-terminal";
@@ -25065,7 +25140,6 @@ self: {
homepage = "https://github.com/feuerbach/ansi-terminal";
description = "Simple ANSI terminal support, with Windows compatibility";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ansi-wl-pprint" = callPackage
@@ -27655,8 +27729,8 @@ self: {
}:
mkDerivation {
pname = "atom-basic";
- version = "0.2.4";
- sha256 = "1sr9slv3gdjab9ipzwn3iksp733np6r5r0c6cn74mzvqgdsvjzxk";
+ version = "0.2.5";
+ sha256 = "1vkm5wfsgprs42qjzxchgrpxj3xalpg2zd79n9isvlxsp1krdgi4";
libraryHaskellDepends = [
base base64-bytestring bytestring network network-uri text time
];
@@ -28137,6 +28211,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "attoparsec-uri" = callPackage
+ ({ mkDerivation, attoparsec, base, bytedump, n-tuple, strict, text
+ , vector
+ }:
+ mkDerivation {
+ pname = "attoparsec-uri";
+ version = "0.0.1";
+ sha256 = "0bjfk1ljm16kzb3415973w5z3zhjbb2yyphwr6v3givszgwryq6g";
+ libraryHaskellDepends = [
+ attoparsec base bytedump n-tuple strict text vector
+ ];
+ homepage = "https://github.com/athanclark/attoparsec-uri#readme";
+ description = "URI parser / printer using attoparsec";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"attosplit" = callPackage
({ mkDerivation, attoparsec, base, bytestring }:
mkDerivation {
@@ -28342,6 +28432,8 @@ self: {
pname = "authenticate-oauth";
version = "1.6";
sha256 = "0xc37yql79r9idjfdhzg85syrwwgaxggcv86myi6zq2pzl89yvfj";
+ revision = "1";
+ editedCabalFile = "1fxwn8bn6qs8dhxq0q04psq7zp1qvw1b6g3vmsclgyj9p7kr77ms";
libraryHaskellDepends = [
base base64-bytestring blaze-builder bytestring crypto-pubkey-types
data-default http-client http-types random RSA SHA time
@@ -30061,10 +30153,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "base-feature-macros";
- version = "0.1";
- sha256 = "1arr3mb5axmy4aq8h1706hq62qzxcg9msy31n3smhddy0zia06xy";
- revision = "1";
- editedCabalFile = "1risd4pq9vyvi1xgdx1yb46wwn600ldlsl2qrcw97bkr05c748fr";
+ version = "0.1.0.1";
+ sha256 = "1v4a0jmjjqirfxvwim7gsrn5vj0p6la6fncy6k4v2va0p8xaggmp";
libraryHaskellDepends = [ base ];
doHaddock = false;
description = "Semantic CPP feature macros for base";
@@ -30760,6 +30850,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "beeminder-api" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+ , conduit, containers, data-default-class
+ , data-default-instances-base, http-conduit, http-types, lens
+ , monad-control, mtl, resourcet, scientific, text, time
+ , transformers, transformers-base, universe, universe-base
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "beeminder-api";
+ version = "1.0";
+ sha256 = "0yvk51s7pajndzh3sy6jsq1yg2myvn7i211b0g50n1afh96mf84j";
+ libraryHaskellDepends = [
+ aeson attoparsec base blaze-builder bytestring conduit containers
+ data-default-class data-default-instances-base http-conduit
+ http-types lens monad-control mtl resourcet scientific text time
+ transformers transformers-base universe universe-base
+ unordered-containers vector
+ ];
+ description = "Bindings to the beeminder.com JSON API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bein" = callPackage
({ mkDerivation, base, bytestring, containers, convertible, Crypto
, directory, filepath, happstack-server, happstack-util, hdaemonize
@@ -32168,7 +32281,7 @@ self: {
libraryPkgconfigDepends = [ directfb ];
description = "Low level bindings to DirectFB";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) directfb;};
"bindings-eskit" = callPackage
@@ -32614,7 +32727,7 @@ self: {
description = "FFI bindings to libsane";
license = stdenv.lib.licenses.lgpl3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {saneBackends = null;};
+ }) {inherit (pkgs) saneBackends;};
"bindings-sc3" = callPackage
({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -40867,12 +40980,27 @@ self: {
pname = "choice";
version = "0.2.0";
sha256 = "0bppl551b384c28fqzww73lddzhfdgs10qcf2wd8xk2awna0i9w9";
+ revision = "1";
+ editedCabalFile = "1bv77nhabm33jfaqhpl77jdcbfl7zxz4daphsmqb0pi6z85man7p";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/mboes/choice#readme";
description = "A solution to boolean blindness";
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "choice_0_2_1" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "choice";
+ version = "0.2.1";
+ sha256 = "163p6ji6gsr0lgxvldnz0rmcbckfk75wpq0xn1n41fbhxzchr2gi";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/mboes/choice#readme";
+ description = "A solution to boolean blindness";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"choose" = callPackage
({ mkDerivation, base, MonadRandom }:
mkDerivation {
@@ -42757,14 +42885,14 @@ self: {
}:
mkDerivation {
pname = "cloudi";
- version = "1.7.0";
- sha256 = "0j46jzrvdfxmy1hbb6p9bmf1jhws9s3463dlyrjz86cszv075lv6";
+ version = "1.7.1";
+ sha256 = "12kk359wfkwsc62bb6f0ak5gzkwdw4gmcfmj9ryqrjcc2irlnbk1";
libraryHaskellDepends = [
array base binary bytestring containers network time unix zlib
];
homepage = "https://github.com/CloudI/cloudi_api_haskell";
description = "Haskell CloudI API";
- license = stdenv.lib.licenses.bsdOriginal;
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -45066,25 +45194,25 @@ self: {
}) {};
"concrete-haskell" = callPackage
- ({ mkDerivation, base, bytestring, containers, directory, filepath
- , hashable, megaparsec, mtl, optparse-applicative, process
- , QuickCheck, tar, text, thrift, time, unordered-containers, uuid
- , vector, zlib
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , directory, filepath, hashable, megaparsec, mtl
+ , optparse-applicative, process, QuickCheck, scientific, tar, text
+ , thrift, time, unordered-containers, uuid, vector, zlib
}:
mkDerivation {
pname = "concrete-haskell";
- version = "0.1.0.6";
- sha256 = "12faqwdsc1zy18qnqdl5chysib65q749n9cfaai9j759n32l6xia";
+ version = "0.1.0.7";
+ sha256 = "1v076bi2fk6a5sm4bjrxlah8hglbgbr2gcbsh3017h2hkkhl8gdv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring containers directory filepath hashable process
- QuickCheck tar text thrift time unordered-containers uuid vector
- zlib
+ attoparsec base bytestring containers directory filepath hashable
+ megaparsec mtl process QuickCheck scientific tar text thrift time
+ unordered-containers uuid vector zlib
];
executableHaskellDepends = [
- base bytestring containers directory filepath megaparsec mtl
- optparse-applicative process text vector zlib
+ base bytestring containers directory filepath optparse-applicative
+ process text vector zlib
];
homepage = "https://github.com/hltcoe";
description = "Library for the Concrete data format";
@@ -45149,14 +45277,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "concurrency_1_1_2_0" = callPackage
+ "concurrency_1_1_2_1" = callPackage
({ mkDerivation, array, atomic-primops, base, exceptions
, monad-control, mtl, stm, transformers
}:
mkDerivation {
pname = "concurrency";
- version = "1.1.2.0";
- sha256 = "0k3vyfyq8jlsh0rf3rn4arl1qlcwz7bzxazwaggzxlyhv89vycqx";
+ version = "1.1.2.1";
+ sha256 = "0gadbm9z9qbm208md5f811hz9f2ljw0z9dyldpgklqvic1n8w5xi";
libraryHaskellDepends = [
array atomic-primops base exceptions monad-control mtl stm
transformers
@@ -45490,6 +45618,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit_1_2_11" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq, exceptions
+ , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
+ , mwc-random, primitive, QuickCheck, resourcet, safe, split
+ , transformers, transformers-base, vector
+ }:
+ mkDerivation {
+ pname = "conduit";
+ version = "1.2.11";
+ sha256 = "1xx8vj2azbzr2skcrpcy02hgnik01i6hcx01h0mjd4fr0hzl4rhb";
+ libraryHaskellDepends = [
+ base exceptions lifted-base mmorph monad-control mtl primitive
+ resourcet transformers transformers-base
+ ];
+ testHaskellDepends = [
+ base containers exceptions hspec mtl QuickCheck resourcet safe
+ split transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq hspec kan-extensions mwc-random
+ transformers vector
+ ];
+ homepage = "http://github.com/snoyberg/conduit";
+ description = "Streaming data processing library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conduit-audio" = callPackage
({ mkDerivation, base, conduit, vector }:
mkDerivation {
@@ -45894,8 +46050,8 @@ self: {
}:
mkDerivation {
pname = "config-schema";
- version = "0.4.1.0";
- sha256 = "03ikwswgjc1in7qln15ssh1bxm8x1ycz4g0lhma7dcqhaq1ml7xs";
+ version = "0.5.0.0";
+ sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli";
libraryHaskellDepends = [
base config-value containers free kan-extensions pretty
semigroupoids text transformers
@@ -46232,6 +46388,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "console-prompt" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "console-prompt";
+ version = "0.1";
+ sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/jlamothe/console-prompt";
+ description = "console user prompts";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
"console-style" = callPackage
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
@@ -50341,8 +50509,8 @@ self: {
}:
mkDerivation {
pname = "d-bus";
- version = "0.1.6";
- sha256 = "0qrvpjl7hj6npq1h96c0fsakv2yrsqm3qr76l193vnkyd4i3s8hn";
+ version = "0.1.7";
+ sha256 = "00bd001hxh68cwrv2597qg8rpcdz0n96nn31qkqgyhbc4lni72af";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -52006,6 +52174,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "data-msgpack_0_0_10" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, criterion
+ , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
+ , text, unordered-containers, vector, void
+ }:
+ mkDerivation {
+ pname = "data-msgpack";
+ version = "0.0.10";
+ sha256 = "0vpv4l6phsa9b3l0wxk798w9kzkc454v2kk554rcmz94wq3k6n61";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring containers data-binary-ieee754 deepseq
+ hashable QuickCheck text unordered-containers vector void
+ ];
+ executableHaskellDepends = [ base bytestring groom ];
+ testHaskellDepends = [
+ base bytestring containers hashable hspec QuickCheck text
+ unordered-containers vector void
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq QuickCheck
+ ];
+ homepage = "http://msgpack.org/";
+ description = "A Haskell implementation of MessagePack";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-msgpack-types" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, hashable
, QuickCheck, text, unordered-containers, vector, void
@@ -54069,18 +54266,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "dejafu_0_6_0_0" = callPackage
+ "dejafu_0_7_0_1" = callPackage
({ mkDerivation, base, concurrency, containers, deepseq, exceptions
- , monad-loops, mtl, random, ref-fd, semigroups, transformers
- , transformers-base
+ , leancheck, monad-loops, mtl, random, ref-fd, semigroups
+ , transformers, transformers-base
}:
mkDerivation {
pname = "dejafu";
- version = "0.6.0.0";
- sha256 = "07l1i8kfmblyc76qgw1db339b9w8nrgf5h5c38nnr79cbjdz9n60";
+ version = "0.7.0.1";
+ sha256 = "0cdkf5qgcwy4sapvingi0s37s0k9d5v8crskaj5wjy1pwl9vs8kq";
libraryHaskellDepends = [
- base concurrency containers deepseq exceptions monad-loops mtl
- random ref-fd semigroups transformers transformers-base
+ base concurrency containers deepseq exceptions leancheck
+ monad-loops mtl random ref-fd semigroups transformers
+ transformers-base
];
homepage = "https://github.com/barrucadu/dejafu";
description = "Systematic testing for Haskell concurrency";
@@ -55304,6 +55502,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-lib_1_4_1_1" = callPackage
+ ({ mkDerivation, active, adjunctions, array, base, bytestring
+ , cereal, colour, containers, criterion, data-default-class
+ , deepseq, diagrams-core, diagrams-solve, directory, distributive
+ , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
+ , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
+ , numeric-extras, optparse-applicative, process, profunctors
+ , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "diagrams-lib";
+ version = "1.4.1.1";
+ sha256 = "1sgpmxs8n05bl9cq4fmbgwyqra5kr69di2ngwlc2vqf1fpymis9a";
+ libraryHaskellDepends = [
+ active adjunctions array base bytestring cereal colour containers
+ data-default-class diagrams-core diagrams-solve directory
+ distributive dual-tree exceptions filepath fingertree fsnotify
+ hashable intervals JuicyPixels lens linear monoid-extras mtl
+ optparse-applicative process profunctors semigroups tagged text
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base deepseq diagrams-solve distributive lens numeric-extras tasty
+ tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion diagrams-core ];
+ homepage = "http://projects.haskell.org/diagrams";
+ description = "Embedded domain-specific language for declarative graphics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-pandoc" = callPackage
({ mkDerivation, base, diagrams-builder, diagrams-cairo
, diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -60966,6 +61197,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "elm-bridge_0_4_1" = callPackage
+ ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "elm-bridge";
+ version = "0.4.1";
+ sha256 = "1wp813l6bdw5x7vpiq098v1gbxzvv3129n2rl4div9mrj53a3i2l";
+ revision = "1";
+ editedCabalFile = "05kk6lsh10ligdgj4dw0iyhvv0blnrcvmk94hn27qq70bpv8xcqz";
+ libraryHaskellDepends = [ aeson base template-haskell ];
+ testHaskellDepends = [
+ aeson base containers hspec QuickCheck text
+ ];
+ homepage = "https://github.com/agrafix/elm-bridge";
+ description = "Derive Elm types and Json code from Haskell types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"elm-build-lib" = callPackage
({ mkDerivation, base, bytestring, containers, elm-compiler
, elm-core-sources, file-embed, template-haskell
@@ -62940,7 +63191,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ether_0_5_0_0" = callPackage
+ "ether_0_5_1_0" = callPackage
({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim
, lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged
, tasty, tasty-quickcheck, template-haskell, transformers
@@ -62948,10 +63199,8 @@ self: {
}:
mkDerivation {
pname = "ether";
- version = "0.5.0.0";
- sha256 = "0ypji3blmdha1lcsw09985hbqys793kj4c2m0vlnpr3xd4ypvqnf";
- revision = "1";
- editedCabalFile = "0l3bsf1l2kkni9rsdl45wb8w9jlfpg24mxmsqia00k2lbry573m5";
+ version = "0.5.1.0";
+ sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n";
libraryHaskellDepends = [
base exceptions mmorph monad-control mtl reflection tagged
template-haskell transformers transformers-base transformers-lift
@@ -64276,8 +64525,8 @@ self: {
({ mkDerivation, base, deepseq, transformers }:
mkDerivation {
pname = "explicit-exception";
- version = "0.1.8";
- sha256 = "0vyi9k0rx083qs3yizcm89pvp38823akbrkr43w3ng6vh4vpmvkz";
+ version = "0.1.9";
+ sha256 = "1kxx42kzm3r0mji7756yblpr7ys3lhx937jixgm8q1zsyg36m2hz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base deepseq transformers ];
@@ -65262,8 +65511,8 @@ self: {
pname = "fay";
version = "0.23.1.16";
sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4";
- revision = "6";
- editedCabalFile = "1zss528kggb1072lv68zh13l8a2n1bmrv6ga7dhmchnd6faz9411";
+ revision = "7";
+ editedCabalFile = "07iqrpg2hga3n8m08aq2zizvq27v8hyqzvx5sfz497whjxr9h358";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -65557,8 +65806,8 @@ self: {
pname = "fclabels";
version = "2.0.3.2";
sha256 = "1c42f420bih3azhis9hhcdk6ijm10wp9rqa2kh763g68qgzq6pad";
- revision = "2";
- editedCabalFile = "0fjxcs8c5b01mz9h5jfihvnxdh486mjxqr7fpzz53r1zxh880gcr";
+ revision = "3";
+ editedCabalFile = "19gd2jwjpfrmq80gpjk05djhn42vvj88fgka5yr7yaq6mfx103by";
libraryHaskellDepends = [ base mtl template-haskell transformers ];
testHaskellDepends = [
base HUnit mtl template-haskell transformers
@@ -68251,31 +68500,6 @@ self: {
}) {};
"foldl-statistics" = callPackage
- ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
- , profunctors, quickcheck-instances, semigroups, statistics, tasty
- , tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "foldl-statistics";
- version = "0.1.4.3";
- sha256 = "0f8gkdy3zwkj7cqmydgll3r18f104n5bpryd6fsr2hqn9cdmf463";
- libraryHaskellDepends = [
- base foldl math-functions profunctors semigroups
- ];
- testHaskellDepends = [
- base foldl profunctors quickcheck-instances semigroups statistics
- tasty tasty-quickcheck vector
- ];
- benchmarkHaskellDepends = [
- base criterion foldl mwc-random statistics vector
- ];
- homepage = "http://github.com/Data61/foldl-statistics#readme";
- description = "Statistical functions from the statistics package implemented as Folds";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
- }) {};
-
- "foldl-statistics_0_1_4_4" = callPackage
({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
, profunctors, quickcheck-instances, semigroups, statistics, tasty
, tasty-quickcheck, vector
@@ -68297,7 +68521,7 @@ self: {
homepage = "http://github.com/Data61/foldl-statistics#readme";
description = "Statistical functions from the statistics package implemented as Folds";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
+ hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
}) {};
"foldl-transduce" = callPackage
@@ -69025,12 +69249,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "foundation_0_0_10" = callPackage
+ ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
+ , tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "foundation";
+ version = "0.0.10";
+ sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p";
+ libraryHaskellDepends = [ base ghc-prim ];
+ testHaskellDepends = [
+ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ homepage = "https://github.com/haskell-foundation/foundation";
+ description = "Alternative prelude with batteries and no dependencies";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"foundation-edge" = callPackage
({ mkDerivation, bytestring, foundation, text }:
mkDerivation {
pname = "foundation-edge";
version = "0.0.2";
sha256 = "1ddcw4a8gmlcb6pgy2sysp6inpm19i7j1cg9ix3z5fwkpxg2kr71";
+ revision = "1";
+ editedCabalFile = "01w5bjjavfq76s43c2f0wbna6rn6yilivsq7s8ws5i1kqav9yffx";
libraryHaskellDepends = [ bytestring foundation text ];
homepage = "https://github.com/haskell-foundation/foundation-edge";
description = "foundation's edge with the conventional set of packages";
@@ -69590,7 +69835,7 @@ self: {
homepage = "https://github.com/chrisdone/freenect";
description = "Interface to the Kinect device";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) freenect; freenect_sync = null;
libfreenect = null;};
@@ -71673,8 +71918,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "generic-records";
- version = "0.1.0.0";
- sha256 = "0m14fb687crwg6bsfrharcgqqxk60h7yzg9rgjvl0xjk5w6b0dri";
+ version = "0.2.0.0";
+ sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/kcsongor/generic-records";
description = "Magic record operations using generics";
@@ -73648,8 +73893,8 @@ self: {
({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
mkDerivation {
pname = "ghcjs-dom";
- version = "0.8.0.0";
- sha256 = "0sh20vnh9yfaafdy9w24j9izj39lmf4bnc7cxjdxngwc1kp51x38";
+ version = "0.9.0.0";
+ sha256 = "0z55qfvnyq5z22ynmnrxdymq6jgcs7ps04bznqna4fbcvlqy0zm9";
libraryHaskellDepends = [
base ghcjs-dom-jsaddle text transformers
];
@@ -73683,8 +73928,8 @@ self: {
({ mkDerivation, jsaddle-dom }:
mkDerivation {
pname = "ghcjs-dom-jsaddle";
- version = "0.8.0.0";
- sha256 = "0k3pb1chrip60yymdj80wb10kj0dh8hgp85qyn58q37fnb53w04a";
+ version = "0.9.0.0";
+ sha256 = "0ghk8nvfhwm5zwwiws2621gk08x73w11v0cab5nsdpyz1qn0dl5j";
libraryHaskellDepends = [ jsaddle-dom ];
doHaddock = false;
description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -73696,8 +73941,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "ghcjs-dom-jsffi";
- version = "0.8.0.0";
- sha256 = "1qpkgv67nkmnhd9zwfb5cynsnk0wlrgrqzgdlq8i9q2c16pwh7sw";
+ version = "0.9.0.0";
+ sha256 = "1q04gibg5jlqs287vwig43bxyi9gpy951mfpmv17qky8b50sxkmc";
description = "DOM library using JSFFI and GHCJS";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -74217,6 +74462,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
+ "gi-gtk_3_0_15" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+ , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+ , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gtk";
+ version = "3.0.15";
+ sha256 = "176hvvrl2w71dy096irazr83v07qd8nixl6gsihn2i9caaxn4scb";
+ setupHaskellDepends = [ base Cabal haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+ gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
+ transformers
+ ];
+ libraryPkgconfigDepends = [ gtk3 ];
+ doHaddock = false;
+ homepage = "https://github.com/haskell-gi/haskell-gi";
+ description = "Gtk bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {gtk3 = pkgs.gnome3.gtk;};
+
"gi-gtk-hs" = callPackage
({ mkDerivation, base, base-compat, containers, gi-gdk
, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -74365,7 +74633,7 @@ self: {
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "OSTree bindings";
license = stdenv.lib.licenses.lgpl21;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) ostree;};
"gi-pango" = callPackage
@@ -74641,26 +74909,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ginger_0_5_1_2" = callPackage
+ "ginger_0_5_1_3" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, filepath
, http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
, tasty-quickcheck, text, time, transformers, unordered-containers
- , utf8-string, vector
+ , utf8-string, vector, wryte
}:
mkDerivation {
pname = "ginger";
- version = "0.5.1.2";
- sha256 = "0xr0r3wwyhksa9b6qg39akd2kqgwdqpc21sn81yj422lw0j79szn";
+ version = "0.5.1.3";
+ sha256 = "06dywl7wi2qy2apc9gwcf5j9mxckyjbjpqddqdqgnj47wbssrmiz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring data-default filepath http-types mtl parsec
safe scientific text time transformers unordered-containers
- utf8-string vector
+ utf8-string vector wryte
];
executableHaskellDepends = [
aeson base bytestring data-default text transformers
- unordered-containers
+ unordered-containers wryte
];
testHaskellDepends = [
aeson base bytestring data-default mtl tasty tasty-hunit
@@ -76170,8 +76438,8 @@ self: {
}:
mkDerivation {
pname = "glirc";
- version = "2.21.1";
- sha256 = "12ivc4pbqq3564q0g0dz2h731r8dnlxkq471vfk03lrhvjyf8sak";
+ version = "2.22";
+ sha256 = "02kfxarddlb7yjj17slvn28pz49m27l7ag06milxjg0k157dxkpi";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -79833,14 +80101,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "google-oauth2-jwt_0_2_1" = callPackage
+ "google-oauth2-jwt_0_2_2" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
, RSA, text, unix-time
}:
mkDerivation {
pname = "google-oauth2-jwt";
- version = "0.2.1";
- sha256 = "0fmqcwvn4rf4l8hzvwhnkfc22akkdbnbv3hw70r4akfplay0nc9g";
+ version = "0.2.2";
+ sha256 = "0alvq0sxmzi1mxc7bahwxydbgmhp8hva0w8p9h6cb1fh2vam5p1q";
libraryHaskellDepends = [
base base64-bytestring bytestring HsOpenSSL RSA text unix-time
];
@@ -84501,6 +84769,50 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) utillinux;};
+ "hakyll_4_9_6_0" = callPackage
+ ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+ , containers, cryptohash, data-default, deepseq, directory
+ , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
+ , network, network-uri, optparse-applicative, pandoc
+ , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
+ , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
+ , tasty, tasty-hunit, tasty-quickcheck, text, time
+ , time-locale-compat, unordered-containers, utillinux, vector, wai
+ , wai-app-static, warp, yaml
+ }:
+ mkDerivation {
+ pname = "hakyll";
+ version = "4.9.6.0";
+ sha256 = "0qkwa8fs5wpqg4gvk19cg5jsjhwyirvwbah1hk7a5b8yfrbsm08c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary blaze-html blaze-markup bytestring containers
+ cryptohash data-default deepseq directory filepath fsnotify
+ http-conduit http-types lrucache mtl network network-uri
+ optparse-applicative pandoc pandoc-citeproc parsec process random
+ regex-base regex-tdfa resourcet scientific system-filepath tagsoup
+ text time time-locale-compat unordered-containers vector wai
+ wai-app-static warp yaml
+ ];
+ executableHaskellDepends = [ base directory filepath ];
+ testHaskellDepends = [
+ base binary blaze-html blaze-markup bytestring containers
+ cryptohash data-default deepseq directory filepath fsnotify
+ http-conduit http-types lrucache mtl network network-uri
+ optparse-applicative pandoc pandoc-citeproc parsec process
+ QuickCheck random regex-base regex-tdfa resourcet scientific
+ system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
+ time time-locale-compat unordered-containers vector wai
+ wai-app-static warp yaml
+ ];
+ testToolDepends = [ utillinux ];
+ homepage = "http://jaspervdj.be/hakyll";
+ description = "A static website compiler library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) utillinux;};
+
"hakyll-R" = callPackage
({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
}:
@@ -86709,8 +87021,8 @@ self: {
pname = "hashabler";
version = "2.0.0";
sha256 = "1wrwjbpvdf4yimcshw396a1crl76mr9wabspz6z3pdwg4d8dfava";
- revision = "1";
- editedCabalFile = "111jik2b8vyp1ap5i1flnxbrrv0nyiba8canwyrilimw5wz0qsn8";
+ revision = "2";
+ editedCabalFile = "0plq6sfzplpg7lc9s2jsnj3l53z1v614h4ni3fvnw4hxj0n4cykv";
libraryHaskellDepends = [
array base bytestring ghc-prim integer-gmp primitive
template-haskell text
@@ -87448,6 +87760,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskell-gettext" = callPackage
+ ({ mkDerivation, base, binary, bytestring, bytestring-trie
+ , containers, filepath, haskell-src-exts, mtl, old-locale, parsec
+ , text, time, transformers, uniplate
+ }:
+ mkDerivation {
+ pname = "haskell-gettext";
+ version = "0.1.1.0";
+ sha256 = "1kfqrm90my0h15f1x6n4fzzf9fvyicg87fqwbal37hj888jb0gv8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring bytestring-trie containers mtl parsec text
+ time transformers
+ ];
+ executableHaskellDepends = [
+ base filepath haskell-src-exts old-locale time uniplate
+ ];
+ description = "GetText runtime library implementation in pure Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haskell-gi" = callPackage
({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
, directory, doctest, filepath, glib, gobjectIntrospection
@@ -87456,8 +87790,8 @@ self: {
}:
mkDerivation {
pname = "haskell-gi";
- version = "0.20.1";
- sha256 = "04ndhi4w88vmc3h4jk95z8i9j83aif99k9c8qwr6nv1q05zxbwbz";
+ version = "0.20.2";
+ sha256 = "1dnavj0qpcljakmb5jnv0hqds8a0zqn5ycn0xq5fls20fmw9j5gh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -87479,8 +87813,8 @@ self: {
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
pname = "haskell-gi-base";
- version = "0.20.2";
- sha256 = "05jr33kvj2iafsp7g5b8z3m33pf7law9q6rjzq969c5cc586pvp7";
+ version = "0.20.3";
+ sha256 = "07ggfmbr9s4c1ql4cyyk64fbig5k2mpc25371zrrj44yc6ai2xz1";
libraryHaskellDepends = [ base bytestring containers text ];
libraryPkgconfigDepends = [ glib ];
homepage = "https://github.com/haskell-gi/haskell-gi-base";
@@ -91192,7 +91526,7 @@ self: {
homepage = "https://github.com/ivanperez-keera/hcwiid";
description = "Library to interface with the wiimote";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {bluetooth = null; inherit (pkgs) cwiid;};
"hdaemonize" = callPackage
@@ -92766,6 +93100,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "heterocephalus_1_0_5_0" = callPackage
+ ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
+ , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "heterocephalus";
+ version = "1.0.5.0";
+ sha256 = "1qhm8vq8dncmqd9mjqghw1b327brjc9ij9pxjbkpk0lppx3pgsnw";
+ libraryHaskellDepends = [
+ base blaze-html blaze-markup containers dlist mtl parsec
+ shakespeare template-haskell text transformers
+ ];
+ testHaskellDepends = [ base doctest Glob ];
+ homepage = "https://github.com/arowM/heterocephalus#readme";
+ description = "A type-safe template engine for working with popular front end development tools";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"heterolist" = callPackage
({ mkDerivation, base, constraint-manip, hspec, indextype, polydata
}:
@@ -93291,6 +93645,7 @@ self: {
description = "File/folder watching for OS X";
license = stdenv.lib.licenses.bsd3;
platforms = [ "x86_64-darwin" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;};
@@ -96186,17 +96541,17 @@ self: {
, conduit-combinators, conduit-extra, containers, criterion
, deepseq, directory, hspec, hspec-attoparsec, hspec-core
, hspec-expectations, ip, optparse-applicative, permute, random
- , resourcet, text, time, word8, yaml
+ , resourcet, text, time, unordered-containers, word8, yaml
}:
mkDerivation {
pname = "hnormalise";
- version = "0.3.2.0";
- sha256 = "1dyin8ffwzwbkljfvs4n1a0h2ria99i81c5qy1dg7bzgw2bnb6xv";
+ version = "0.3.3.0";
+ sha256 = "1rrriy9i6bfh1l6q9iwsc9zfcaif3d3f1vmkzm353gprf7vg8fnk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
- containers directory ip permute text time yaml
+ containers directory ip permute text time unordered-containers yaml
];
executableHaskellDepends = [
aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
@@ -96447,6 +96802,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hoggl" = callPackage
+ ({ mkDerivation, aeson, base, base64-string, either, formatting
+ , hashable, http-client, http-client-tls, mtl, optparse-applicative
+ , servant, servant-client, text, time, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "hoggl";
+ version = "0.2.0.0";
+ sha256 = "0kblkirivnw3ylaifdpa8acy2armxxkl9hbqymg2qfiiwnbgg2wh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base64-string either formatting hashable http-client
+ http-client-tls mtl servant servant-client text time transformers
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ base either http-client http-client-tls optparse-applicative
+ servant-client text time transformers
+ ];
+ description = "Bindings to the Toggl.com REST API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hogre" = callPackage
({ mkDerivation, base, cgen, cgen-hs, grgen, OGRE, OgreMain }:
mkDerivation {
@@ -97238,8 +97618,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-docs";
- version = "0.3.1";
- sha256 = "15lvxsdd2ayd94mr9bxzcxrwkb22yflnby1r5ch8wmyymwvbv55y";
+ version = "0.3.2";
+ sha256 = "04ah438igxykyspzlhpa5y50z1accrb9sxhv2sn8riqfhdz2sych";
libraryHaskellDepends = [
base haskell-src hoppy-generator hoppy-runtime
];
@@ -97255,8 +97635,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-generator";
- version = "0.3.2";
- sha256 = "1sv76yfbp4r2dda17crng7g39wz2fy77jc246w6749hd9s3izx7a";
+ version = "0.3.3";
+ sha256 = "18n48kkf6pcmcwb85a74kqh84aadpm1s9jv1r56b43rya8ra3mgw";
libraryHaskellDepends = [
base containers directory filepath haskell-src mtl
];
@@ -97267,12 +97647,14 @@ self: {
}) {};
"hoppy-runtime" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, Cabal, containers, directory, filepath }:
mkDerivation {
pname = "hoppy-runtime";
- version = "0.3.0";
- sha256 = "1nd9mgzqnak420dcifldq09c7sph7mf8llrsfagphq9aqhw3lij4";
- libraryHaskellDepends = [ base containers ];
+ version = "0.3.1";
+ sha256 = "0cbnhpwy3m0l7gcarg7xr1f5y6nwdnfa269vvza0fm4fhf3lz6g5";
+ libraryHaskellDepends = [
+ base Cabal containers directory filepath
+ ];
homepage = "http://khumba.net/projects/hoppy";
description = "C++ FFI generator - Runtime support";
license = stdenv.lib.licenses.asl20;
@@ -97718,8 +98100,8 @@ self: {
}:
mkDerivation {
pname = "hpack";
- version = "0.17.0";
- sha256 = "0r3lcp217i9nqavymhn02wnyg5qplhayp09aqcj58brh3b58lmyj";
+ version = "0.17.1";
+ sha256 = "0lxpjv5j3bg725n1kqjgpcq3rb3s7zc1w3j5snc92ayk8fxpbd3n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102442,6 +102824,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "htlset" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "htlset";
+ version = "0.1.0.0";
+ sha256 = "18wbw6zfb424xq3m05hjxypiiaqc75nd365y9l8035dvi29mfbnf";
+ libraryHaskellDepends = [ base containers ];
+ homepage = "https://github.com/kelemzol/htlset";
+ description = "Heterogenous Set";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"html" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -102992,29 +103386,6 @@ self: {
}) {};
"http-client-tls" = callPackage
- ({ mkDerivation, base, bytestring, case-insensitive, connection
- , containers, criterion, cryptonite, data-default-class, exceptions
- , hspec, http-client, http-types, memory, network, network-uri
- , text, tls, transformers
- }:
- mkDerivation {
- pname = "http-client-tls";
- version = "0.3.4.2";
- sha256 = "0jzxzncm8i00l2sdayizxj7g98ahp4pi9zr5rh1dhsrw18rq5gz8";
- libraryHaskellDepends = [
- base bytestring case-insensitive connection containers cryptonite
- data-default-class exceptions http-client http-types memory network
- network-uri text tls transformers
- ];
- testHaskellDepends = [ base hspec http-client http-types ];
- benchmarkHaskellDepends = [ base criterion http-client ];
- doCheck = false;
- homepage = "https://github.com/snoyberg/http-client";
- description = "http-client backend using the connection package and tls library";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "http-client-tls_0_3_5" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, connection
, containers, criterion, cryptonite, data-default-class, exceptions
, hspec, http-client, http-types, memory, network, network-uri
@@ -103035,7 +103406,6 @@ self: {
homepage = "https://github.com/snoyberg/http-client";
description = "http-client backend using the connection package and tls library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-common" = callPackage
@@ -104038,12 +104408,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hunit-dejafu_0_5_0_0" = callPackage
+ "hunit-dejafu_0_6_0_0" = callPackage
({ mkDerivation, base, dejafu, exceptions, HUnit }:
mkDerivation {
pname = "hunit-dejafu";
- version = "0.5.0.0";
- sha256 = "05l8sm7r2n17a0dd3xhdcnrf6vaz4mv82im39r0iykh284hjcpnh";
+ version = "0.6.0.0";
+ sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah";
libraryHaskellDepends = [ base dejafu exceptions HUnit ];
homepage = "https://github.com/barrucadu/dejafu";
description = "Deja Fu support for the HUnit test framework";
@@ -108402,6 +108772,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) R;};
+ "inliterate" = callPackage
+ ({ mkDerivation, base, blaze-html, cheapskate, containers
+ , haskell-src-exts, lucid, lucid-extras, plotlyhs, text, time
+ }:
+ mkDerivation {
+ pname = "inliterate";
+ version = "0.1.0";
+ sha256 = "17z3s5w49x8j57v6myz2r6i0knnm60ydg3y8d0v008xrwdjcr5id";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base blaze-html cheapskate containers haskell-src-exts lucid
+ lucid-extras plotlyhs text time
+ ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [ base text ];
+ homepage = "https://github.com/diffusionkinetics/open/inliterate";
+ description = "Interactive literate programming";
+ license = stdenv.lib.licenses.mit;
+ broken = true;
+ }) {lucid-extras = null;};
+
"inquire" = callPackage
({ mkDerivation, aether, base, text }:
mkDerivation {
@@ -109947,8 +110339,8 @@ self: {
}:
mkDerivation {
pname = "irc-core";
- version = "2.2.1";
- sha256 = "1q2j9c2bahdkb4g1sydaz6yyyj98hndyvpxk1q3bf0v20zr7aqpc";
+ version = "2.3.0";
+ sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf";
libraryHaskellDepends = [
attoparsec base base64-bytestring bytestring hashable primitive
text time vector
@@ -111894,8 +112286,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle";
- version = "0.8.3.2";
- sha256 = "0xdgqwmjzx47l8rhxdvlwfzfb04bw5j6mahs02cwjdfb1h11m7m4";
+ version = "0.9.0.0";
+ sha256 = "1g61chx063m8n3yvs4z6awmdksvkr0yp5vwd4ffkhl94yczqh0q8";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring bytestring containers
deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -111906,14 +112298,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jsaddle-clib" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, jsaddle
+ , text
+ }:
+ mkDerivation {
+ pname = "jsaddle-clib";
+ version = "0.9.0.0";
+ sha256 = "10ycmp3pnkh18d8xv44gj392h7xzfmnyl0qkfv0qx0p7pn9vn6zz";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default jsaddle text
+ ];
+ description = "Interface for JavaScript that works with GHCJS and GHC";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"jsaddle-dom" = callPackage
({ mkDerivation, base, base-compat, jsaddle, lens, text
, transformers
}:
mkDerivation {
pname = "jsaddle-dom";
- version = "0.8.0.0";
- sha256 = "0l6n6wsy9bqxdh2gjgkp4wvmxdikjziqi748690vz33gdc5qdgi7";
+ version = "0.9.0.0";
+ sha256 = "0yc5m80n3k3l2m429p5icfwk50c6qdfs5h273rgdr9pjb2if5cmm";
libraryHaskellDepends = [
base base-compat jsaddle lens text transformers
];
@@ -111941,15 +112348,16 @@ self: {
({ mkDerivation, aeson, base, bytestring, containers, deepseq
, doctest, filepath, ghc-prim, http-types, jsaddle, lens, network
, primitive, process, QuickCheck, ref-tf, stm, text, time
- , transformers, wai, wai-websockets, warp, webdriver, websockets
+ , transformers, uuid, uuid-types, wai, wai-websockets, warp
+ , webdriver, websockets
}:
mkDerivation {
pname = "jsaddle-warp";
- version = "0.8.3.1";
- sha256 = "1ylpqyifxinqd23sypxxkqcwigqfcpz8jc8y770qbqy56wjz9nr1";
+ version = "0.9.1.0";
+ sha256 = "0d7q3dr05j81zx13qvl0kxhdmkk9bpka4cc2db8ck4wfnv7nj3yq";
libraryHaskellDepends = [
- aeson base containers http-types jsaddle stm text time transformers
- wai wai-websockets warp websockets
+ aeson base bytestring containers http-types jsaddle stm text time
+ transformers uuid uuid-types wai wai-websockets warp websockets
];
testHaskellDepends = [
aeson base bytestring containers deepseq doctest filepath ghc-prim
@@ -111969,8 +112377,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-webkit2gtk";
- version = "0.8.3.1";
- sha256 = "0kdr69m1j5dvn2pbjkxx52q9jjcrs4ssn1lwqcf8myb1hrj2rjw3";
+ version = "0.9.0.0";
+ sha256 = "1qrrvfr9ha5v43940ppdf3ngrig1s324482aaxsnpj2s7jxmqsa6";
libraryHaskellDepends = [
aeson base bytestring directory gi-gio gi-glib gi-gtk
gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
@@ -111988,8 +112396,8 @@ self: {
}:
mkDerivation {
pname = "jsaddle-webkitgtk";
- version = "0.8.3.1";
- sha256 = "1a4b4dbgkzlhz1vl1bhqjaz20cazfs7jcfqddfcb6adb72jnay0d";
+ version = "0.9.0.0";
+ sha256 = "036k7ni5ki1p6f3hxkzyq2nskqxjbdg4kp9j5r2jzphp1cr8r9li";
libraryHaskellDepends = [
aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
gi-webkit haskell-gi-base jsaddle text unix
@@ -112001,12 +112409,16 @@ self: {
}) {};
"jsaddle-wkwebview" = callPackage
- ({ mkDerivation, aeson, base, bytestring, jsaddle }:
+ ({ mkDerivation, aeson, base, bytestring, containers, data-default
+ , jsaddle
+ }:
mkDerivation {
pname = "jsaddle-wkwebview";
- version = "0.8.3.2";
- sha256 = "0a65w5svvj5ncd5dy62zqk520bsf6zmajq7dvsr7gdlfn8s2r59k";
- libraryHaskellDepends = [ aeson base bytestring jsaddle ];
+ version = "0.9.0.0";
+ sha256 = "1yy7m60h6kcqb97qwhrh3kbxrz981njff2f23x1axfrb2jc3mby4";
+ libraryHaskellDepends = [
+ aeson base bytestring containers data-default jsaddle
+ ];
description = "Interface for JavaScript that works with GHCJS and GHC";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -113606,6 +114018,42 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "katip_0_3_1_5" = callPackage
+ ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+ , bytestring, containers, criterion, deepseq, directory, either
+ , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+ , old-locale, quickcheck-instances, regex-tdfa, resourcet
+ , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
+ , tasty-quickcheck, template-haskell, text, time
+ , time-locale-compat, transformers, transformers-base
+ , transformers-compat, unagi-chan, unix, unordered-containers
+ }:
+ mkDerivation {
+ pname = "katip";
+ version = "0.3.1.5";
+ sha256 = "1mnrs6ji7bqh9lrb9bzcxb4c1a60mzf8xkzgk6yi8ijxxv5ch8zn";
+ libraryHaskellDepends = [
+ aeson async auto-update base bytestring containers either
+ exceptions hostname microlens microlens-th monad-control mtl
+ old-locale resourcet semigroups string-conv template-haskell text
+ time transformers transformers-base transformers-compat unagi-chan
+ unix unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory microlens quickcheck-instances
+ regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
+ template-haskell text time time-locale-compat unordered-containers
+ ];
+ benchmarkHaskellDepends = [
+ aeson async base blaze-builder criterion deepseq text time
+ transformers unix
+ ];
+ homepage = "https://github.com/Soostone/katip";
+ description = "A structured logging framework";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"katip-elasticsearch" = callPackage
({ mkDerivation, aeson, async, base, bloodhound, containers
, criterion, deepseq, enclosed-exceptions, exceptions, http-client
@@ -116440,6 +116888,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "language-javascript_0_6_0_10" = callPackage
+ ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+ , Cabal, containers, happy, hspec, mtl, QuickCheck, text
+ , utf8-light, utf8-string
+ }:
+ mkDerivation {
+ pname = "language-javascript";
+ version = "0.6.0.10";
+ sha256 = "0m1yk0v4myzjjv3czhavwlsgzp8ffpmbkwks97d3yipl1d0lrwfa";
+ libraryHaskellDepends = [
+ array base blaze-builder bytestring containers mtl text utf8-string
+ ];
+ libraryToolDepends = [ alex happy ];
+ testHaskellDepends = [
+ array base blaze-builder bytestring Cabal containers hspec mtl
+ QuickCheck utf8-light utf8-string
+ ];
+ homepage = "https://github.com/erikd/language-javascript";
+ description = "Parser for JavaScript";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-kort" = callPackage
({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck
, random, razom-text-util, regex-applicative, smaoin, text
@@ -116988,8 +117459,8 @@ self: {
}:
mkDerivation {
pname = "latex-formulae-hakyll";
- version = "0.2.0.2";
- sha256 = "0rdv74y5wlhw28kv8l09p1dvhbkgxz5v9fa9hgnlx1h9miz3lwl2";
+ version = "0.2.0.3";
+ sha256 = "0mdfisdcsbr4q74h6zkrs6pacc2pxhq0dwh31jahpix5p8a07psn";
libraryHaskellDepends = [
base hakyll latex-formulae-image latex-formulae-pandoc lrucache
pandoc-types
@@ -117006,8 +117477,8 @@ self: {
}:
mkDerivation {
pname = "latex-formulae-image";
- version = "0.1.1.2";
- sha256 = "03czy9sbj5r04758jzlxy0zycnb81hjgmsfadwm9kxzf6crgmwcj";
+ version = "0.1.1.3";
+ sha256 = "0qf4906n0vs231hiyq6lxck5h5k0gkp9fsn3b0apx94akhr6v0zh";
libraryHaskellDepends = [
base directory errors filepath JuicyPixels process temporary
transformers
@@ -117024,8 +117495,8 @@ self: {
}:
mkDerivation {
pname = "latex-formulae-pandoc";
- version = "0.2.0.4";
- sha256 = "0cl3xk8cbvwb44w71q56p2rvqw2akdwjdh27qcd67wdryjlkn0bn";
+ version = "0.2.0.5";
+ sha256 = "023l02qlzhxkxkccbqlkhfipgis0657vpn8h6c6hdbc0cnl7cpg6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -117856,7 +118327,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "lens_4_15_2" = callPackage
+ "lens_4_15_3" = callPackage
({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
, Cabal, cabal-doctest, comonad, containers, contravariant
, criterion, deepseq, directory, distributive, doctest, exceptions
@@ -117864,20 +118335,22 @@ self: {
, HUnit, kan-extensions, mtl, nats, parallel, profunctors
, QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
, tagged, template-haskell, test-framework, test-framework-hunit
- , test-framework-quickcheck2, test-framework-th, text, transformers
- , transformers-compat, unordered-containers, vector, void
+ , test-framework-quickcheck2, test-framework-th, text
+ , th-abstraction, transformers, transformers-compat
+ , unordered-containers, vector, void
}:
mkDerivation {
pname = "lens";
- version = "4.15.2";
- sha256 = "0anpihgq8sk07raryskwy9lc83wy61gjzhvvrg50bkkj0mjmc5av";
+ version = "4.15.3";
+ sha256 = "0znd63nkpdndpdgpvcwnqm31v4w2d1ipkj8lnnbsabbrhywknqd2";
setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
libraryHaskellDepends = [
array base base-orphans bifunctors bytestring comonad containers
contravariant distributive exceptions filepath free ghc-prim
hashable kan-extensions mtl parallel profunctors reflection
- semigroupoids semigroups tagged template-haskell text transformers
- transformers-compat unordered-containers vector void
+ semigroupoids semigroups tagged template-haskell text
+ th-abstraction transformers transformers-compat
+ unordered-containers vector void
];
testHaskellDepends = [
base bytestring containers deepseq directory doctest filepath
@@ -120299,7 +120772,7 @@ self: {
];
description = "Labeled File System interface for LIO";
license = "GPL";
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {};
"lio-simple" = callPackage
@@ -120837,6 +121310,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "liveplot" = callPackage
+ ({ mkDerivation, andromeda, base, bytestring, containers, directory
+ , filepath, GLFW-b, GLUtil, lens, linear, mvc, OpenGL, pipes
+ , pipes-extras, pipes-misc, stm, time, transformers, Vec, vector
+ , vinyl, vinyl-gl
+ }:
+ mkDerivation {
+ pname = "liveplot";
+ version = "0.0.1";
+ sha256 = "1gqbw6r0vpj18ks7xhzcalkfcl13cjx50s3w5p5f3kn63wihh197";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ andromeda base bytestring containers directory filepath GLFW-b
+ GLUtil lens linear mvc OpenGL pipes pipes-extras pipes-misc stm
+ time transformers Vec vector vinyl vinyl-gl
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Liveplotting";
+ license = stdenv.lib.licenses.bsd3;
+ broken = true;
+ }) {andromeda = null;};
+
"ll-picosat" = callPackage
({ mkDerivation, base, picosat }:
mkDerivation {
@@ -121510,8 +122006,8 @@ self: {
({ mkDerivation, base, monad-logger, text }:
mkDerivation {
pname = "located-monad-logger";
- version = "0.1.0.0";
- sha256 = "07azkz4zw0a8x3mld185knyg2rl0hz2zx67sgj0mpnh3m57q1dds";
+ version = "0.1.1.0";
+ sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn";
libraryHaskellDepends = [ base monad-logger text ];
homepage = "https://github.com/MailOnline/located-monad-logger#readme";
description = "Location-aware logging without Template Haskell";
@@ -122655,6 +123151,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "loup" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
+ , conduit, lifted-async, monad-control, optparse-generic, preamble
+ , shakers, time, turtle, uuid, yaml
+ }:
+ mkDerivation {
+ pname = "loup";
+ version = "0.0.2";
+ sha256 = "1lfa20m67zncn9dpbbrdjq3qbv6qn2h1qb1iy0b5npan9sd85r5z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson amazonka amazonka-swf base bytestring conduit lifted-async
+ monad-control preamble time turtle uuid yaml
+ ];
+ executableHaskellDepends = [ base optparse-generic shakers ];
+ homepage = "https://github.com/swift-nav/loup";
+ description = "Amazon Simple Workflow Service Wrapper for Work Pools";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"lowgl" = callPackage
({ mkDerivation, base, gl, linear, vector }:
mkDerivation {
@@ -123588,6 +124105,17 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "machines-bytestring" = callPackage
+ ({ mkDerivation, base, bytestring, machines }:
+ mkDerivation {
+ pname = "machines-bytestring";
+ version = "0.1.0.0";
+ sha256 = "1rlc5pr70z899zjs2q5p7qy5pm9gjpnm9pww934cxmlwrp1sck9b";
+ libraryHaskellDepends = [ base bytestring machines ];
+ description = "ByteString support for machines";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"machines-directory" = callPackage
({ mkDerivation, base, directory, filepath, machines, machines-io
, transformers
@@ -123924,8 +124452,8 @@ self: {
}:
mkDerivation {
pname = "mailchimp";
- version = "0.2.1";
- sha256 = "0hwgxqcwk677497pnhxl2z8d8vgw8b6v53ydkik6sapv10xqr5z2";
+ version = "0.3.0";
+ sha256 = "0s5v75mcvhbki7kl60cpwlxfzcjbc65lxdasm7zwb6agywyx5080";
libraryHaskellDepends = [
aeson attoparsec base bytestring generics-sop http-client
http-client-tls servant servant-client text transformers
@@ -126667,6 +127195,8 @@ self: {
pname = "memory";
version = "0.14.5";
sha256 = "01d1bg8pkhw9mpyd7nm5zzpqv9kh9cj2fkd2ywvkay7np2r14820";
+ revision = "1";
+ editedCabalFile = "01g68h3r1h15rrbfsbbk0195fyn93x256j8xwzlb11074sdwr0gy";
libraryHaskellDepends = [
base bytestring deepseq foundation ghc-prim
];
@@ -126676,6 +127206,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "memory_0_14_6" = callPackage
+ ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
+ , tasty, tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "memory";
+ version = "0.14.6";
+ sha256 = "0q61zxdlgcw7wg244hb3c11qm5agrmnmln0h61sz2mj72xqc1pn7";
+ libraryHaskellDepends = [
+ base bytestring deepseq foundation ghc-prim
+ ];
+ testHaskellDepends = [
+ base foundation tasty tasty-hunit tasty-quickcheck
+ ];
+ homepage = "https://github.com/vincenthz/hs-memory";
+ description = "memory and related abstraction stuff";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"memorypool" = callPackage
({ mkDerivation, base, containers, transformers, unsafe, vector }:
mkDerivation {
@@ -126704,6 +127254,31 @@ self: {
license = "GPL";
}) {};
+ "mercury-api" = callPackage
+ ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory
+ , hashable, HUnit, optparse-applicative, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "mercury-api";
+ version = "0.1.0.0";
+ sha256 = "0pyrfwl0jzm8v25aviqflfw4q95hlkq9n6ps44shzb9l0bm5zls1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base bytestring clock hashable text
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ ansi-terminal base bytestring optparse-applicative text
+ ];
+ testHaskellDepends = [
+ base bytestring directory HUnit optparse-applicative text
+ ];
+ homepage = "https://github.com/ppelleti/hs-mercury-api";
+ description = "Haskell binding to Mercury API for ThingMagic RFID readers";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"merge-bash-history" = callPackage
({ mkDerivation, attoparsec, base, data-ordlist, errors
, optparse-applicative, text
@@ -127368,7 +127943,7 @@ self: {
homepage = "http://www.haskell.org/haskellwiki/MIDI";
description = "Convert between datatypes of the midi and the alsa packages";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {};
"midi-music-box" = callPackage
@@ -128313,6 +128888,8 @@ self: {
pname = "mmorph";
version = "1.1.0";
sha256 = "1pklvg28hjfsq5r66x4igjrxbdq0l74g6lirrvsh6ckmc1av9g61";
+ revision = "1";
+ editedCabalFile = "0ppf6icblgrmiaa09s2plg1m2818pp2l9rd7c821q0zq266v79wi";
libraryHaskellDepends = [
base mtl transformers transformers-compat
];
@@ -130332,6 +130909,8 @@ self: {
pname = "monoid-subclasses";
version = "0.4.3.1";
sha256 = "1kc34w94w59vd3s4ird0mwksv9gqwmb4d4m2gld6155n2rwx0w51";
+ revision = "1";
+ editedCabalFile = "1fplps682kir8phq2fkzrnbp8qf9i29rgikg47wc5diw70g2wy26";
libraryHaskellDepends = [
base bytestring containers primes text vector
];
@@ -132958,6 +133537,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "n-tuple" = callPackage
+ ({ mkDerivation, base, singletons, vector }:
+ mkDerivation {
+ pname = "n-tuple";
+ version = "0.0.1.1";
+ sha256 = "1pwz4rs0bbanhlwcm7v06s4dkwr3h41w203kab1s7k201na7j9r1";
+ libraryHaskellDepends = [ base singletons vector ];
+ homepage = "https://github.com/athanclark/n-tuple#readme";
+ description = "Homogeneous tuples of arbitrary length";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"nagios-check" = callPackage
({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
, QuickCheck, text
@@ -134304,23 +134895,6 @@ self: {
}) {};
"network" = callPackage
- ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
- , test-framework-hunit, unix
- }:
- mkDerivation {
- pname = "network";
- version = "2.6.3.1";
- sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p";
- libraryHaskellDepends = [ base bytestring unix ];
- testHaskellDepends = [
- base bytestring doctest HUnit test-framework test-framework-hunit
- ];
- homepage = "https://github.com/haskell/network";
- description = "Low-level networking interface";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "network_2_6_3_2" = callPackage
({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
, test-framework-hunit, unix
}:
@@ -134337,7 +134911,6 @@ self: {
homepage = "https://github.com/haskell/network";
description = "Low-level networking interface";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-address" = callPackage
@@ -135178,6 +135751,8 @@ self: {
pname = "network-uri";
version = "2.6.1.0";
sha256 = "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2";
+ revision = "1";
+ editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32";
libraryHaskellDepends = [ base deepseq parsec ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit
@@ -135614,6 +136189,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "nice-html" = callPackage
+ ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
+ , bytestring, criterion, data-default-class, deepseq, free, lucid
+ , pretty-show, recursion-schemes, template-haskell, text
+ , transformers, vector, weigh
+ }:
+ mkDerivation {
+ pname = "nice-html";
+ version = "0.2.0";
+ sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v";
+ libraryHaskellDepends = [
+ base bifunctors blaze-markup bytestring data-default-class deepseq
+ free recursion-schemes template-haskell text transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ base blaze-html blaze-markup bytestring criterion lucid pretty-show
+ text weigh
+ ];
+ homepage = "https://github.com/mikeplus64/nice-html#readme";
+ description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"nicify" = callPackage
({ mkDerivation, base, nicify-lib }:
mkDerivation {
@@ -136153,8 +136751,8 @@ self: {
({ mkDerivation, base, checkers, QuickCheck }:
mkDerivation {
pname = "non-empty-zipper";
- version = "0.1.0.7";
- sha256 = "1zl1l3yjkwbk693p5y6svgv6hrpbipphcmjb5lxbyig0zfc0r13b";
+ version = "0.1.0.8";
+ sha256 = "0fyq9x0x04pv45v73mkc273ih5kd9ac40psr00zva58n352f9az9";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base checkers QuickCheck ];
description = "The Zipper for NonEmpty";
@@ -136292,6 +136890,8 @@ self: {
pname = "normalization-insensitive";
version = "2.0.0.1";
sha256 = "178hipiqlkqjp88wivid1jyg718mb38i5731zggfp9misbpj5y8p";
+ revision = "1";
+ editedCabalFile = "0hp6v44slmxa3i6cs68ffa5wlkd4bj695l1fh058mhi64bhvql8x";
libraryHaskellDepends = [
base bytestring deepseq hashable text unicode-transforms
];
@@ -138781,6 +139381,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "openweathermap" = callPackage
+ ({ mkDerivation, aeson, base, directory, http-client
+ , optparse-applicative, servant, servant-client, xdg-basedir
+ }:
+ mkDerivation {
+ pname = "openweathermap";
+ version = "0.0.0";
+ sha256 = "1ndd54pwbgkk10ah6125hgs8gn6l2bzz2r0mkc2f30y90m8mr7ll";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base http-client servant servant-client
+ ];
+ executableHaskellDepends = [
+ base directory optparse-applicative xdg-basedir
+ ];
+ description = "Access data at OpenWeatherMap";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"operate-do" = callPackage
({ mkDerivation, base, charset, doctest, filemanip
, haskell-src-meta, hspec, QuickCheck, template-haskell
@@ -139090,6 +139710,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "optparse-applicative_0_14_0_0" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
+ , QuickCheck, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "optparse-applicative";
+ version = "0.14.0.0";
+ sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base process transformers transformers-compat
+ ];
+ testHaskellDepends = [ base bytestring QuickCheck ];
+ homepage = "https://github.com/pcapriotti/optparse-applicative";
+ description = "Utilities and combinators for parsing command line options";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"optparse-applicative-simple" = callPackage
({ mkDerivation, attoparsec, attoparsec-data, base-prelude
, optparse-applicative, rerebase, text
@@ -139912,6 +140550,8 @@ self: {
pname = "packunused";
version = "0.1.2";
sha256 = "0ijlpdmsjb4rh94rcamxdg69xrza0s5clv3ipf2h3rgnidbgznfk";
+ revision = "1";
+ editedCabalFile = "1mzjb3bkxxfy19zwcpdh96n8c28vb1ml19zjpgvyirf0qi6rz6m7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -140113,7 +140753,7 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Haskell binding for C PAM API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) pam;};
"panda" = callPackage
@@ -140223,6 +140863,40 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pandoc-citeproc_0_10_5_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+ , containers, data-default, directory, filepath, hs-bibutils, mtl
+ , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+ , setenv, split, syb, tagsoup, temporary, text, time
+ , unordered-containers, vector, xml-conduit, yaml
+ }:
+ mkDerivation {
+ pname = "pandoc-citeproc";
+ version = "0.10.5.1";
+ sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers data-default directory filepath
+ hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+ setenv split syb tagsoup text time unordered-containers vector
+ xml-conduit yaml
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty attoparsec base bytestring filepath pandoc
+ pandoc-types syb text yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory filepath mtl pandoc pandoc-types
+ process temporary text yaml
+ ];
+ doCheck = false;
+ homepage = "https://github.com/jgm/pandoc-citeproc";
+ description = "Supports using pandoc with citeproc";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pandoc-citeproc-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
}:
@@ -141699,6 +142373,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "parsers_0_12_5" = callPackage
+ ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
+ , cabal-doctest, charset, containers, directory, doctest, filepath
+ , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "parsers";
+ version = "0.12.5";
+ sha256 = "1azwy5wfjv75kjwcyrglq70dmc8f6a091bgyv0wsls4f5zv0qb3k";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ attoparsec base base-orphans charset containers mtl parsec
+ scientific text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring containers directory doctest filepath
+ parsec QuickCheck quickcheck-instances
+ ];
+ homepage = "http://github.com/ekmett/parsers/";
+ description = "Parsing combinators";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"parsestar" = callPackage
({ mkDerivation, array, base, binary, bytestring, bytestring-mmap
, bytestring-nums, bytestring-show, containers, deepseq, derive
@@ -142068,6 +142767,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "path-io_1_3_0" = callPackage
+ ({ mkDerivation, base, containers, directory, exceptions, filepath
+ , hspec, path, temporary, time, transformers, unix-compat
+ }:
+ mkDerivation {
+ pname = "path-io";
+ version = "1.3.0";
+ sha256 = "1s3rkhfqcrnb3yalwlzd6ldvqlvwgf0h8yzc85l5gld8mwjs2lif";
+ libraryHaskellDepends = [
+ base containers directory exceptions filepath path temporary time
+ transformers unix-compat
+ ];
+ testHaskellDepends = [
+ base exceptions hspec path transformers unix-compat
+ ];
+ homepage = "https://github.com/mrkkrp/path-io";
+ description = "Interface to ‘directory’ package for users of ‘path’";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"path-pieces" = callPackage
({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
mkDerivation {
@@ -144601,6 +145321,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pinch_0_3_2_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, deepseq
+ , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "pinch";
+ version = "0.3.2.0";
+ sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1";
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq ghc-prim hashable text
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers hspec hspec-discover QuickCheck text
+ unordered-containers vector
+ ];
+ homepage = "https://github.com/abhinav/pinch#readme";
+ description = "An alternative implementation of Thrift for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pinchot" = callPackage
({ mkDerivation, base, containers, Earley, lens, pretty-show
, semigroups, template-haskell, transformers
@@ -145075,22 +145818,6 @@ self: {
}) {};
"pipes-extras" = callPackage
- ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
- , test-framework-hunit, transformers
- }:
- mkDerivation {
- pname = "pipes-extras";
- version = "1.0.9";
- sha256 = "0irdf86i83nprymc276jcc7zng1c8nqzf7ksnd1jmrsp6v2r488h";
- libraryHaskellDepends = [ base foldl pipes transformers ];
- testHaskellDepends = [
- base HUnit pipes test-framework test-framework-hunit transformers
- ];
- description = "Extra utilities for pipes";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "pipes-extras_1_0_10" = callPackage
({ mkDerivation, base, foldl, HUnit, pipes, test-framework
, test-framework-hunit, transformers
}:
@@ -145104,7 +145831,6 @@ self: {
];
description = "Extra utilities for pipes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pipes-fastx" = callPackage
@@ -149060,27 +149786,24 @@ self: {
"prettyprinter" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion
, doctest, mtl, pgp-wordlist, QuickCheck, random, tasty
- , tasty-quickcheck, template-haskell, text, transformers
+ , tasty-hunit, tasty-quickcheck, text, transformers
}:
mkDerivation {
pname = "prettyprinter";
- version = "1";
- sha256 = "00l4ax9h7b761474vvb2fv3mqs3nfy752ypzhmv8pnqzqb3mhlrf";
- revision = "1";
- editedCabalFile = "19rdsvym1kch6v7jfgn4358fd1k28smpi1sd21lhi61561rcb727";
+ version = "1.1";
+ sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base text ];
- executableHaskellDepends = [ base template-haskell text ];
testHaskellDepends = [
- base bytestring doctest pgp-wordlist QuickCheck tasty
+ base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
tasty-quickcheck text
];
benchmarkHaskellDepends = [
ansi-wl-pprint base criterion mtl random text transformers
];
homepage = "http://github.com/quchen/prettyprinter";
- description = "A modern, extensible and well-documented prettyprinter";
+ description = "A modern, easy to use, well-documented, extensible prettyprinter";
license = stdenv.lib.licenses.bsd2;
}) {};
@@ -149089,14 +149812,14 @@ self: {
}:
mkDerivation {
pname = "prettyprinter-ansi-terminal";
- version = "1";
- sha256 = "0amsc1cdk7h53b3xvrsx79j6w0b64bcih13rriclizk6kqkidjcd";
+ version = "1.0.1";
+ sha256 = "03vdnkvrwmny0y8p7bkw43l8x6a3b39nw20ii87pys4jr7aadd7c";
revision = "1";
- editedCabalFile = "0sdgi3sc2nljfdpb9i6l579yjz1blxjl7bw78wf0x1407xmbzkh9";
+ editedCabalFile = "1yc598kz1p4w0whhl7h7b62fx4lcsyph908anscq299w89xp40lh";
libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
testHaskellDepends = [ base doctest ];
homepage = "http://github.com/quchen/prettyprinter";
- description = "ANSI terminal backend for the modern, extensible and well-documented prettyprinter";
+ description = "ANSI terminal backend for the »prettyprinter« package";
license = stdenv.lib.licenses.bsd2;
}) {};
@@ -149106,8 +149829,8 @@ self: {
pname = "prettyprinter-compat-annotated-wl-pprint";
version = "1";
sha256 = "0zpmpbpnyxqswfb7gdj0kwz7hw606fj1iwkpl1qv0xcxk6n9n99c";
- revision = "1";
- editedCabalFile = "17r1vqpri6031q7l5gvl4v0r5yrjmb0c44l6rwwg1xnvlsa81x1x";
+ revision = "2";
+ editedCabalFile = "175bchsbx8vws1gx83z9f0l30p95353l0gyds5b0k5b5sj4fzw13";
libraryHaskellDepends = [ base prettyprinter text ];
homepage = "http://github.com/quchen/prettyprinter";
description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package";
@@ -149122,8 +149845,8 @@ self: {
pname = "prettyprinter-compat-ansi-wl-pprint";
version = "1";
sha256 = "1w84df99n1fwzwyflfjh6bsbrv03yzdsq8b42ziqcb3m1mq5hf1v";
- revision = "1";
- editedCabalFile = "09igfp6q9lgiaspwmkfm09jvc4d9vwwayfynklq3q5mg87w9lmaf";
+ revision = "2";
+ editedCabalFile = "1bcj2y4b4pj028lllljpj52m622h6rv0qngfyq2xc8jzn7pls5ca";
libraryHaskellDepends = [
base prettyprinter prettyprinter-ansi-terminal text
];
@@ -149138,14 +149861,25 @@ self: {
pname = "prettyprinter-compat-wl-pprint";
version = "1.0.0.1";
sha256 = "17jj8m9s3cp1s1szpy67g7wni9ssid78jqksh3aym7p6ci81y8km";
- revision = "1";
- editedCabalFile = "0dycsmi7pcp3m7qzc6b6r5w9gzj5byb5sxk6x6rciq1bhh1n6bz6";
+ revision = "2";
+ editedCabalFile = "0j495j9crv6qi7rq044x6bx8688zqybx5w02cbv54w208ii1pzcl";
libraryHaskellDepends = [ base prettyprinter text ];
homepage = "http://github.com/quchen/prettyprinter";
description = "Prettyprinter compatibility module for previous users of the wl-pprint package";
license = stdenv.lib.licenses.bsd2;
}) {};
+ "prettyprinter-vty" = callPackage
+ ({ mkDerivation, base, prettyprinter, vty }:
+ mkDerivation {
+ pname = "prettyprinter-vty";
+ version = "0.1.0.0";
+ sha256 = "12nj0v9p5bjbhwmkknc2ybdw52m5hngnf7c53qfi3crbrx4maxrd";
+ libraryHaskellDepends = [ base prettyprinter vty ];
+ description = "prettyprinter backend for vty";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"prim-spoon" = callPackage
({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
, spoon
@@ -149860,6 +150594,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "profiterole" = callPackage
+ ({ mkDerivation, base, containers, directory, extra, filepath
+ , ghc-prof, hashable, scientific, text
+ }:
+ mkDerivation {
+ pname = "profiterole";
+ version = "0.1";
+ sha256 = "1wfj8rmcablya94shhrnx2dbk3pfbhvdv6mk6946fyjfy32di266";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers directory extra filepath ghc-prof hashable
+ scientific text
+ ];
+ homepage = "https://github.com/ndmitchell/profiterole#readme";
+ description = "Restructure GHC profile reports";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"profiteur" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, filepath
, ghc-prof, js-jquery, scientific, text, unordered-containers
@@ -150246,25 +150999,25 @@ self: {
"propellor" = callPackage
({ mkDerivation, ansi-terminal, async, base, bytestring, containers
- , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl
- , network, process, stm, text, time, transformers, unix
+ , directory, exceptions, filepath, hashable, hslogger, IfElse, mtl
+ , network, process, split, stm, text, time, transformers, unix
, unix-compat
}:
mkDerivation {
pname = "propellor";
- version = "4.0.3";
- sha256 = "15p0jv777dgsljp8qb2nz7flhavk9ycbhxxv0nnrsj3ksjdmpldk";
+ version = "4.0.4";
+ sha256 = "0h69g079zrv9rnq0rb6d1j323rb310qmal109ma8ss50m5f4gyiq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal async base bytestring containers directory exceptions
- filepath hslogger IfElse MissingH mtl network process stm text time
- transformers unix unix-compat
+ filepath hashable hslogger IfElse mtl network process split stm
+ text time transformers unix unix-compat
];
executableHaskellDepends = [
ansi-terminal async base bytestring containers directory exceptions
- filepath hslogger IfElse MissingH mtl network process stm text time
- transformers unix unix-compat
+ filepath hashable hslogger IfElse mtl network process split stm
+ text time transformers unix unix-compat
];
homepage = "https://propellor.branchable.com/";
description = "property-based host configuration management in haskell";
@@ -150384,6 +151137,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "proto-lens_0_2_1_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , data-default-class, lens-family, parsec, pretty, text
+ , transformers, void
+ }:
+ mkDerivation {
+ pname = "proto-lens";
+ version = "0.2.1.0";
+ sha256 = "1nibz7cqlwj0vp350km80df10330s2hqvhwr36liiqc92ghphvzg";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers data-default-class
+ lens-family parsec pretty text transformers void
+ ];
+ homepage = "https://github.com/google/proto-lens";
+ description = "A lens-based implementation of protocol buffers in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"proto-lens-arbitrary" = callPackage
({ mkDerivation, base, bytestring, containers, lens-family
, proto-lens, QuickCheck, text
@@ -150424,6 +151196,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "proto-lens-combinators_0_1_0_7" = callPackage
+ ({ mkDerivation, base, Cabal, data-default-class, HUnit
+ , lens-family, lens-family-core, proto-lens, proto-lens-protoc
+ , test-framework, test-framework-hunit, transformers
+ }:
+ mkDerivation {
+ pname = "proto-lens-combinators";
+ version = "0.1.0.7";
+ sha256 = "0c00ipxpyqizzgd3fg0hfqs1bqypah90zysjb0c4pl5hhaqi9bak";
+ setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ libraryHaskellDepends = [
+ base data-default-class lens-family proto-lens proto-lens-protoc
+ transformers
+ ];
+ testHaskellDepends = [
+ base HUnit lens-family lens-family-core proto-lens
+ proto-lens-protoc test-framework test-framework-hunit
+ ];
+ homepage = "https://github.com/google/proto-lens";
+ description = "Utilities functions to proto-lens";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"proto-lens-descriptors" = callPackage
({ mkDerivation, base, bytestring, containers, data-default-class
, lens-family, lens-labels, proto-lens, text
@@ -150440,6 +151236,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "proto-lens-descriptors_0_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , lens-family, lens-labels, proto-lens, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-descriptors";
+ version = "0.2.1.0";
+ sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s";
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class lens-family
+ lens-labels proto-lens text
+ ];
+ description = "Protocol buffers for describing the definitions of messages";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"proto-lens-optparse" = callPackage
({ mkDerivation, base, optparse-applicative, proto-lens, text }:
mkDerivation {
@@ -150455,6 +151268,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "proto-lens-protobuf-types" = callPackage
+ ({ mkDerivation, base, Cabal, proto-lens-protoc }:
+ mkDerivation {
+ pname = "proto-lens-protobuf-types";
+ version = "0.2.1.0";
+ sha256 = "1x548hpl7yaqx9y2hdw5p8fc6lmxihlv2wam2x7c03zjkibb04y9";
+ setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ libraryHaskellDepends = [ proto-lens-protoc ];
+ homepage = "https://github.com/google/proto-lens";
+ description = "Basic protocol buffer message types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"proto-lens-protoc" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers
, data-default-class, directory, filepath, haskell-src-exts
@@ -150481,6 +151307,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "proto-lens-protoc_0_2_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers
+ , data-default-class, directory, filepath, haskell-src-exts
+ , lens-family, lens-labels, process, proto-lens
+ , proto-lens-descriptors, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-protoc";
+ version = "0.2.1.0";
+ sha256 = "0ywjn4px6sj82h53yzx466gsa42cgfg47w5vzvxfbdzqk4bskfdd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring Cabal containers data-default-class directory
+ filepath haskell-src-exts lens-family lens-labels process
+ proto-lens proto-lens-descriptors text
+ ];
+ executableHaskellDepends = [
+ base bytestring containers data-default-class filepath
+ haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+ ];
+ description = "Protocol buffer compiler for the proto-lens library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"protobuf" = callPackage
({ mkDerivation, base, base-orphans, bytestring, cereal, containers
, data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -151370,14 +152222,15 @@ self: {
, monad-control, monad-logger, mtl, network, optparse-applicative
, parallel, parsec, pattern-arrows, pipes, pipes-http, process
, protolude, regex-tdfa, safe, scientific, semigroups, silently
- , sourcemap, spdx, split, stm, syb, text, time, transformers
- , transformers-base, transformers-compat, unordered-containers
- , utf8-string, vector, wai, wai-websockets, warp, websockets
+ , sourcemap, spdx, split, stm, stringsearch, syb, text, time
+ , transformers, transformers-base, transformers-compat
+ , unordered-containers, utf8-string, vector, wai, wai-websockets
+ , warp, websockets
}:
mkDerivation {
pname = "purescript";
- version = "0.11.4";
- sha256 = "014dmfaw79bqypmp8kdnhv4zrdhlj37xmd1pldv52r1r3108vpwq";
+ version = "0.11.5";
+ sha256 = "1yqfgmxb8210dzffg4img8f2nzfvys3g583j2948lj03y9q170y1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -151387,8 +152240,8 @@ self: {
fsnotify Glob haskeline http-client http-types language-javascript
lens lifted-base monad-control monad-logger mtl parallel parsec
pattern-arrows pipes pipes-http process protolude regex-tdfa safe
- scientific semigroups sourcemap spdx split stm syb text time
- transformers transformers-base transformers-compat
+ scientific semigroups sourcemap spdx split stm stringsearch syb
+ text time transformers transformers-base transformers-compat
unordered-containers utf8-string vector
];
executableHaskellDepends = [
@@ -151399,8 +152252,8 @@ self: {
http-types language-javascript lens lifted-base monad-control
monad-logger mtl network optparse-applicative parallel parsec
pattern-arrows pipes pipes-http process protolude regex-tdfa safe
- scientific semigroups sourcemap spdx split stm syb text time
- transformers transformers-base transformers-compat
+ scientific semigroups sourcemap spdx split stm stringsearch syb
+ text time transformers transformers-base transformers-compat
unordered-containers utf8-string vector wai wai-websockets warp
websockets
];
@@ -151412,7 +152265,7 @@ self: {
HUnit language-javascript lens lifted-base monad-control
monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
process protolude regex-tdfa safe scientific semigroups silently
- sourcemap spdx split stm syb text time transformers
+ sourcemap spdx split stm stringsearch syb text time transformers
transformers-base transformers-compat unordered-containers
utf8-string vector
];
@@ -152599,6 +153452,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "quickcheck-instances_0_3_14" = callPackage
+ ({ mkDerivation, array, base, bytestring, case-insensitive
+ , containers, hashable, old-time, QuickCheck, scientific, tagged
+ , text, time, unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "quickcheck-instances";
+ version = "0.3.14";
+ sha256 = "1mq9zg7d0h275lhwqjq5z2hs4ql4v13q7c8x5n6rhp47rr07pcgr";
+ revision = "1";
+ editedCabalFile = "107xlrf2r0d11c4ig33p5rg3hr8di0mbhnzzvkw0q7ys1ik5v0qn";
+ libraryHaskellDepends = [
+ array base bytestring case-insensitive containers hashable old-time
+ QuickCheck scientific tagged text time unordered-containers
+ uuid-types vector
+ ];
+ testHaskellDepends = [
+ base containers QuickCheck tagged uuid-types
+ ];
+ homepage = "https://github.com/phadej/qc-instances";
+ description = "Common quickcheck instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"quickcheck-io" = callPackage
({ mkDerivation, base, HUnit, QuickCheck }:
mkDerivation {
@@ -152771,6 +153649,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "quickcheck-state-machine" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, constraints, containers
+ , hspec, mtl, parallel-io, QuickCheck, random, singletons, stm
+ }:
+ mkDerivation {
+ pname = "quickcheck-state-machine";
+ version = "0.0.0";
+ sha256 = "0022zqwncc263dcvcck06faqxqyqq2vj57zbnqk63hjpikghkk9d";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base constraints containers mtl parallel-io
+ QuickCheck random singletons stm
+ ];
+ testHaskellDepends = [ base hspec mtl QuickCheck random ];
+ homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme";
+ description = "Test monadic programs using state machine based models";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"quickcheck-string-random" = callPackage
({ mkDerivation, base, QuickCheck, string-random, tasty
, tasty-quickcheck, text
@@ -156518,8 +157414,8 @@ self: {
}:
mkDerivation {
pname = "regex";
- version = "1.0.0.0";
- sha256 = "0rl7dkynr42y43akd2r4nf1gzj5vr9alv85n1ii0pw8wpij9a0lp";
+ version = "1.0.1.0";
+ sha256 = "1kh4bh1yvpclx5f903pig034b2sjkvm3ijsrwmdh94ws9h0fdc9p";
libraryHaskellDepends = [
array base base-compat bytestring containers hashable regex-base
regex-tdfa regex-tdfa-text template-haskell text time
@@ -156531,6 +157427,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "regex_1_0_1_3" = callPackage
+ ({ mkDerivation, array, base, base-compat, bytestring, containers
+ , hashable, regex-base, regex-pcre-builtin, regex-tdfa
+ , regex-tdfa-text, template-haskell, text, time, time-locale-compat
+ , transformers, unordered-containers, utf8-string
+ }:
+ mkDerivation {
+ pname = "regex";
+ version = "1.0.1.3";
+ sha256 = "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb";
+ libraryHaskellDepends = [
+ array base base-compat bytestring containers hashable regex-base
+ regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
+ time time-locale-compat transformers unordered-containers
+ utf8-string
+ ];
+ homepage = "http://regex.uk";
+ description = "Toolkit for regex-base";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-applicative" = callPackage
({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
, tasty-smallcheck, transformers
@@ -156667,32 +157585,35 @@ self: {
}) {};
"regex-examples" = callPackage
- ({ mkDerivation, array, base, base-compat, bytestring, containers
- , directory, filepath, hashable, heredoc, http-conduit, regex
- , regex-base, regex-pcre-builtin, regex-tdfa, regex-tdfa-text
- , regex-with-pcre, shelly, smallcheck, tasty, tasty-hunit
- , tasty-smallcheck, template-haskell, text, time
+ ({ mkDerivation, array, base, base-compat, blaze-html, bytestring
+ , containers, data-default, directory, filepath, hashable, heredoc
+ , http-conduit, regex, regex-base, regex-pcre-builtin, regex-tdfa
+ , regex-tdfa-text, regex-with-pcre, shelly, smallcheck, tasty
+ , tasty-hunit, tasty-smallcheck, template-haskell, text, time
, time-locale-compat, transformers, unordered-containers
+ , utf8-string
}:
mkDerivation {
pname = "regex-examples";
- version = "1.0.0.0";
- sha256 = "035yb8pxxhfxlr23b6fg4ls7vr23hc4ja1hms8crx5mq8fj97al8";
+ version = "1.0.1.3";
+ sha256 = "0hmpq8w08n0vslnzqn6zsxp622dipg0ma42b4d47rjnv9ihl0jad";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- array base base-compat bytestring containers directory filepath
- hashable heredoc http-conduit regex regex-base regex-pcre-builtin
- regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty
- tasty-hunit tasty-smallcheck template-haskell text time
- time-locale-compat transformers unordered-containers
+ array base base-compat blaze-html bytestring containers
+ data-default directory filepath hashable heredoc http-conduit regex
+ regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
+ regex-with-pcre shelly smallcheck tasty tasty-hunit
+ tasty-smallcheck template-haskell text time time-locale-compat
+ transformers unordered-containers utf8-string
];
testHaskellDepends = [
- array base base-compat bytestring containers directory filepath
- hashable heredoc http-conduit regex regex-base regex-pcre-builtin
- regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty
- tasty-hunit tasty-smallcheck template-haskell text time
- time-locale-compat transformers unordered-containers
+ array base base-compat blaze-html bytestring containers
+ data-default directory filepath hashable heredoc http-conduit regex
+ regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
+ regex-with-pcre shelly smallcheck tasty tasty-hunit
+ tasty-smallcheck template-haskell text time time-locale-compat
+ transformers unordered-containers utf8-string
];
homepage = "http://regex.uk";
description = "Tutorial, tests and example programs for regex";
@@ -156764,6 +157685,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-pcre-text" = callPackage
+ ({ mkDerivation, array, base, bytestring, regex-base
+ , regex-pcre-builtin, regex-tdfa-text, text
+ }:
+ mkDerivation {
+ pname = "regex-pcre-text";
+ version = "0.94.0.1";
+ sha256 = "1gg9v3q05j2wdp93iragg7y5414ydz0zmkm0xyrcz98dn3bix68p";
+ libraryHaskellDepends = [
+ array base bytestring regex-base regex-pcre-builtin regex-tdfa-text
+ text
+ ];
+ homepage = "https://github.com/cdornan/regex-pcre-text";
+ description = "Text-based PCRE API for regex-base";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"regex-pderiv" = callPackage
({ mkDerivation, base, bitset, bytestring, containers, deepseq
, ghc-prim, mtl, parallel, parsec, regex-base
@@ -156950,17 +157888,37 @@ self: {
"regex-with-pcre" = callPackage
({ mkDerivation, base, base-compat, bytestring, containers, regex
- , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell
- , transformers, unordered-containers
+ , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
+ , template-haskell, text, transformers, unordered-containers
}:
mkDerivation {
pname = "regex-with-pcre";
- version = "1.0.0.0";
- sha256 = "1dggagagy7c8gkl7bmfpfyvkgsp5f5g7df028a9lrgxky54jdfv7";
+ version = "1.0.1.0";
+ sha256 = "0r7fqh9mkbjdf21m9m1j9s21h27c1cm2xcmb3j1ai9ga7jhl4864";
libraryHaskellDepends = [
base base-compat bytestring containers regex regex-base
- regex-pcre-builtin regex-tdfa template-haskell transformers
- unordered-containers
+ regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
+ transformers unordered-containers
+ ];
+ homepage = "http://regex.uk";
+ description = "Toolkit for regex-base";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "regex-with-pcre_1_0_1_3" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, containers, regex
+ , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
+ , template-haskell, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "regex-with-pcre";
+ version = "1.0.1.3";
+ sha256 = "17pq70wiyq97rh6ba1zsl6rzifi8k5mykn6kwwxcvjqqs9n2nzh9";
+ libraryHaskellDepends = [
+ base base-compat bytestring containers regex regex-base
+ regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
+ transformers unordered-containers
];
homepage = "http://regex.uk";
description = "Toolkit for regex-base";
@@ -160835,7 +161793,7 @@ self: {
homepage = "https://github.com/adamwalker/hrtlsdr";
description = "Bindings to librtlsdr";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) rtl-sdr;};
"rtnetlink" = callPackage
@@ -160936,7 +161894,7 @@ self: {
homepage = "https://github.com/mtolly/rubberband";
description = "Binding to the C++ audio stretching library Rubber Band";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) rubberband;};
"ruby-marshal" = callPackage
@@ -162814,6 +163772,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scientific_0_3_4_15" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, criterion
+ , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+ , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck, text, vector
+ }:
+ mkDerivation {
+ pname = "scientific";
+ version = "0.3.4.15";
+ sha256 = "1gsmpn3563k90nrai0jdjfvkxjjaxs7bxxsfbdpmw4xvbp2lmp9n";
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq ghc-prim hashable
+ integer-gmp integer-logarithms text vector
+ ];
+ testHaskellDepends = [
+ base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+ tasty-hunit tasty-quickcheck tasty-smallcheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ homepage = "https://github.com/basvandijk/scientific";
+ description = "Numbers represented using scientific notation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"scion" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -163547,7 +164530,7 @@ self: {
executableHaskellDepends = [ base data-default-class sdl2 vector ];
description = "Bindings to SDL2_mixer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) SDL2_mixer;};
"sdl2-ttf" = callPackage
@@ -163566,15 +164549,15 @@ self: {
executableHaskellDepends = [ base linear sdl2 ];
description = "Binding to libSDL2-ttf";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
"sdnv" = callPackage
({ mkDerivation, base, binary, bytestring }:
mkDerivation {
pname = "sdnv";
- version = "0.1.0.0";
- sha256 = "07d7989v4a8dz5jqrhz56ki9wkngaf1d0153271lylj015y00rmc";
+ version = "0.1.1";
+ sha256 = "1hckjr6fprw2y7wb4zz035rnhqj6xs7djnlkhdyzmir9g5xa3cr6";
libraryHaskellDepends = [ base binary bytestring ];
description = "Self-delimiting numeric values encoding library";
license = stdenv.lib.licenses.bsd2;
@@ -164440,8 +165423,8 @@ self: {
}:
mkDerivation {
pname = "sensu-run";
- version = "0.0.0";
- sha256 = "0i10wbnyg7bilfb3a1d2p8zzj8yvwljrbll2xwgla5mpcnym9pg9";
+ version = "0.1.1";
+ sha256 = "0gcwwb8w0rr0kjhp13afsszsb81qvnryb5qnhskyr9wpx8vvm9bk";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -165174,8 +166157,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-server";
- version = "0.2.8.0";
- sha256 = "18z7894nkav1l95mjp9a9xjl5x4v5safg5m88rbnzfg81i16szg7";
+ version = "0.3.0.0";
+ sha256 = "1rs51w929hlwsgrg5ajcv3cp09hnk37p1n5s2ydmja22m4ba93ak";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -165311,17 +166294,17 @@ self: {
"servant-auth-token-persistent" = callPackage
({ mkDerivation, aeson-injector, base, bytestring, containers
- , ghc-prim, monad-control, mtl, persistent, persistent-template
+ , monad-control, mtl, persistent, persistent-template
, servant-auth-token, servant-auth-token-api, servant-server, text
, time, transformers, transformers-base, uuid
}:
mkDerivation {
pname = "servant-auth-token-persistent";
- version = "0.5.0.0";
- sha256 = "1rfl4hv5d6hz18j0yyyrq1i97d30pgngagal9zrmi4l26xsk9li0";
+ version = "0.5.1.0";
+ sha256 = "0kvhk4wd8qdiaqjgs3k8s8jlxhph9jddpgq8caf7yldw6wz2kqi2";
libraryHaskellDepends = [
- aeson-injector base bytestring containers ghc-prim monad-control
- mtl persistent persistent-template servant-auth-token
+ aeson-injector base bytestring containers monad-control mtl
+ persistent persistent-template servant-auth-token
servant-auth-token-api servant-server text time transformers
transformers-base uuid
];
@@ -166553,6 +167536,88 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-zeppelin" = callPackage
+ ({ mkDerivation, base, singletons }:
+ mkDerivation {
+ pname = "servant-zeppelin";
+ version = "0.1.0.3";
+ sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3";
+ libraryHaskellDepends = [ base singletons ];
+ homepage = "https://github.com/martyall/servant-zeppelin#readme";
+ description = "Types and definitions of servant-zeppelin combinators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-zeppelin-client" = callPackage
+ ({ mkDerivation, aeson, base, data-default-class, hspec
+ , http-client, mtl, QuickCheck, servant, servant-client
+ , servant-server, servant-zeppelin, servant-zeppelin-server
+ , singletons, string-conversions, text, wai-extra, warp
+ }:
+ mkDerivation {
+ pname = "servant-zeppelin-client";
+ version = "0.1.0.3";
+ sha256 = "0rycpbwnxnjcf5j0ipy2sf66l4nj1fml16hyd6ga4wd6hcf5277q";
+ libraryHaskellDepends = [
+ aeson base servant servant-client servant-zeppelin singletons text
+ ];
+ testHaskellDepends = [
+ aeson base data-default-class hspec http-client mtl QuickCheck
+ servant servant-client servant-server servant-zeppelin
+ servant-zeppelin-server singletons string-conversions wai-extra
+ warp
+ ];
+ homepage = "https://github.com/martyall/servant-zeppelin#readme";
+ description = "Client library for servant-zeppelin combinators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-zeppelin-server" = callPackage
+ ({ mkDerivation, aeson, base, hspec, http-client, http-types, lens
+ , lens-aeson, mtl, QuickCheck, servant, servant-server
+ , servant-zeppelin, singletons, string-conversions, text, wai, warp
+ , wreq
+ }:
+ mkDerivation {
+ pname = "servant-zeppelin-server";
+ version = "0.1.0.3";
+ sha256 = "1fq9cac0mxpgj6cbgchd28djai0p1sdxgnbzpi6mn5l3hpfqyxnm";
+ libraryHaskellDepends = [
+ aeson base http-types servant servant-server servant-zeppelin
+ singletons text wai
+ ];
+ testHaskellDepends = [
+ aeson base hspec http-client http-types lens lens-aeson mtl
+ QuickCheck servant servant-server servant-zeppelin
+ string-conversions warp wreq
+ ];
+ homepage = "https://github.com/martyall/servant-zeppelin#readme";
+ description = "Server library for servant-zeppelin combinators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-zeppelin-swagger" = callPackage
+ ({ mkDerivation, aeson, base, containers, hspec
+ , insert-ordered-containers, lens, servant, servant-swagger
+ , servant-zeppelin, singletons, swagger2, text
+ }:
+ mkDerivation {
+ pname = "servant-zeppelin-swagger";
+ version = "0.1.0.3";
+ sha256 = "0minwzmavsbksn0qh25lcbmdy496zi5lq6jrg4n203pdvnlhsyah";
+ libraryHaskellDepends = [
+ aeson base insert-ordered-containers lens servant servant-swagger
+ servant-zeppelin singletons swagger2 text
+ ];
+ testHaskellDepends = [
+ aeson base containers hspec insert-ordered-containers lens servant
+ servant-swagger servant-zeppelin swagger2
+ ];
+ homepage = "https://github.com/martyall/servant-zeppelin#readme";
+ description = "Swagger instances for servant-zeppelin combinators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"server-generic" = callPackage
({ mkDerivation, aeson, base, bytestring, http-types, mtl, text
, void, wai, warp
@@ -168259,8 +169324,8 @@ self: {
({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:
mkDerivation {
pname = "show-prettyprint";
- version = "0.1.2";
- sha256 = "19p78rs2llq98wr6r49nxs985w45l1723krg7cfwkwciiv2977jv";
+ version = "0.1.2.1";
+ sha256 = "1zwvaa91r4scfxxlbqzfi335bqb3jrgbkkq38dysny52fg6mn565";
libraryHaskellDepends = [ ansi-wl-pprint base trifecta ];
testHaskellDepends = [ base doctest ];
homepage = "https://github.com/quchen/show-prettyprint#readme";
@@ -168276,6 +169341,8 @@ self: {
pname = "show-prettyprint";
version = "0.2";
sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w";
+ revision = "1";
+ editedCabalFile = "1hkfq59kpx3p4rgka49l3hvim80xlqf5h3q8f1xb4arysrq3pvi4";
libraryHaskellDepends = [
ansi-wl-pprint base prettyprinter trifecta
];
@@ -169601,6 +170668,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "singleton-dict" = callPackage
+ ({ mkDerivation, base, singletons }:
+ mkDerivation {
+ pname = "singleton-dict";
+ version = "0.1.0.0";
+ sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic";
+ libraryHaskellDepends = [ base singletons ];
+ homepage = "https://github.com/amiddelk/singleton-dict#readme";
+ description = "Typelevel balanced search trees via a singletonized Data.Map";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"singleton-nats" = callPackage
({ mkDerivation, base, singletons }:
mkDerivation {
@@ -172221,8 +173300,8 @@ self: {
({ mkDerivation, base, containers, pandoc, process }:
mkDerivation {
pname = "snipcheck";
- version = "0.1.0.1";
- sha256 = "1kc3yzah4xss479lhzyb083qm0sfnkix7h03pd4da35i1q30k0w0";
+ version = "0.1.0.2";
+ sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk";
libraryHaskellDepends = [ base containers pandoc process ];
homepage = "https://github.com/nmattia/snipcheck#readme";
description = "Markdown tester";
@@ -172831,8 +173910,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "sort";
- version = "0.1.0.0";
- sha256 = "0wqzl413pdaqs1674smgr65kqdwv3msq834xflxq01jd4p872j7l";
+ version = "1.0.0.0";
+ sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/cdornan/sort";
description = "A Haskell sorting toolkit";
@@ -173118,21 +174197,20 @@ self: {
}) {};
"spake2" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
- , memory, optparse-applicative, protolude, QuickCheck, tasty
- , tasty-hspec
+ ({ mkDerivation, base, bytestring, cryptonite, memory
+ , optparse-applicative, protolude, QuickCheck, tasty, tasty-hspec
}:
mkDerivation {
pname = "spake2";
- version = "0.1.0";
- sha256 = "08g8n99zdpl8f2wlhvjl16zrnnazp6swvg3688l1bfma5igs9zsy";
+ version = "0.2.0";
+ sha256 = "16yqr9kvhf71iajn6mld8y4svq0l5yz5ljpjmajnfw6lw8fbjrim";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring cryptonite memory protolude
];
executableHaskellDepends = [
- base base16-bytestring cryptonite optparse-applicative protolude
+ base cryptonite memory optparse-applicative protolude
];
testHaskellDepends = [
base cryptonite protolude QuickCheck tasty tasty-hspec
@@ -176197,10 +177275,8 @@ self: {
({ mkDerivation, base, stm, transformers }:
mkDerivation {
pname = "stm-lifted";
- version = "0.1.0.0";
- sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090";
- revision = "1";
- editedCabalFile = "0m3cvhz16z06s560j45dpi7wiy6398pm98f34p3wrryq64d744yk";
+ version = "0.1.1.0";
+ sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c";
libraryHaskellDepends = [ base stm transformers ];
description = "Software Transactional Memory lifted to MonadIO";
license = stdenv.lib.licenses.bsd3;
@@ -177018,6 +178094,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "streaming-conduit" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, hspec, streaming
+ , streaming-bytestring, transformers
+ }:
+ mkDerivation {
+ pname = "streaming-conduit";
+ version = "0.1.1.0";
+ sha256 = "1cj2p3c6rs5cbz0jdj7k8mxfnslk96966dshfhjxi56mrpjxmzjy";
+ libraryHaskellDepends = [
+ base bytestring conduit streaming streaming-bytestring transformers
+ ];
+ testHaskellDepends = [ base conduit hspec streaming ];
+ description = "Bidirectional support between the streaming and conduit libraries";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"streaming-eversion" = callPackage
({ mkDerivation, base, doctest, foldl, microlens, pipes
, pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit
@@ -179862,14 +180954,12 @@ self: {
}) {};
"system-locale" = callPackage
- ({ mkDerivation, base, hspec, megaparsec, process, time }:
+ ({ mkDerivation, attoparsec, base, hspec, process, text, time }:
mkDerivation {
pname = "system-locale";
- version = "0.1.0.0";
- sha256 = "1avgd19yd5wzg44546vhl285lrcm6lng54q3iig8fpdm4maq3xqd";
- revision = "1";
- editedCabalFile = "196g511hi9vj82q7pny41hqndhkbrdf7y0r9hcr3gdkc90f6k09n";
- libraryHaskellDepends = [ base megaparsec process time ];
+ version = "0.2.0.0";
+ sha256 = "1mvzcnqybdv30xrpfp87l61kcdss2wgqsbgpdl2gl9nz62hyd5z5";
+ libraryHaskellDepends = [ attoparsec base process text time ];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/cocreature/system-locale";
description = "Get system locales";
@@ -180366,17 +181456,18 @@ self: {
"tagchup" = callPackage
({ mkDerivation, base, bytestring, containers, data-accessor
- , explicit-exception, old-time, transformers, utility-ht, xml-basic
+ , explicit-exception, non-empty, old-time, transformers, utility-ht
+ , xml-basic
}:
mkDerivation {
pname = "tagchup";
- version = "0.4.0.5";
- sha256 = "0dgsl0ig2kc6f9dnb22pgl4c1nx8x3d7wp0nxffpd9v2qpp2xhf0";
+ version = "0.4.1";
+ sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers data-accessor explicit-exception
- transformers utility-ht xml-basic
+ non-empty transformers utility-ht xml-basic
];
testHaskellDepends = [ base xml-basic ];
benchmarkHaskellDepends = [
@@ -181014,18 +182105,6 @@ self: {
}) {};
"tar-conduit" = callPackage
- ({ mkDerivation, base, bytestring, conduit-combinators }:
- mkDerivation {
- pname = "tar-conduit";
- version = "0.1.0";
- sha256 = "0bwfhxvw0dz2s5a3mzzrv4546dh9kqgqsg4yacza9cvjs2l8xkb4";
- libraryHaskellDepends = [ base bytestring conduit-combinators ];
- homepage = "https://github.com/snoyberg/tar-conduit#readme";
- description = "Parse tar files using conduit for streaming";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "tar-conduit_0_1_1" = callPackage
({ mkDerivation, base, bytestring, conduit-combinators }:
mkDerivation {
pname = "tar-conduit";
@@ -181035,7 +182114,6 @@ self: {
homepage = "https://github.com/snoyberg/tar-conduit#readme";
description = "Parse tar files using conduit for streaming";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tardis" = callPackage
@@ -181278,12 +182356,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "tasty-dejafu_0_5_0_0" = callPackage
+ "tasty-dejafu_0_6_0_0" = callPackage
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
pname = "tasty-dejafu";
- version = "0.5.0.0";
- sha256 = "0pqrii4qd9a0sjbz21rscdn6yz3hns7z9wnz0f40f05qmslxggav";
+ version = "0.6.0.0";
+ sha256 = "0qcfypb69052rdrfvssy3py2im86i71rmlv7w954y9rmbby1kl4n";
libraryHaskellDepends = [ base dejafu random tagged tasty ];
homepage = "https://github.com/barrucadu/dejafu";
description = "Deja Fu support for the Tasty test framework";
@@ -181313,20 +182391,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "tasty-discover_2_0_3" = callPackage
- ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
- , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+ "tasty-discover_3_0_2" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, tasty
+ , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
}:
mkDerivation {
pname = "tasty-discover";
- version = "2.0.3";
- sha256 = "1qa37iimg66fq1gzjllcrq1rncip26pcw6bax75jmsk1vfczw38j";
+ version = "3.0.2";
+ sha256 = "1bd37d5gppi3lmc244bixv8jpzfx4m14cbqklnwmjhhqviic79h2";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base directory filepath ];
- executableHaskellDepends = [ base directory filepath ];
+ libraryHaskellDepends = [ base containers directory filepath ];
+ executableHaskellDepends = [ base containers directory filepath ];
testHaskellDepends = [
- base directory filepath tasty tasty-hspec tasty-hunit
+ base containers directory filepath tasty tasty-hspec tasty-hunit
tasty-quickcheck tasty-smallcheck
];
homepage = "https://github.com/lwm/tasty-discover#readme";
@@ -182947,21 +184025,20 @@ self: {
}) {};
"test-fixture" = callPackage
- ({ mkDerivation, base, data-default, haskell-src-exts
+ ({ mkDerivation, base, data-default-class, haskell-src-exts
, haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
- , th-orphans, th-to-exp, transformers
+ , th-orphans, transformers
}:
mkDerivation {
pname = "test-fixture";
- version = "0.5.0.0";
- sha256 = "0bbplvnygnz2z04064hccl070lgmv1yra7k6zfmjr3c7fzvpfj08";
+ version = "0.5.0.1";
+ sha256 = "0gnvz4paxr2wamdp01fnflhifbmsgxpmhg6l3a8nqmi32wgrwy6m";
libraryHaskellDepends = [
- base data-default haskell-src-exts haskell-src-meta mtl
+ base data-default-class haskell-src-exts haskell-src-meta mtl
template-haskell th-orphans
];
testHaskellDepends = [
- base hspec hspec-discover mtl template-haskell th-to-exp
- transformers
+ base hspec hspec-discover mtl template-haskell transformers
];
homepage = "http://github.com/cjdev/test-fixture#readme";
description = "Test monadic side-effects";
@@ -183698,6 +184775,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text-format-heavy" = callPackage
+ ({ mkDerivation, base, containers, data-default, parsec, text, time
+ }:
+ mkDerivation {
+ pname = "text-format-heavy";
+ version = "0.1.1.0";
+ sha256 = "082j0dzmy5d8lpjxhg9k7qhnjykg851a0yllszf43kx09hk0kmb1";
+ libraryHaskellDepends = [
+ base containers data-default parsec text time
+ ];
+ description = "Full-weight string formatting library, analog of Python's string.format";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"text-format-simple" = callPackage
({ mkDerivation, base, MissingH }:
mkDerivation {
@@ -184196,6 +185287,8 @@ self: {
pname = "text-show-instances";
version = "3.5";
sha256 = "0hh3d52wkq7vbbikn9sznv2i4k23b4vsnxw7s3h0nij2cxpbyz8c";
+ revision = "1";
+ editedCabalFile = "1jbqpmphh4zrbdbqrazqls099gd73zmri1maf1qssvm4drz0ffgn";
libraryHaskellDepends = [
base base-compat bifunctors binary bytestring containers directory
ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -184217,7 +185310,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "text-show-instances_3_6" = callPackage
+ "text-show-instances_3_6_1" = callPackage
({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
, containers, directory, generic-deriving, ghc-boot-th, ghc-prim
, haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
@@ -184228,8 +185321,8 @@ self: {
}:
mkDerivation {
pname = "text-show-instances";
- version = "3.6";
- sha256 = "111s9sw9j3pq0wdv6f4wbpf4wff6iiyj8ysq3k1d527f5ln7idmi";
+ version = "3.6.1";
+ sha256 = "1ws5gkmb7y21aw6lrakjq760lgg7j8r5rfm45sdfalhgasxh54lz";
libraryHaskellDepends = [
base base-compat bifunctors binary bytestring containers directory
ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -184559,8 +185652,8 @@ self: {
({ mkDerivation, base, containers, ghc-prim, template-haskell }:
mkDerivation {
pname = "th-abstraction";
- version = "0.1.3.0";
- sha256 = "0ycb91csldk5jynhj8ydy6jmvjppqrbzc0n4zw414z69drb9gqzx";
+ version = "0.2.1.0";
+ sha256 = "08kn5siadiz4zv1p03bcys1yzsdaac10l2rh017g2sxrb40hnffk";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -186124,8 +187217,8 @@ self: {
}:
mkDerivation {
pname = "time-qq";
- version = "0.0.0.2";
- sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7";
+ version = "0.0.1.0";
+ sha256 = "11sch73355fpwqgvg8cq0br0108mj9ph085vycnyq1jndrd0wvxd";
libraryHaskellDepends = [
base template-haskell time time-locale-compat
];
@@ -186621,14 +187714,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "timezone-olson_0_1_8" = callPackage
+ ({ mkDerivation, base, binary, bytestring, extensible-exceptions
+ , time, timezone-series
+ }:
+ mkDerivation {
+ pname = "timezone-olson";
+ version = "0.1.8";
+ sha256 = "0irpvmqpiw4j2wq4rn3jrndgn2jg10yvrnxvsrb1l6g5b80h2sxr";
+ libraryHaskellDepends = [
+ base binary bytestring extensible-exceptions time timezone-series
+ ];
+ homepage = "http://projects.haskell.org/time-ng/";
+ description = "A pure Haskell parser and renderer for binary Olson timezone files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"timezone-olson-th" = callPackage
({ mkDerivation, base, template-haskell, time, timezone-olson
, timezone-series
}:
mkDerivation {
pname = "timezone-olson-th";
- version = "0.1.0.2";
- sha256 = "0xmd8c0hs8592p3va4r8wfzy1chld5yq51gcl51bcwzcrvd5102w";
+ version = "0.1.0.3";
+ sha256 = "0jagq78mp09x8zhy3ygdd0pw2ms12c72qi9r7gqaird09rggs44w";
libraryHaskellDepends = [
base template-haskell time timezone-olson timezone-series
];
@@ -186649,6 +187759,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "timezone-series_0_1_8" = callPackage
+ ({ mkDerivation, base, deepseq, time }:
+ mkDerivation {
+ pname = "timezone-series";
+ version = "0.1.8";
+ sha256 = "1xndlg0n46qjdh5yjzkkg285x3k76073aaizx1ibdzbq9q7dj6c1";
+ libraryHaskellDepends = [ base deepseq time ];
+ homepage = "http://projects.haskell.org/time-ng/";
+ description = "Enhanced timezone handling for Data.Time";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"timezone-unix" = callPackage
({ mkDerivation, base, directory, filepath, leapseconds, tasty
, tasty-golden, tasty-hunit, time, timezone-olson, timezone-series
@@ -187355,7 +188478,7 @@ self: {
homepage = "http://www.polarmobile.com/";
description = "FFI bindings to libtokyotyrant";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
"tomato-rubato-openal" = callPackage
@@ -188165,18 +189288,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "transient_0_5_5" = callPackage
+ "transient_0_5_6" = callPackage
({ mkDerivation, base, bytestring, containers, directory, mtl
, random, stm, time, transformers
}:
mkDerivation {
pname = "transient";
- version = "0.5.5";
- sha256 = "06fpva9mydavc7dnmha735rc1mlz0hi33xagdf0hh7s0hplfpwd3";
+ version = "0.5.6";
+ sha256 = "01r0mw35h3k7yry91gir64gkb6d3x9i5awnacmk8l8anffhvvayc";
libraryHaskellDepends = [
base bytestring containers directory mtl random stm time
transformers
];
+ testHaskellDepends = [
+ base bytestring containers directory mtl random stm time
+ transformers
+ ];
homepage = "http://www.fpcomplete.com/user/agocorona";
description = "composing programs with multithreading, events and distributed computing";
license = stdenv.lib.licenses.mit;
@@ -188213,7 +189340,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "transient-universe_0_4_4_1" = callPackage
+ "transient-universe_0_4_5" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, directory, filepath, hashable, HTTP, iproute, mtl, network
, network-info, network-uri, process, random, stm, TCache, text
@@ -188221,8 +189348,8 @@ self: {
}:
mkDerivation {
pname = "transient-universe";
- version = "0.4.4.1";
- sha256 = "1v8b0q5drs6lpw3va9qn5yqfawhcaaypys00rl0pcci47xkvpxvj";
+ version = "0.4.5";
+ sha256 = "0imyapqzdl2rz4gdykkcf3vr3r5d22qdnm9n0rg0gkl63b4lvv60";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -188231,14 +189358,18 @@ self: {
random stm TCache text time transformers transient vector
websockets
];
- executableHaskellDepends = [ base transformers transient ];
+ executableHaskellDepends = [
+ base bytestring case-insensitive containers directory filepath
+ hashable HTTP mtl network network-info network-uri process random
+ stm TCache text time transformers transient vector websockets
+ ];
testHaskellDepends = [
base bytestring case-insensitive containers directory filepath
hashable HTTP mtl network network-info network-uri process random
stm TCache text time transformers transient vector websockets
];
homepage = "http://www.fpcomplete.com/user/agocorona";
- description = "Distributed computing with algebraic/monadic composability, map-reduce";
+ description = "Remote execution and map-reduce: distributed computing for Transient";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -188615,6 +189746,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "trifecta_1_7" = callPackage
+ ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
+ , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal
+ , cabal-doctest, charset, comonad, containers, deepseq, doctest
+ , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors
+ , QuickCheck, reducers, semigroups, transformers
+ , unordered-containers, utf8-string
+ }:
+ mkDerivation {
+ pname = "trifecta";
+ version = "1.7";
+ sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
+ blaze-markup bytestring charset comonad containers deepseq
+ fingertree ghc-prim hashable lens mtl parsers profunctors reducers
+ semigroups transformers unordered-containers utf8-string
+ ];
+ testHaskellDepends = [ base doctest parsers QuickCheck ];
+ homepage = "http://github.com/ekmett/trifecta/";
+ description = "A modern parser combinator library with convenient diagnostics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"trimpolya" = callPackage
({ mkDerivation, base, bio, bytestring, simpleargs }:
mkDerivation {
@@ -189018,6 +190175,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tttool_1_7_0_3" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, containers
+ , directory, executable-path, filepath, hashable, haskeline, HPDF
+ , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
+ , process, random, split, spool, template-haskell, time, vector
+ , yaml, zlib
+ }:
+ mkDerivation {
+ pname = "tttool";
+ version = "1.7.0.3";
+ sha256 = "0r8ha8wgzlf2ymyxylj16hfshf8w5dl13cwmdkl6ih2niwkzk9ch";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base binary bytestring containers directory executable-path
+ filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
+ optparse-applicative parsec process random split spool
+ template-haskell time vector yaml zlib
+ ];
+ homepage = "https://github.com/entropia/tip-toi-reveng";
+ description = "Working with files for the Tiptoi® pen";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tubes" = callPackage
({ mkDerivation, base, comonad, contravariant, free, mtl
, profunctors, semigroups, transformers
@@ -189271,29 +190453,6 @@ self: {
}) {};
"turtle" = callPackage
- ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
- , criterion, directory, doctest, 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.3.4";
- sha256 = "0rkxic6v68dlzdvnqk0pfchl9zd1rjhmr0n5qwms3r0pq5z8vj57";
- libraryHaskellDepends = [
- ansi-wl-pprint async base bytestring clock directory 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;
- }) {};
-
- "turtle_1_3_5" = callPackage
({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
, criterion, directory, doctest, foldl, hostname, managed
, optional-args, optparse-applicative, process, semigroups, stm
@@ -189314,7 +190473,6 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Shell programming, Haskell-style";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"turtle-options" = callPackage
@@ -190843,8 +192001,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.3.0.0";
- sha256 = "1cl12bymyzrcx5jsjp106csap30x28ws58dx5qp6008wdsdbm4j2";
+ version = "0.3.1.1";
+ sha256 = "1pf5ha4r015yc359c5f7jy2qwx1j9i9w62xjlfhm9amx81cw42if";
libraryHaskellDepends = [
autoexporter base dlist monad-skeleton template-haskell
th-data-compat
@@ -192979,8 +194137,8 @@ self: {
}:
mkDerivation {
pname = "uri-bytestring";
- version = "0.2.3.1";
- sha256 = "0vdiy6z9r5idml6rjbf6h2y24as97j34spcrrwpvgj3nraw18a0x";
+ version = "0.2.3.2";
+ sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4";
libraryHaskellDepends = [
attoparsec base blaze-builder bytestring containers
template-haskell th-lift-instances
@@ -192999,25 +194157,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "uri-bytestring_0_2_3_2" = callPackage
- ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
- , containers, criterion, deepseq, deepseq-generics, generics-sop
- , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
- , semigroups, tasty, tasty-hunit, tasty-quickcheck
- , template-haskell, th-lift-instances
+ "uri-bytestring_0_2_3_3" = callPackage
+ ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
+ , bytestring, containers, criterion, deepseq, deepseq-generics
+ , generics-sop, HUnit, network-uri, QuickCheck
+ , quickcheck-instances, semigroups, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, th-lift-instances
+ , transformers
}:
mkDerivation {
pname = "uri-bytestring";
- version = "0.2.3.2";
- sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4";
+ version = "0.2.3.3";
+ sha256 = "050bimfsc912dh5sb2kjvvdd80ggjhakqq1dbn46cnp98zr8p0rx";
libraryHaskellDepends = [
attoparsec base blaze-builder bytestring containers
template-haskell th-lift-instances
];
testHaskellDepends = [
- attoparsec base blaze-builder bytestring containers generics-sop
- HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
- tasty-hunit tasty-quickcheck
+ attoparsec base base-compat blaze-builder bytestring containers
+ generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
+ tasty-hunit tasty-quickcheck transformers
];
benchmarkHaskellDepends = [
base blaze-builder bytestring criterion deepseq deepseq-generics
@@ -193436,6 +194595,8 @@ self: {
pname = "users";
version = "0.5.0.0";
sha256 = "1m2k3vq938whv9577k3jrgx99hwr272s0fc22p2i6k0dgf9sqqb7";
+ revision = "1";
+ editedCabalFile = "1x26g7k6kmq2vng9y5qkz82z06rs322s2y8bs9y6r4vayvg07q9v";
libraryHaskellDepends = [
aeson base bcrypt path-pieces text time
];
@@ -193591,8 +194752,8 @@ self: {
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "utility-ht";
- version = "0.0.13";
- sha256 = "1gjcz5bkwjj9lw9nx4qy8ys3ns9h1vndxqk17z52wzqpc3q7fawm";
+ version = "0.0.14";
+ sha256 = "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -195258,22 +196419,22 @@ self: {
}:
mkDerivation {
pname = "versions";
- version = "3.0.2";
- sha256 = "1s33il4w94h51zsqbqylbzbhn9q5y7cjnscblhhkpglvgc2z61ii";
+ version = "3.0.2.1";
+ sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp";
libraryHaskellDepends = [ base megaparsec text ];
testHaskellDepends = [ base microlens tasty tasty-hunit text ];
description = "Types and parsers for software version numbers";
license = stdenv.lib.licenses.bsd3;
}) {};
- "versions_3_0_2_1" = callPackage
+ "versions_3_1_0_1" = callPackage
({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
, text
}:
mkDerivation {
pname = "versions";
- version = "3.0.2.1";
- sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp";
+ version = "3.1.0.1";
+ sha256 = "0r6dzf27bw2d0d0p48rv2vqkiw4dagdk6ka0hhisxz5ii4x6lvl7";
libraryHaskellDepends = [ base megaparsec text ];
testHaskellDepends = [ base microlens tasty tasty-hunit text ];
description = "Types and parsers for software version numbers";
@@ -197904,8 +199065,10 @@ self: {
({ mkDerivation, base, mtl, time }:
mkDerivation {
pname = "watchdog";
- version = "0.2.3";
- sha256 = "18x0y0pnbbhfl1yjjdlf34fkl76rj702kdq4bqvnap25067hmgdm";
+ version = "0.3";
+ sha256 = "0v8jbrnqg48x5ksdacsd0xazpxqv64ggzihg6k2y6pljqznrhn1i";
+ revision = "1";
+ editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg";
libraryHaskellDepends = [ base mtl time ];
description = "Simple control structure to re-try an action with exponential backoff";
license = stdenv.lib.licenses.bsd3;
@@ -199072,8 +200235,8 @@ self: {
}:
mkDerivation {
pname = "weeder";
- version = "0.1.4";
- sha256 = "0n7zwyppjsiih0i3czb2m0a817jy592hpm6jhkr8hp1a1pa8qfcz";
+ version = "0.1.5";
+ sha256 = "0jnfg68828qdk14lpa0ql4x6cj7ap2njrwpgdqwkpm2hkgw21363";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -199971,24 +201134,21 @@ self: {
}) {};
"wolf" = callPackage
- ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
- , amazonka-swf, base, bytestring, conduit, conduit-combinators
- , conduit-extra, directory, exceptions, filemanip, filepath
- , http-types, lifted-async, monad-control, optparse-applicative
- , optparse-generic, preamble, process, resourcet, shakers, text
- , time, uuid, yaml
+ ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
+ , conduit, directory, exceptions, filemanip, filepath, http-types
+ , lifted-async, lifted-base, monad-control, optparse-generic
+ , preamble, process, resourcet, shakers, time, uuid, yaml
}:
mkDerivation {
pname = "wolf";
- version = "0.3.14";
- sha256 = "1dbkk0v99jwag8926vjn6fmxpanwds7mfrf1lgd13slxppri8f32";
+ version = "0.3.18";
+ sha256 = "08wpjp1m6szx2sp4g7h03ks7r2ryadzz3a3apchd2vymhlb1qaxb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
- bytestring conduit conduit-combinators conduit-extra directory
- exceptions filemanip filepath http-types lifted-async monad-control
- optparse-applicative preamble process resourcet text time uuid yaml
+ aeson amazonka amazonka-swf base bytestring conduit directory
+ exceptions filemanip filepath http-types lifted-async lifted-base
+ monad-control preamble process resourcet time uuid yaml
];
executableHaskellDepends = [ base optparse-generic shakers ];
homepage = "https://github.com/swift-nav/wolf";
@@ -201202,7 +202362,7 @@ self: {
];
description = "Haskell extended file attributes interface";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) attr;};
"xbattbar" = callPackage
@@ -201834,12 +202994,11 @@ self: {
}:
mkDerivation {
pname = "xml-basic";
- version = "0.1.1.3";
- sha256 = "0m3pwg8b9pvqh9559p7nq39vnkklmf9gcay8vpvrkh17p8n14z6c";
+ version = "0.1.2";
+ sha256 = "1s8415gj65zm6mbbrmkav92zkwi0q8mf892ajc2qz9hfmhxab27q";
libraryHaskellDepends = [
base containers data-accessor explicit-exception utility-ht
];
- homepage = "http://www.haskell.org/haskellwiki/XML-Basic";
description = "Basics for XML/HTML representation and processing";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -202553,7 +203712,7 @@ self: {
homepage = "http://xmobar.org";
description = "A Minimalistic Text Based Status Bar";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" ];
+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
@@ -203422,21 +204581,28 @@ self: {
}) {};
"yaml-union" = callPackage
- ({ mkDerivation, base, bytestring, optparse-applicative
- , unordered-containers, yaml
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath
+ , hspec, optparse-applicative, QuickCheck, quickcheck-instances
+ , scientific, text, unix, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "yaml-union";
- version = "0.0.1";
- sha256 = "11dxisgr8blzahw9y78rk9sc39nmmfj33klbcbjpi9qawnhjbbxk";
+ version = "0.0.2";
+ sha256 = "1lmlrf3x4icx0ikl02k00hv1wibvy0n3lmxdgjrh0vbq89sbx55a";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base unordered-containers yaml ];
- executableHaskellDepends = [
- base bytestring optparse-applicative yaml
+ libraryHaskellDepends = [
+ aeson base bytestring directory filepath text unix
+ unordered-containers vector yaml
];
- testHaskellDepends = [ base ];
- homepage = "https://github.com/michelk/yaml-overrides.hs";
+ executableHaskellDepends = [
+ base bytestring directory optparse-applicative yaml
+ ];
+ testHaskellDepends = [
+ base hspec QuickCheck quickcheck-instances scientific text
+ unordered-containers vector yaml
+ ];
+ homepage = "https://github.com/michelk/yaml-union.hs";
description = "Read multiple yaml-files and override fields recursively";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -203899,6 +205065,36 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-auth_1_4_17_2" = callPackage
+ ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+ , base64-bytestring, binary, blaze-builder, blaze-html
+ , blaze-markup, byteable, bytestring, conduit, conduit-extra
+ , containers, cryptonite, data-default, email-validate, file-embed
+ , http-client, http-conduit, http-types, lifted-base, memory
+ , mime-mail, network-uri, nonce, persistent, persistent-template
+ , random, resourcet, safe, shakespeare, template-haskell, text
+ , time, transformers, unordered-containers, wai, yesod-core
+ , yesod-form, yesod-persistent
+ }:
+ mkDerivation {
+ pname = "yesod-auth";
+ version = "1.4.17.2";
+ sha256 = "10wrl6g5q06mf751rwc8wclb5i5wajp30vhr7ggpvfylmqzjg933";
+ libraryHaskellDepends = [
+ aeson authenticate base base16-bytestring base64-bytestring binary
+ blaze-builder blaze-html blaze-markup byteable bytestring conduit
+ conduit-extra containers cryptonite data-default email-validate
+ file-embed http-client http-conduit http-types lifted-base memory
+ mime-mail network-uri nonce persistent persistent-template random
+ resourcet safe shakespeare template-haskell text time transformers
+ unordered-containers wai yesod-core yesod-form yesod-persistent
+ ];
+ homepage = "http://www.yesodweb.com/";
+ description = "Authentication for Yesod";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-auth-account" = callPackage
({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
, mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -204431,6 +205627,52 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-core_1_4_35" = callPackage
+ ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+ , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+ , cereal, clientsession, conduit, conduit-extra, containers, cookie
+ , criterion, data-default, deepseq, deepseq-generics, directory
+ , exceptions, fast-logger, hspec, hspec-expectations, http-types
+ , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+ , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+ , random, resourcet, safe, semigroups, shakespeare
+ , streaming-commons, template-haskell, text, time, transformers
+ , transformers-base, unix-compat, unordered-containers, vector, wai
+ , wai-extra, wai-logger, warp, word8
+ }:
+ mkDerivation {
+ pname = "yesod-core";
+ version = "1.4.35";
+ sha256 = "1wawpd2pwqn535zrs5wz43jvi0bca0q2kinml6waw5d4s7m0npby";
+ revision = "1";
+ editedCabalFile = "1cgizphqsjd6qmz7xa1flcg064rg5543shybqx6l2npyr21h67yk";
+ libraryHaskellDepends = [
+ aeson auto-update base blaze-builder blaze-html blaze-markup
+ byteable bytestring case-insensitive cereal clientsession conduit
+ conduit-extra containers cookie data-default deepseq
+ deepseq-generics directory exceptions fast-logger http-types
+ lifted-base monad-control monad-logger mtl mwc-random old-locale
+ parsec path-pieces primitive random resourcet safe semigroups
+ shakespeare template-haskell text time transformers
+ transformers-base unix-compat unordered-containers vector wai
+ wai-extra wai-logger warp word8
+ ];
+ testHaskellDepends = [
+ async base blaze-builder bytestring clientsession conduit
+ conduit-extra containers cookie hspec hspec-expectations http-types
+ HUnit lifted-base mwc-random network path-pieces QuickCheck random
+ resourcet shakespeare streaming-commons template-haskell text
+ transformers wai wai-extra
+ ];
+ benchmarkHaskellDepends = [
+ base blaze-html bytestring criterion shakespeare text transformers
+ ];
+ homepage = "http://www.yesodweb.com/";
+ description = "Creation of type-safe, RESTful web applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-crud" = callPackage
({ mkDerivation, base, classy-prelude, containers, MissingH
, monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -205436,6 +206678,42 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-static_1_5_3" = callPackage
+ ({ mkDerivation, async, attoparsec, base, base64-bytestring
+ , blaze-builder, byteable, bytestring, conduit, conduit-extra
+ , containers, cryptohash, cryptohash-conduit, css-text
+ , data-default, directory, exceptions, file-embed, filepath
+ , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
+ , process, resourcet, template-haskell, text, transformers
+ , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
+ , yesod-core, yesod-test
+ }:
+ mkDerivation {
+ pname = "yesod-static";
+ version = "1.5.3";
+ sha256 = "0raxbnr1xpxgirh2fhs3m277yzbklf6k3dijrrx4kh2bnaiax1ml";
+ libraryHaskellDepends = [
+ async attoparsec base base64-bytestring blaze-builder byteable
+ bytestring conduit conduit-extra containers cryptohash
+ cryptohash-conduit css-text data-default directory exceptions
+ file-embed filepath hashable hjsmin http-types mime-types old-time
+ process resourcet template-haskell text transformers unix-compat
+ unordered-containers wai wai-app-static yesod-core
+ ];
+ testHaskellDepends = [
+ async base base64-bytestring byteable bytestring conduit
+ conduit-extra containers cryptohash cryptohash-conduit data-default
+ directory exceptions file-embed filepath hjsmin hspec http-types
+ HUnit mime-types old-time process resourcet template-haskell text
+ transformers unix-compat unordered-containers wai wai-app-static
+ wai-extra yesod-core yesod-test
+ ];
+ homepage = "http://www.yesodweb.com/";
+ description = "Static file serving subsite for Yesod Web Framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-static-angular" = callPackage
({ mkDerivation, aeson, base, blaze-builder, blaze-markup
, bytestring, data-default, directory, filepath, hamlet, hspec
@@ -205517,6 +206795,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-test_1_5_6" = callPackage
+ ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+ , blaze-markup, bytestring, case-insensitive, containers, cookie
+ , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+ , monad-control, network, persistent, pretty-show, text, time
+ , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+ , yesod-form
+ }:
+ mkDerivation {
+ pname = "yesod-test";
+ version = "1.5.6";
+ sha256 = "1zb3zm6id0nnsbpic8643b1p0x6yx1in8x1c7n36wbp9crinr0h3";
+ libraryHaskellDepends = [
+ attoparsec base blaze-builder blaze-html blaze-markup bytestring
+ case-insensitive containers cookie hspec-core html-conduit
+ http-types HUnit monad-control network persistent pretty-show text
+ time transformers wai wai-extra xml-conduit xml-types yesod-core
+ ];
+ testHaskellDepends = [
+ base bytestring containers hspec html-conduit http-types HUnit
+ lifted-base text wai xml-conduit yesod-core yesod-form
+ ];
+ homepage = "http://www.yesodweb.com";
+ description = "integration testing for WAI/Yesod Applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-test-json" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, hspec
, http-types, HUnit, text, transformers, wai, wai-test
@@ -206637,8 +207943,8 @@ self: {
}:
mkDerivation {
pname = "zerobin";
- version = "1.5.1";
- sha256 = "16lfkjzmfmhqran2ax6x78g2llblzz0j0i6jsiv4qd2i3iyliwz0";
+ version = "1.5.2";
+ sha256 = "0lwrwaydayklbcs6msdzfc187fr1mqbf64yq0lcw5v04a3papyw0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206714,6 +208020,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) zeromq;};
+ "zeromq4-conduit" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, lifted-base
+ , monad-control, mtl, resourcet, semigroups, transformers
+ , transformers-base, zeromq4-haskell
+ }:
+ mkDerivation {
+ pname = "zeromq4-conduit";
+ version = "0.1.0.0";
+ sha256 = "1qyk0ha21afa7hi1hpl6qk3bhcrs0a0kg0160hfrf6aw7l24dgi2";
+ libraryHaskellDepends = [
+ base bytestring conduit lifted-base monad-control mtl resourcet
+ semigroups transformers transformers-base zeromq4-haskell
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/itkovian/zeromq4-conduit#readme";
+ description = "Conduit wrapper around zeromq4-haskell";
+ license = stdenv.lib.licenses.lgpl21;
+ }) {};
+
"zeromq4-haskell" = callPackage
({ mkDerivation, async, base, bytestring, containers, exceptions
, monad-control, QuickCheck, semigroups, tasty, tasty-hunit
@@ -206787,14 +208112,14 @@ self: {
"zifter-cabal" = callPackage
({ mkDerivation, base, directory, filepath, path, path-io, process
- , zifter
+ , safe, zifter
}:
mkDerivation {
pname = "zifter-cabal";
- version = "0.0.0.1";
- sha256 = "0ca82bprk2zxv06jllhdpfp2ajcmd943pkggyhs3v31v71mg4c3d";
+ version = "0.0.0.2";
+ sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5";
libraryHaskellDepends = [
- base directory filepath path path-io process zifter
+ base directory filepath path path-io process safe zifter
];
homepage = "http://cs-syd.eu";
description = "zifter-cabal";
@@ -206869,14 +208194,14 @@ self: {
"zifter-stack" = callPackage
({ mkDerivation, base, Cabal, directory, filepath, path, path-io
- , process, zifter
+ , process, safe, zifter
}:
mkDerivation {
pname = "zifter-stack";
- version = "0.0.0.2";
- sha256 = "1mxaxflisrial3rhzij57vbbc4bf3g02byaz6xqa54jnawp1bwdl";
+ version = "0.0.0.4";
+ sha256 = "0vgklhbq846xh020n4mp4j96zbpc2asnsn1zk716pfnkgvk9syqn";
libraryHaskellDepends = [
- base Cabal directory filepath path path-io process zifter
+ base Cabal directory filepath path path-io process safe zifter
];
homepage = "http://cs-syd.eu";
description = "zifter-stack";
@@ -206973,6 +208298,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) zip;};
+ "zip-archive_0_3_1" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, containers
+ , digest, directory, filepath, HUnit, mtl, old-time, pretty
+ , process, temporary, text, time, unix, zlib
+ }:
+ mkDerivation {
+ pname = "zip-archive";
+ version = "0.3.1";
+ sha256 = "0ywy6isvyizs5d27lh108y6k4qnwmbcdmvzsrm3r45bwcj1nii5f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers digest directory filepath
+ mtl old-time pretty text time unix zlib
+ ];
+ testHaskellDepends = [
+ base bytestring directory HUnit old-time process temporary time
+ unix
+ ];
+ homepage = "http://github.com/jgm/zip-archive";
+ description = "Library for creating and modifying zip archives";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zip-conduit" = callPackage
({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
, criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
@@ -207122,6 +208472,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ziptastic-client_0_3_0_3" = callPackage
+ ({ mkDerivation, base, base-compat, hspec, http-client
+ , http-client-tls, http-types, iso3166-country-codes, servant
+ , servant-client, text, ziptastic-core
+ }:
+ mkDerivation {
+ pname = "ziptastic-client";
+ version = "0.3.0.3";
+ sha256 = "0phw247dbm68bbb9k9z4jiva0gz9yhirggcnsrvm697kzya9s25g";
+ libraryHaskellDepends = [
+ base base-compat http-client iso3166-country-codes servant
+ servant-client text ziptastic-core
+ ];
+ testHaskellDepends = [
+ base base-compat hspec http-client http-client-tls http-types
+ iso3166-country-codes servant-client
+ ];
+ homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
+ description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ziptastic-core" = callPackage
({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
, http-api-data, iso3166-country-codes, servant, text, tz
@@ -207142,6 +208515,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ziptastic-core_0_2_0_3" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
+ , http-api-data, iso3166-country-codes, servant, text, tz
+ }:
+ mkDerivation {
+ pname = "ziptastic-core";
+ version = "0.2.0.3";
+ sha256 = "1c2ahblhqk4dq3105w3qd0j7isn3r0m7vvm5drd5g1ian37ywqwf";
+ libraryHaskellDepends = [
+ aeson base base-compat bytestring http-api-data
+ iso3166-country-codes servant text tz
+ ];
+ testHaskellDepends = [
+ aeson base base-compat here hspec iso3166-country-codes text tz
+ ];
+ homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
+ description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zlib_0_5_4_2" = callPackage
({ mkDerivation, base, bytestring, zlib }:
mkDerivation {
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index e599b56545d9..f933d6ebfeb9 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -7,7 +7,8 @@
# arguments:
# * ghc package to use
# * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second
-{ ghc, package-set }:
+# * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality
+{ ghc, package-set, extensible-self }:
# return value: a function from self to the package set
self: let
@@ -116,6 +117,30 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# Creates a Haskell package from a source package by calling cabal2nix on the source.
callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
+ # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet
+ # Given a set whose values are either paths or version strings, produces
+ # a package override set (i.e. (self: super: { etc. })) that sets
+ # the packages named in the input set to the corresponding versions
+ packageSourceOverrides =
+ overrides: self: super: pkgs.lib.mapAttrs (name: src:
+ let isPath = x: builtins.substring 0 1 (toString x) == "/";
+ generateExprs = if isPath src
+ then self.callCabal2nix
+ else self.callHackage;
+ in generateExprs name src {}) overrides;
+
+ # : { root : Path, source-overrides : Defaulted (Either Path VersionNumber } -> NixShellAwareDerivation
+ # Given a path to a haskell package directory whose cabal file is
+ # named the same as the directory name, and an optional set of
+ # source overrides as appropriate for the 'packageSourceOverrides'
+ # function, return a derivation appropriate for nix-build or nix-shell
+ # to build that package.
+ developPackage = { root, source-overrides ? {} }:
+ let name = builtins.baseNameOf root;
+ drv =
+ (extensible-self.extend (self.packageSourceOverrides source-overrides)).callCabal2nix name root {};
+ in if pkgs.lib.inNixShell then drv.env else drv;
+
ghcWithPackages = selectFrom: withPackages (selectFrom self);
ghcWithHoogle = selectFrom:
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 7cb2a356f951..f4f52ec4ed33 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -79,7 +79,7 @@ let
description = "A clojure-like lisp, built with the pypy vm toolkit";
homepage = "https://github.com/pixie-lang/pixie";
license = stdenv.lib.licenses.lgpl3;
- platforms = stdenv.lib.platforms.linux;
+ platforms = ["x86_64-linux" "i686-linux"];
};
};
in build (builtins.getAttr variant variants)
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index b37fd6079b9e..2580b959bf2a 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
inherit version;
description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ];
- platforms = platforms.unix;
+ platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
license = licenses.bsd2;
};
passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index e572db68e838..fbefee48d5b2 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "chmlib-0.40";
-
+
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.jedrea.com/chmlib;
- license = "LGPL";
+ license = stdenv.lib.licenses.lgpl2;
description = "A library for dealing with Microsoft ITSS/CHM format files";
- platforms = stdenv.lib.platforms.unix;
+ platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
};
}
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 848cae09ed47..d5b2632a3716 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -230,11 +230,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
- sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp";
+ sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r";
};
patchPhase = ''patchShebangs .
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix
index d6380b795af8..342137553135 100644
--- a/pkgs/development/libraries/ffmpeg/3.3.nix
+++ b/pkgs/development/libraries/ffmpeg/3.3.nix
@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
- branch = "3.3.1";
- sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw";
+ branch = "3.3.2";
+ sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91";
darwinFrameworks = [ Cocoa CoreMedia ];
})
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
new file mode 100644
index 000000000000..85550b5d5289
--- /dev/null
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -0,0 +1,98 @@
+{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
+, pango, pkgconfig, substituteAll, which }:
+
+stdenv.mkDerivation rec {
+ name = "gtkd-${version}";
+ version = "3.6.5";
+
+ src = fetchzip {
+ url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
+ sha256 = "1ypxxqklad5wwyvc39wnphnqp5y4q5zbf9j5mxb3bg9vnls48vx1";
+ stripRoot = false;
+ };
+
+ nativeBuildInputs = [ dmd pkgconfig which ];
+ propagatedBuildInputs = [
+ atk cairo gdk_pixbuf glib gstreamer gst_plugins_base gtk3 gtksourceview
+ libgda libpeas librsvg pango vte
+ ];
+
+ prePatch = ''
+ substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
+ substituteInPlace src/cairo/gtkc/cairo-compiletime.d \
+ --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
+ --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
+ substituteInPlace src/cairo/gtkc/cairo-runtime.d \
+ --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
+ --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
+ substituteInPlace generated/gtkd/gtkc/gdkpixbuf.d \
+ --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
+ --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
+ substituteInPlace generated/gtkd/gtkc/atk.d \
+ --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
+ --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
+ substituteInPlace generated/gtkd/gtkc/pango.d \
+ --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \
+ --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
+ --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
+ --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
+ substituteInPlace generated/gtkd/gtkc/gobject.d \
+ --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
+ --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+ substituteInPlace generated/gtkd/gtkc/rsvg.d \
+ --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
+ --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
+ substituteInPlace generated/gtkd/gtkc/cairo.d \
+ --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
+ --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
+ substituteInPlace generated/gtkd/gtkc/gdk.d \
+ --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
+ --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib
+ substituteInPlace generated/peas/peasc/peas.d \
+ --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \
+ --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \
+ --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \
+ --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib
+ substituteInPlace generated/vte/vtec/vte.d \
+ --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \
+ --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib
+ substituteInPlace generated/gstreamer/gstreamerc/gstinterfaces.d \
+ --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \
+ --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib
+ substituteInPlace generated/sourceview/gsvc/gsv.d \
+ --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
+ --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
+ substituteInPlace generated/gtkd/gtkc/glib.d \
+ --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
+ --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
+ --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
+ --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
+ --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
+ --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+ substituteInPlace generated/gtkd/gtkc/gio.d \
+ --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
+ --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
+ substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \
+ --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
+ --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
+ substituteInPlace generated/gtkd/gtkc/gtk.d \
+ --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
+ --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \
+ --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \
+ --replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib
+ '';
+
+ installFlags = "prefix=$(out)";
+
+ inherit atk cairo gdk_pixbuf librsvg pango;
+ inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte;
+ inherit (gst_all_1) gstreamer;
+ gst_plugins_base = gst_all_1.gst-plugins-base;
+
+ meta = with stdenv.lib; {
+ description = "D binding and OO wrapper for GTK+";
+ homepage = "https://gtkd.org";
+ licence = licenses.lgpl3Plus;
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/development/libraries/gtkd/paths.d b/pkgs/development/libraries/gtkd/paths.d
new file mode 100644
index 000000000000..0f857136499f
--- /dev/null
+++ b/pkgs/development/libraries/gtkd/paths.d
@@ -0,0 +1,142 @@
+/*
+ * gtkD is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version, with
+ * some exceptions, please read the COPYING file.
+ *
+ * gtkD is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with gtkD; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ *
+ * paths.d -- list of libraries that will be dynamically linked with gtkD
+ *
+ * Added: John Reimer -- 2004-12-20
+ * Updated: 2005-02-21 changed names; added version(linux)
+ * Updated: 2005-05-05 updated Linux support
+ * Updated: 2008-02-16 Tango support
+ */
+
+module gtkd.paths;
+
+/*
+ * Define the Libraries that gtkD will be using.
+ * This is a growable list, as long as the programmer
+ * also adds to the importLibs list.
+ */
+
+enum LIBRARY
+{
+ ATK,
+ CAIRO,
+ GDK,
+ GDKPIXBUF,
+ GLIB,
+ GMODULE,
+ GOBJECT,
+ GIO,
+ GTHREAD,
+ GTK,
+ PANGO,
+ PANGOCAIRO,
+ GLGDK,
+ GLGTK,
+ GDA,
+ GSV,
+ GSV1,
+ GSTREAMER,
+ GSTINTERFACES,
+ VTE,
+ PEAS,
+ RSVG,
+}
+
+version (Windows)
+{
+ const string[LIBRARY.max+1] importLibs =
+ [
+ LIBRARY.ATK: "libatk-1.0-0.dll",
+ LIBRARY.CAIRO: "libcairo-2.dll",
+ LIBRARY.GDK: "libgdk-3-0.dll",
+ LIBRARY.GDKPIXBUF: "libgdk_pixbuf-2.0-0.dll",
+ LIBRARY.GLIB: "libglib-2.0-0.dll",
+ LIBRARY.GMODULE: "libgmodule-2.0-0.dll",
+ LIBRARY.GOBJECT: "libgobject-2.0-0.dll",
+ LIBRARY.GIO: "libgio-2.0-0.dll",
+ LIBRARY.GTHREAD: "libgthread-2.0-0.dll",
+ LIBRARY.GTK: "libgtk-3-0.dll",
+ LIBRARY.PANGO: "libpango-1.0-0.dll",
+ LIBRARY.PANGOCAIRO: "libpangocairo-1.0-0.dll",
+ LIBRARY.GLGDK: "libgdkglext-3.0-0.dll",
+ LIBRARY.GLGTK: "libgtkglext-3.0-0.dll",
+ LIBRARY.GDA: "libgda-4.0-4.dll",
+ LIBRARY.GSV: "libgtksourceview-3.0-0.dll",
+ LIBRARY.GSV1: "libgtksourceview-3.0-1.dll",
+ LIBRARY.GSTREAMER: "libgstreamer-1.0.dll",
+ LIBRARY.GSTINTERFACES: "libgstvideo-1.0.dll",
+ LIBRARY.VTE: "libvte-2.91.dll",
+ LIBRARY.PEAS: "libpeas-1.0.dll",
+ LIBRARY.RSVG: "librsvg-2-2.dll",
+ ];
+}
+else version(darwin)
+{
+ const string[LIBRARY.max+1] importLibs =
+ [
+ LIBRARY.ATK: "@atk@/lib/libatk-1.0.dylib",
+ LIBRARY.CAIRO: "@cairo@/lib/libcairo.dylib",
+ LIBRARY.GDK: "@gtk3@/lib/libgdk-3.0.dylib",
+ LIBRARY.GDKPIXBUF: "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.dylib",
+ LIBRARY.GLIB: "@glib@/lib/libglib-2.0.dylib",
+ LIBRARY.GMODULE: "@glib@/lib/libgmodule-2.0.dylib",
+ LIBRARY.GOBJECT: "@glib@/lib/libgobject-2.0.dylib",
+ LIBRARY.GIO: "@glib@/lib/libgio-2.0.dylib",
+ LIBRARY.GTHREAD: "@glib@/lib/libgthread-2.0.dylib",
+ LIBRARY.GTK: "@gtk3@/lib/libgtk-3.0.dylib",
+ LIBRARY.PANGO: "@pango@/lib/libpango-1.0.dylib",
+ LIBRARY.PANGOCAIRO: "@pango@/lib/libpangocairo-1.0.dylib",
+ LIBRARY.GLGDK: "libgdkglext-3.0.dylib",
+ LIBRARY.GLGTK: "libgtkglext-3.0.dylib",
+ LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib",
+ LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
+ LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
+ LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib",
+ LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib",
+ LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib",
+ LIBRARY.PEAS: "@libpeas@/lib/libpeas-1.0.dylib",
+ LIBRARY.RSVG: "@librsvg@/lib/librsvg-2.dylib",
+ ];
+}
+else
+{
+ const string[LIBRARY.max+1] importLibs =
+ [
+ LIBRARY.ATK: "@atk@/lib/libatk-1.0.so.0",
+ LIBRARY.CAIRO: "@cairo@/lib/libcairo.so.2",
+ LIBRARY.GDK: "@gtk3@/lib/libgdk-3.so.0",
+ LIBRARY.GDKPIXBUF: "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0",
+ LIBRARY.GLIB: "@glib@/lib/libglib-2.0.so.0",
+ LIBRARY.GMODULE: "@glib@/lib/libgmodule-2.0.so.0",
+ LIBRARY.GOBJECT: "@glib@/lib/libgobject-2.0.so.0",
+ LIBRARY.GIO: "@glib@/lib/libgio-2.0.so.0",
+ LIBRARY.GTHREAD: "@glib@/lib/libgthread-2.0.so.0",
+ LIBRARY.GTK: "@gtk3@/lib/libgtk-3.so.0",
+ LIBRARY.PANGO: "@pango@/lib/libpango-1.0.so.0",
+ LIBRARY.PANGOCAIRO: "@pango@/lib/libpangocairo-1.0.so.0",
+ LIBRARY.GLGDK: "libgdkglext-3.0.so.0",
+ LIBRARY.GLGTK: "libgtkglext-3.0.so.0",
+ LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4",
+ LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0",
+ LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1",
+ LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0",
+ LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0",
+ LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0",
+ LIBRARY.PEAS: "@libpeas@/lib/libpeas-1.0.so.0",
+ LIBRARY.RSVG: "@librsvg@/lib/librsvg-2.so.2",
+ ];
+}
diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index b78bbda5d5e7..8c4a5390f554 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 02a2fc1f3de3..ea30c5b04c4d 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
{pkgs ? import {
inherit system;
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index bd1de3e9f93e..356e78f027bf 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -57,60 +57,6 @@ let
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
- let
- fixImpureDependencies = writeTextFile {
- name = "fixDependencies.js";
- text = ''
- var fs = require('fs');
- var url = require('url');
-
- /*
- * Replaces an impure version specification by *
- */
- function replaceImpureVersionSpec(versionSpec) {
- var parsedUrl = url.parse(versionSpec);
-
- if(versionSpec == "latest" || versionSpec == "unstable" ||
- versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
- return '*';
- else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
- parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
- return '*';
- else
- return versionSpec;
- }
-
- var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
- /* Replace dependencies */
- if(packageObj.dependencies !== undefined) {
- for(var dependency in packageObj.dependencies) {
- var versionSpec = packageObj.dependencies[dependency];
- packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
- }
- }
-
- /* Replace development dependencies */
- if(packageObj.devDependencies !== undefined) {
- for(var dependency in packageObj.devDependencies) {
- var versionSpec = packageObj.devDependencies[dependency];
- packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
- }
- }
-
- /* Replace optional dependencies */
- if(packageObj.optionalDependencies !== undefined) {
- for(var dependency in packageObj.optionalDependencies) {
- var versionSpec = packageObj.optionalDependencies[dependency];
- packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
- }
- }
-
- /* Write the fixed JSON file */
- fs.writeFileSync("package.json", JSON.stringify(packageObj));
- '';
- };
- in
''
DIR=$(pwd)
cd $TMPDIR
@@ -150,17 +96,97 @@ let
# Unset the stripped name to not confuse the next unpack step
unset strippedName
- # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
- # The following JavaScript replaces these by * to prevent that
- cd "$DIR/${packageName}"
- node ${fixImpureDependencies}
-
# Include the dependencies of the package
+ cd "$DIR/${packageName}"
${includeDependencies { inherit dependencies; }}
cd ..
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
'';
+ pinpointDependencies = {dependencies, production}:
+ let
+ pinpointDependenciesFromPackageJSON = writeTextFile {
+ name = "pinpointDependencies.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function resolveDependencyVersion(location, name) {
+ if(location == process.env['NIX_STORE']) {
+ return null;
+ } else {
+ var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+ if(fs.existsSync(dependencyPackageJSON)) {
+ var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+ if(dependencyPackageObj.name == name) {
+ return dependencyPackageObj.version;
+ }
+ } else {
+ return resolveDependencyVersion(path.resolve(location, ".."), name);
+ }
+ }
+ }
+
+ function replaceDependencies(dependencies) {
+ if(typeof dependencies == "object" && dependencies !== null) {
+ for(var dependency in dependencies) {
+ var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+ if(resolvedVersion === null) {
+ process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+ } else {
+ dependencies[dependency] = resolvedVersion;
+ }
+ }
+ }
+ }
+
+ /* Read the package.json configuration */
+ var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+ /* Pinpoint all dependencies */
+ replaceDependencies(packageObj.dependencies);
+ if(process.argv[2] == "development") {
+ replaceDependencies(packageObj.devDependencies);
+ }
+ replaceDependencies(packageObj.optionalDependencies);
+
+ /* Write the fixed package.json file */
+ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+ '';
+ };
+ in
+ ''
+ node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+ ${stdenv.lib.optionalString (dependencies != [])
+ ''
+ if [ -d node_modules ]
+ then
+ cd node_modules
+ ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+ cd ..
+ fi
+ ''}
+ '';
+
+ # Recursively traverses all dependencies of a package and pinpoints all
+ # dependencies in the package.json file to the versions that are actually
+ # being used.
+
+ pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+ ''
+ if [ -d "${packageName}" ]
+ then
+ cd "${packageName}"
+ ${pinpointDependencies { inherit dependencies production; }}
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ fi
+ '';
+
# Extract the Node.js source code which is used to compile packages with
# native bindings
nodeSources = runCommand "node-sources" {} ''
@@ -183,7 +209,9 @@ let
buildPhase = args.buildPhase or "true";
compositionScript = composePackage args;
- passAsFile = [ "compositionScript" ];
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+ passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = args.installPhase or ''
# Create and enter a root node_modules/ folder
@@ -192,6 +220,10 @@ let
# Compose the package and all its dependencies
source $compositionScriptPath
+
+ # Pinpoint the versions of all dependencies to the ones that are actually being used
+ echo "pinpointing versions of dependencies..."
+ source $pinpointDependenciesScriptPath
# Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible
@@ -254,12 +286,18 @@ let
buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
includeScript = includeDependencies { inherit dependencies; };
- passAsFile = [ "includeScript" ];
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+ passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
buildCommand = ''
mkdir -p $out/lib
cd $out/lib
source $includeScriptPath
+
+ # Pinpoint the versions of all dependencies to the ones that are actually being used
+ echo "pinpointing versions of dependencies..."
+ source $pinpointDependenciesScriptPath
# Create fake package.json to make the npm commands work properly
cat > package.json < mig != null && hurd != null;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/gdb/${basename}.tar.xz";
- sha256 = "11ii260h1sd7v0bs3cz6d5l8gqxxgldry0md60ncjgixjw5nh1s6";
+ sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn";
};
nativeBuildInputs = [ pkgconfig texinfo perl ]
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index bee323176d88..273eb014180f 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
- version = "8.0.0";
+ version = "8.1.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
- sha256 = "072g2zv58aa5zxs8fs9bdsi3mqklf2yj9mf58yjg5frbcfikm395";
+ sha256 = "1z3pcyxni8qmxljz6vbghm8242sr63l0dbc7x22ywbbqkfv21zzj";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 62f94ae6fc9f..6adc2a765c7f 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, substituteAll
, pkgconfig
+, makeWrapper
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
-, net_snmp, openssl, polkit
+, net_snmp, openssl, polkit, nettools
, bash, coreutils, utillinux
, qtSupport ? true
, withPlugin ? false
@@ -22,20 +23,17 @@ let
sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
};
- hplipState =
- substituteAll
- {
- inherit version;
- src = ./hplip.state;
- };
+ hplipState = substituteAll {
+ inherit version;
+ src = ./hplip.state;
+ };
- hplipPlatforms =
- {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
- };
+ hplipPlatforms = {
+ "i686-linux" = "x86_32";
+ "x86_64-linux" = "x86_64";
+ "armv6l-linux" = "arm32";
+ "armv7l-linux" = "arm32";
+ };
hplipArch = hplipPlatforms."${stdenv.system}"
or (throw "HPLIP not supported on ${stdenv.system}");
@@ -63,6 +61,7 @@ pythonPackages.buildPythonApplication {
nativeBuildInputs = [
pkgconfig
+ makeWrapper
];
propagatedBuildInputs = with pythonPackages; [
@@ -146,6 +145,9 @@ pythonPackages.buildPythonApplication {
'';
postFixup = ''
+ wrapProgram $out/lib/cups/filter/hpps \
+ --prefix PATH : "${nettools}/bin"
+
substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
'' + stdenv.lib.optionalString (!withPlugin) ''
# A udev rule to notify users that they need the binary plugin.
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4c14581e3311..07ccd419f4bc 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -69,6 +69,12 @@ in rec {
filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
};
+ ubootA20OlinuxinoLime = buildUBoot rec {
+ defconfig = "A20-OLinuXino-Lime_defconfig";
+ targetPlatforms = ["armv7l-linux"];
+ filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+ };
+
ubootBananaPi = buildUBoot rec {
defconfig = "Bananapi_defconfig";
targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index fc35dfdda476..58141a4cf0ee 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -3,16 +3,16 @@
stdenv.mkDerivation rec {
name = "clickhouse-${version}";
- version = "1.1.54190";
+ version = "1.1.54236";
src = fetchFromGitHub {
owner = "yandex";
repo = "ClickHouse";
rev = "v${version}-stable";
- sha256 = "03snzrhz3ai66fqy3rh89cgmpiaskg3077zflkwzqxwx69jkmqix";
+ sha256 = "1mfjr1yzvf810vbb35c2rknvqnc4mkncl56ja48myn7hc9p457d7";
};
- patches = [ ./prefix.patch ./termcap.patch ];
+ patches = [ ./termcap.patch ];
nativeBuildInputs = [ cmake libtool ];
diff --git a/pkgs/servers/clickhouse/prefix.patch b/pkgs/servers/clickhouse/prefix.patch
deleted file mode 100644
index a311bf83dd9a..000000000000
--- a/pkgs/servers/clickhouse/prefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ccc3596aa3ca041f457bf44d3437d935f56e82a4 Mon Sep 17 00:00:00 2001
-From: Orivej Desh
-Date: Sun, 26 Mar 2017 23:57:32 +0000
-Subject: [PATCH] Do not override CMAKE_INSTALL_PREFIX
-
----
- CMakeLists.txt | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 517b25e..6d8ced2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,12 +141,7 @@ if (ENABLE_TESTS)
- endif (ENABLE_TESTS)
-
- # Installation prefix
--if (NOT CMAKE_SYSTEM MATCHES "FreeBSD")
-- set (CMAKE_INSTALL_PREFIX /usr)
-- set (CLICKHOUSE_ETC_DIR /etc)
--else ()
-- set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
--endif ()
-+set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
-
-
- option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF)
---
-2.12.0
-
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 16e339b41c27..a1d3a059a830 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -29,15 +29,16 @@ stdenv.mkDerivation rec {
postInstall = stdenv.lib.optionalString mimiSupport ''
cp ${mimisrc}/xdg-open $out/bin/xdg-open
- ''
- + ''
- for tool in "${coreutils}/bin/cut" "${gnused}/bin/sed" \
- "${gnugrep}"/bin/{e,}grep "${file}/bin/file" \
- ${stdenv.lib.optionalString mimiSupport
- '' "${gawk}/bin/awk" "${coreutils}/bin/sort" ''} ;
- do
- sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/*
- done
+ '' + ''
+ sed '2s#.#\
+ cut() { ${coreutils}/bin/cut "$@"; }\
+ sed() { ${gnused}/bin/sed "$@"; }\
+ grep() { ${gnugrep}/bin/grep "$@"; }\
+ egrep() { ${gnugrep}/bin/egrep "$@"; }\
+ file() { ${file}/bin/file "$@"; }\
+ awk() { ${gawk}/bin/awk "$@"; }\
+ sort() { ${coreutils}/bin/sort "$@"; }\
+ &#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \
--replace "/usr/bin/printf" "${coreutils}/bin/printf"
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index 288cd14c16bb..1eedff5c011e 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, utillinux }:
+{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
stdenv.mkDerivation rec {
name = "bcache-tools-${version}";
version = "1.0.7";
src = fetchurl {
+ name = "${name}.tar.gz";
url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
};
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
preBuild = ''
export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\"";
+ sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules
'';
preInstall = ''
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index d63819ade215..b885b5ed09d5 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,48 +6,41 @@
let
python = python3Packages.python;
wrapPython = python3Packages.wrapPython;
- date = "2017-01-22";
+ version = "1.1";
in
stdenv.mkDerivation {
- name = "autorandr-unstable-${date}";
+ name = "autorandr-${version}";
- buildInputs = [ python wrapPython ];
-
- phases = [ "unpackPhase" "installPhase" ];
+ buildInputs = [ python ];
installPhase = ''
+ runHook preInstall
make install TARGETS='autorandr' PREFIX=$out
- wrapPythonProgramsIn $out/bin/autorandr $out
make install TARGETS='bash_completion' DESTDIR=$out
make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out
- ${if false then ''
- # breaks systemd-udev-settle during boot so disabled
+ ${if systemd != null then ''
make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \
SYSTEMD_UNIT_DIR=/lib/systemd/system \
UDEV_RULES_DIR=/etc/udev/rules.d
substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \
- --replace /bin "${systemd}/bin"
- '' else if systemd != null then ''
- make install TARGETS='systemd' PREFIX=$out DESTDIR=$out \
- SYSTEMD_UNIT_DIR=/lib/systemd/system
- make install TARGETS='udev' PREFIX=$out DESTDIR=$out \
- UDEV_RULES_DIR=/etc/udev/rules.d
+ --replace /bin/systemctl "${systemd}/bin/systemctl"
'' else ''
make install TARGETS='pmutils' DESTDIR=$out \
PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d
make install TARGETS='udev' PREFIX=$out DESTDIR=$out \
UDEV_RULES_DIR=/etc/udev/rules.d
''}
+ runHook postInstall
'';
src = fetchFromGitHub {
owner = "phillipberndt";
repo = "autorandr";
- rev = "855c18b7f2cfd364d6f085d4301b5b98ba6e572a";
- sha256 = "1yp1gns3lwa8796cb7par9czkc9i7paap2fkzf7wj6zqlkgjdvv0";
+ rev = "${version}";
+ sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd";
};
meta = {
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index dd62fe461c6f..016e9726ad99 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "qt5ct-${version}";
- version = "0.32";
+ version = "0.33";
src = fetchurl {
url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
- sha256 = "0gzmqx6j8g8vgdg5sazfw31h825jdsjbkj8lk167msvahxgrf0fm";
+ sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
};
nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 906e3eda3a65..ae36980a60d8 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Udev helper for naming devices per BIOS names";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = ["x86_64-linux" "i686-linux"];
maintainers = with maintainers; [ cstrahan ];
};
}
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 56ea13de40e5..837ec5b7a5ff 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "grin-1.2.1";
+ program = "grin";
+ version = "1.2.1";
+ name = "${program}-${version}";
namePrefix = "";
- src = fetchurl {
- url = "mirror://pypi/g/grin/${name}.tar.gz";
- sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
+ src = fetchFromGitHub {
+ owner = "rkern";
+ repo = program;
+ rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f";
+ sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd";
};
buildInputs = with python2Packages; [ nose ];
- propagatedBuildInputs = with python2Packages; [ argparse ];
meta = {
- homepage = https://pypi.python.org/pypi/grin;
+ homepage = https://github.com/rkern/grin;
description = "A grep program configured the way I like it";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.sjagoe ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3678faefd5d4..959f7f6ea038 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -474,6 +474,9 @@ with pkgs;
arp-scan = callPackage ../tools/misc/arp-scan { };
+ inherit (callPackages ../data/fonts/arphic {})
+ arphic-ukai arphic-uming;
+
artyFX = callPackage ../applications/audio/artyFX {};
as31 = callPackage ../development/compilers/as31 {};
@@ -1777,6 +1780,8 @@ with pkgs;
exiftags = callPackage ../tools/graphics/exiftags { };
+ exiftool = perlPackages.ImageExifTool;
+
extundelete = callPackage ../tools/filesystems/extundelete { };
expect = callPackage ../tools/misc/expect { };
@@ -2263,6 +2268,8 @@ with pkgs;
gtdialog = callPackage ../development/libraries/gtdialog {};
+ gtkd = callPackage ../development/libraries/gtkd { };
+
gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
gtkvnc = callPackage ../tools/admin/gtk-vnc {};
@@ -4340,6 +4347,8 @@ with pkgs;
tie = callPackage ../development/tools/misc/tie { };
+ tilix = callPackage ../applications/misc/tilix { };
+
tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
tiny8086 = callPackage ../applications/virtualization/8086tiny { };
@@ -6055,6 +6064,10 @@ with pkgs;
gtk2 = gtk2-x11;
};
+ lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance {
+ withGtk3 = true;
+ };
+
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
lxpanel = callPackage ../desktops/lxde/core/lxpanel {
@@ -12472,6 +12485,7 @@ with pkgs;
inherit (callPackage ../misc/uboot {})
buildUBoot
ubootTools
+ ubootA20OlinuxinoLime
ubootBananaPi
ubootBeagleboneBlack
ubootJetsonTK1
@@ -15488,6 +15502,7 @@ with pkgs;
profanity = callPackage ../applications/networking/instant-messengers/profanity {
notifySupport = config.profanity.notifySupport or true;
+ traySupport = config.profanity.traySupport or true;
autoAwaySupport = config.profanity.autoAwaySupport or true;
};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b2d0cdb373d..97ec906f30ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7135,11 +7135,12 @@ let self = _self // overrides; _self = with self; {
};
ImageExifTool = buildPerlPackage rec {
- name = "Image-ExifTool-9.27";
+ name = "Image-ExifTool-${version}";
+ version = "10.48";
src = fetchurl {
url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
- sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c";
+ sha256 = "1wbwapwhv4imh1lj4dw4a8z2mhw983wk5pzdbp7pkijfji0vjj0p";
};
meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68fedc6a96b7..87c469c937fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18100,44 +18100,7 @@ in {
};
};
- powerline = buildPythonPackage rec {
- rev = "2.5.2";
- name = "powerline-${rev}";
- src = pkgs.fetchurl {
- url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
- name = "${name}.tar.gz";
- sha256 = "064rp2jzz4vp1xqk3445qf08pq3aif00q1rjqaqx2pla15s27yrz";
- };
-
- propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];
-
- # error: This is still beta and some tests still fail
- doCheck = false;
-
- postInstall = ''
- install -dm755 "$out/share/fonts/OTF/"
- install -dm755 "$out/etc/fonts/conf.d"
- install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
- install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"
-
- install -dm755 "$out/share/vim/vimfiles/plugin"
- install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim"
-
- install -dm755 "$out/share/zsh/site-contrib"
- install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh"
-
- install -dm755 "$out/share/tmux"
- install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
- '';
-
- meta = {
- homepage = https://github.com/powerline/powerline;
- description = "The ultimate statusline/prompt utility";
- license = licenses.mit;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.all;
- };
- };
+ powerline = callPackage ../development/python-modules/powerline { };
pox = buildPythonPackage rec {
name = "pox-${version}";