diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 98129935257..6a7a7f4cee7 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -52,7 +52,7 @@ in
systemd.services.nix-gc =
{ description = "Nix Garbage Collector";
- script = "exec ${config.nix.package}/bin/nix-store --gc ${cfg.options}";
+ script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}";
startAt = optionalString cfg.automatic cfg.dates;
};
diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix
index 74065c862ef..2d5c7b192bc 100644
--- a/nixos/modules/services/x11/desktop-managers/e19.nix
+++ b/nixos/modules/services/x11/desktop-managers/e19.nix
@@ -62,7 +62,6 @@ in
waitPID=$!
'';
}];
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidPrograms = [ "e19_freqset" ];
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 507c2d2da13..fdee5fbc6c5 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -99,7 +99,6 @@ in {
networking.networkmanager.enable = mkDefault true;
services.upower.enable = config.powerManagement.enable;
hardware.bluetooth.enable = mkDefault true;
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = false; # true doesn't make sense here, GNOME just doesn't handle it anymore
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 7830e984219..21b6243ba18 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -111,7 +111,6 @@ in
exec ${kde_workspace}/bin/startkde
'';
};
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton
{ program = "kcheckpass";
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 01a8704fea7..5061d59b7c7 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -78,7 +78,6 @@ in
bgSupport = true;
start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
};
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton {
program = "kcheckpass";
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index e6d6efaf3a6..de00ff93b17 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -25,7 +25,6 @@ in
waitPID=$!
'';
}];
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages = [ pkgs.kodi ];
};
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 746f810a11f..88eefa13de3 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -37,7 +37,6 @@ in
exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
'';
};
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages =
[ pkgs.gtk # To get GTK+'s themes.
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index b9808f1ffa6..55af2ecbb76 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -35,7 +35,7 @@ in
type = types.bool;
default = false;
description = ''
- Automatically log in as the sepecified .
+ Automatically log in as the sepecified .
'';
};
@@ -68,6 +68,13 @@ in
config = mkIf cfg.gdm.enable {
+ assertions = [
+ { assertion = let autoLogin = cfg.gdm.autoLogin; in
+ if autoLogin.enable then autoLogin.user != null else true;
+ message = "GDM auto-login requires services.xserver.displayManager.gdm.autoLogin.user to be set";
+ }
+ ];
+
services.xserver.displayManager.slim.enable = false;
users.extraUsers.gdm =
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 2339cf7c649..ba078cc0a11 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -43,6 +43,17 @@ in
in future. So set this option explicitly to false if you wish.
'';
};
+ storageDriver =
+ mkOption {
+ type = types.enum ["aufs" "btrfs" "devicemapper" "overlay" "zfs"];
+ description =
+ ''
+ This option determines which Docker storage driver to use.
+ It is required but lacks a default value as its most
+ suitable value will depend the filesystems available on the
+ host.
+ '';
+ };
extraOptions =
mkOption {
type = types.separatedString " ";
@@ -85,7 +96,7 @@ in
after = [ "network.target" "docker.socket" ];
requires = [ "docker.socket" ];
serviceConfig = {
- ExecStart = "${pkgs.docker}/bin/docker --daemon=true --host=fd:// --group=docker ${cfg.extraOptions}";
+ ExecStart = "${pkgs.docker}/bin/docker daemon --host=fd:// --group=docker --storage-driver=${cfg.storageDriver} ${cfg.extraOptions}";
# I'm not sure if that limits aren't too high, but it's what
# goes in config bundled with docker itself
LimitNOFILE = 1048576;
@@ -111,7 +122,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
- ExecStart = "${pkgs.docker}/bin/docker --daemon=true --group=docker ${cfg.extraOptions}";
+ ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${cfg.extraOptions}";
# I'm not sure if that limits aren't too high, but it's what
# goes in config bundled with docker itself
LimitNOFILE = 1048576;
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index babb2b8e00e..034dcb04adf 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
{ config, pkgs, ... }:
{
virtualisation.docker.enable = true;
+ virtualisation.docker.storageDriver = "overlay";
};
};
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index c32ab32e9e9..fc2f9265ed6 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
};
in stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.0.10";
+ version = "1.0.0";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "16rbp76c46n24a9a3cygg94bx6y7j038h34w4qr7j24aiy5bfzwv";
+ sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
new file mode 100644
index 00000000000..3cc8156337e
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, emacs }:
+
+let
+ version = "3.6-4-gb659bf8";
+in
+stdenv.mkDerivation {
+ name = "ido-ubiquitous-${version}";
+
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "ido-ubiquitous";
+ rev = version;
+ sha256 = "06r8qpfr60gc673w881m0nplj91b6bfw77bxgl6irz1z9bp7cc4y";
+ };
+
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs -L . --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 5026efb7175..62f2cc80d6f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
, ApplicationServices }:
let
- version = "3.4.2";
+ version = "3.5.1";
name = "mercurial-${version}";
in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
- sha256 = "1kcfznv990mj30y4yk59hz4wkd3050h0hg7iib69w53nhi50xjfw";
+ sha256 = "1795ia6ghbqwfp4d6bz0qwlvzymh76zdgk2viikrkqq3ldfs8zcr";
};
inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index ccea8ffb3f2..40a3a3f9ae5 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -6,18 +6,13 @@
, which
}:
-let
- the_version = "6_5_9";
-
-in
-
stdenv.mkDerivation rec {
- name = "smartgithg-${the_version}";
+ name = "smartgithg-${version}";
+ version = "7_0_0";
src = fetchurl {
- url = "http://www.syntevo.com/downloads/smartgit/" +
- "smartgit-generic-${the_version}.tar.gz";
- sha256 = "09bvx1jgaqfxg8qv9f306bgh3k057shsi2xllxv1vw3xf0pvkbwa";
+ url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz";
+ sha256 = "099hnpczh2c0s86nsdybymmm4903n0bsjdq1fpdmm0x5w4216iy6";
};
buildInputs = [
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 9112337d0a4..532e20b9444 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -14,7 +14,7 @@ with stdenv.lib;
let
buildType = "release";
- version = "5.0.0"; # changes ./guest-additions as well
+ version = "5.0.2"; # changes ./guest-additions as well
forEachModule = action: ''
for mod in \
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7";
+ sha256 = "f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e";
};
buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6bf0ef2e825..27c744234c4 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "7b61f523db7ba75aebc4c7bb0cae2da92674fa72299e4a006c5c67517f7d786b";
+ sha256 = "1qikn5w6j85fh7ynnfnm4yydii9xb0smv9bvsxnpkpkvkk566h4p";
};
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b5029d3c141..b81649050be 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "i3-${version}";
- version = "4.10.2";
+ version = "4.10.3";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "1n6grkpv5rsn9zgg8if76mmg85w1asbm3rpplxyn6fzr8wds7587";
+ sha256 = "1lq7h4w7m0hi31iva8g7yf1sc11ispnknxjdaj9agld4smxqb44j";
};
buildInputs = [
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 91fff3335ec..099a2523fb4 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -2,11 +2,11 @@
pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
stdenv.mkDerivation rec {
- name = "i3lock-2.6";
+ name = "i3lock-2.7";
src = fetchurl {
url = "http://i3wm.org/i3lock/${name}.tar.bz2";
- sha256 = "0aj0an8fwv66jhda499r3xa00546cc9ja1dk8xpc6sy6xygqjbf0";
+ sha256 = "1qlgafbyqjpqdfs50f2y0xphn2jdigafkqqsmpikk97cs0z1i0k8";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple screen locker like slock";
homepage = http://i3wm.org/i3lock/;
- maintainers = with maintainers; [ garbas malyn ];
+ maintainers = with maintainers; [ garbas malyn iElectric ];
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index a5586117588..817b20af9c4 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
--replace /bin/bash ${stdenv.shell}
substituteInPlace ./configure \
--replace "/usr/bin/env bash" ${stdenv.shell}
+ sed '1i#include ' \
+ -i ./third-party/mcrouter/mcrouter/lib/fibers/TimeoutController.h
'';
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 27b58b4d0f1..76dc6aa1d30 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchurl
# build tools
-, gfortran, git, m4, patchelf, perl, which
+, gfortran, git, m4, patchelf, perl, which, python2
# libjulia dependencies
, libunwind, llvm, readline, utf8proc, zlib
# standard library dependencies
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
name = "dsfmt-${dsfmt_ver}.tar.gz";
md5 = "cb61be3be7254eae39684612c524740d";
};
- in [ dsfmt_src ];
+
+ in [ dsfmt_src llvm.src ];
prePatch = ''
copy_kill_hash(){
@@ -59,12 +60,12 @@ stdenv.mkDerivation rec {
'';
buildInputs =
- [ libunwind llvm readline utf8proc zlib
+ [ libunwind readline utf8proc zlib
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
openblas arpack suitesparse
];
- nativeBuildInputs = [ gfortran git m4 patchelf perl which ];
+ nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
makeFlags =
let
@@ -96,7 +97,6 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_GRISU=1"
"USE_SYSTEM_LIBUNWIND=1"
- "USE_SYSTEM_LLVM=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"
@@ -142,6 +142,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- broken = false;
};
}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1545e49130a..b83158a9d73 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1020,9 +1020,6 @@ self: super: {
# https://github.com/basvandijk/concurrent-extra/issues/12
concurrent-extra = dontCheck super.concurrent-extra;
- # https://github.com/GaloisInc/DSA/issues/1
- DSA = dontCheck super.DSA;
-
# https://github.com/bos/bloomfilter/issues/7
bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 78efcabdfd8..305c59418d3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2800,10 +2800,9 @@ self: {
({ mkDerivation, async, base }:
mkDerivation {
pname = "Concurrential";
- version = "0.5.0.0";
- sha256 = "6b175a046f69049ad2df298bed113e562662aa1e106ee72360697f1b270b94b9";
+ version = "0.5.0.1";
+ sha256 = "addb2abcf81ad9619d42e2f25e5866f7e998f29527409e40c7954078cc9fd676";
libraryHaskellDepends = [ async base ];
- jailbreak = true;
homepage = "http://github.com/avieth/Concurrential";
description = "Mix concurrent and sequential computation";
license = stdenv.lib.licenses.bsd3;
@@ -5405,20 +5404,18 @@ self: {
}) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
"GLUtil" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, cpphs
- , directory, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw
+ ({ mkDerivation, array, base, bytestring, containers, directory
+ , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
, transformers, vector
}:
mkDerivation {
pname = "GLUtil";
- version = "0.8.6";
- sha256 = "c33530e1a8a83700950867291e4f12908ed6bf09fc737556b912d94672a0e697";
+ version = "0.8.7";
+ sha256 = "4d7c2184d3aff8d124f34f2e2ebe6021201e8a174d8bb5ebabe3a50451a71642";
libraryHaskellDepends = [
- array base bytestring containers directory filepath JuicyPixels
+ array base bytestring containers directory filepath hpp JuicyPixels
linear OpenGL OpenGLRaw transformers vector
];
- libraryToolDepends = [ cpphs ];
- jailbreak = true;
description = "Miscellaneous OpenGL utilities";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -13243,8 +13240,8 @@ self: {
}:
mkDerivation {
pname = "RSA";
- version = "2.1.0.1";
- sha256 = "1b02096acd61e7fa477ca062773d47b7872e110cab594372699f8cba0632e454";
+ version = "2.1.0.3";
+ sha256 = "3227c31d00ba0bb1713bdfa7ba2f8e186b6f5d3a0c518a9884ad168cb6d9364a";
libraryHaskellDepends = [
base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
];
@@ -15600,10 +15597,9 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "TypeNat";
- version = "0.4.0.0";
- sha256 = "dbb6440bbe3dadf67d63ca652439db2988b1f47f99d65e7079ff506e516add6c";
+ version = "0.4.0.1";
+ sha256 = "e62ef42bad43ca0487d59fe7840313e31fe47a05f210cf37786dd6f5897504f3";
libraryHaskellDepends = [ base ];
- jailbreak = true;
homepage = "https://github.com/avieth/TypeNat";
description = "Some Nat-indexed types for GHC";
license = stdenv.lib.licenses.mit;
@@ -19641,8 +19637,8 @@ self: {
}:
mkDerivation {
pname = "amazonka";
- version = "1.2.0.2";
- sha256 = "2ed9e6eb9a6dbb0eca3d1fb68c7136a35ec5b7b5ac3ac40d8ecc59b33a00cfb5";
+ version = "1.3.0";
+ sha256 = "1396df4f5a92f854d5fa9562d9ec7c23fc26f0aa7e2f89e0c4e7818dd814a4a3";
libraryHaskellDepends = [
amazonka-core base bytestring conduit conduit-extra directory
exceptions http-client http-conduit ini lens mmorph monad-control
@@ -19661,8 +19657,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-autoscaling";
- version = "1.2.0.2";
- sha256 = "23b763583f2d3ffd0abcb5c01cbba2c8a86f06a622a7878f4b90b96f9589fab1";
+ version = "1.3.0";
+ sha256 = "18f6878a5213874ab4107ed5298a0cf16ccfcb92ef85a44f81c9ffb1d9c5c259";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19679,8 +19675,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudformation";
- version = "1.2.0.2";
- sha256 = "b7ad4d6b83d043e1c55d2b336702c99e3476432f5f9e29f7af2d8224e5c85f21";
+ version = "1.3.0";
+ sha256 = "d3f840b0d4f531dea89d3f7541033e3595137c015c3ce7ac2816c06dc4571ce2";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19697,8 +19693,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudfront";
- version = "1.2.0.2";
- sha256 = "f906be9ac06c38451549c001ce870f732a43292da7ed41ca46089179ff89617a";
+ version = "1.3.0";
+ sha256 = "19b545ff60c0bcf39f42619304339f71b32e1794819aaab68bbec8ad52cb51ed";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19715,8 +19711,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudhsm";
- version = "1.2.0.2";
- sha256 = "5885451657f173c69d52c756395b52b6fe7be9626293d61b7513afbe73ba8e79";
+ version = "1.3.0";
+ sha256 = "59eb2b4b696b3ace313ffff5b1f3317db90b2e846918637a604a03d11726a164";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19733,8 +19729,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudsearch";
- version = "1.2.0.2";
- sha256 = "053b505d3644433f9e1fa686d6416ae08ac2154bb4ebe5e994f0b2a4969a11f1";
+ version = "1.3.0";
+ sha256 = "04075d1db69664aece947b4b69138d24074ee3dcd8c57e924525690bcffba76b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19751,8 +19747,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudsearch-domains";
- version = "1.2.0.2";
- sha256 = "a3921a0b09518c5fffe95b46f76c46a53ab1710b59fb43f099cb14b637ea593f";
+ version = "1.3.0";
+ sha256 = "4f6add8d97e4e97f8c855a0b82f1bd2e45098456123e9b477c7fc6dce354d8e2";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19769,8 +19765,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudtrail";
- version = "1.2.0.2";
- sha256 = "a352d0ff1a75b22fa9e87c18c498090f5c6e9cbfcb79a24b2840ce44ec02b2b3";
+ version = "1.3.0";
+ sha256 = "7cfe2b4bcc35b692288c964536f3a9c38a474177e9c3b4cc6e9b6eb9a8d46ce0";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19787,8 +19783,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudwatch";
- version = "1.2.0.2";
- sha256 = "0b6e1358d91a567df91aa680019b0f06f201eb81965f3b78702c4e90a9a426a4";
+ version = "1.3.0";
+ sha256 = "eddbb9e72543ba8fc3fe0a515cf57089c33005c317c305245807d52caa0ae566";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19805,8 +19801,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cloudwatch-logs";
- version = "1.2.0.2";
- sha256 = "3fd0122d4e24ccb3413da041ef85e7eb07af7614e43946fb28b93404951ddc39";
+ version = "1.3.0";
+ sha256 = "7a8245c5983d9353b31d8f6668942dcdad7cbafe04561049156eb2b6bfebdfc5";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19823,8 +19819,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-codecommit";
- version = "1.2.0.2";
- sha256 = "43b58f4507c9ea4125cc4da323ff63f8d9223149455293867143984074d8be74";
+ version = "1.3.0";
+ sha256 = "a20b5fb61cbcbd22555141ae21266e8f1b30eb55987f8853319ec6d464628de6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19841,8 +19837,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-codedeploy";
- version = "1.2.0.2";
- sha256 = "cbbc6d6d6291fc47c89e7f67dc016570eecaecccee8a8f1c858fda040e9993e9";
+ version = "1.3.0";
+ sha256 = "c3bb7de0e15bc3f0b06d159708e3e73aca0a83727d1668c6eeb38b20db0e08ac";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19859,8 +19855,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-codepipeline";
- version = "1.2.0.2";
- sha256 = "57c505046cfa51716624d0021d6dca82a13053c17a5e0a61944935ba7bd189b4";
+ version = "1.3.0";
+ sha256 = "eee08157eddf6ed82637650a70ab8e47021f9a1756b2d9d16ceeeb9104284030";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19877,8 +19873,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cognito-identity";
- version = "1.2.0.2";
- sha256 = "b9965907831e771ad7268d1f8d149b8b3de6faaf0e73eb140705bdf0a7cf8805";
+ version = "1.3.0";
+ sha256 = "0ca43b39cdeaaa2554ffb00aea346ef837bb044ff3280a2dee716457f872fe4e";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19895,8 +19891,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-cognito-sync";
- version = "1.2.0.2";
- sha256 = "f1683d1e4c124b07f5ae7663a1471539611f77da6f11553b87ca5eb77b192c89";
+ version = "1.3.0";
+ sha256 = "fd3682f6f6720c1a654e9a19fe0927b151f93c31f3d320ea2041c6dae907186b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19913,8 +19909,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-config";
- version = "1.2.0.2";
- sha256 = "72fb81094500ac496592cd56c8010205f40a377ccdc7d8fb8f479e3923bcbfab";
+ version = "1.3.0";
+ sha256 = "11585855c88930182d6cffe4ad169426a4f257f04946b143491e15fc39bc7bea";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19936,8 +19932,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-core";
- version = "1.2.0.2";
- sha256 = "63d02d59fe206e1cfbaacea192d775424d05d617413af1771c2efe9a4e51a663";
+ version = "1.3.0";
+ sha256 = "f8d093aff4bf2226337f997c875cce964d21796782f7643108404c7967899ab4";
libraryHaskellDepends = [
aeson attoparsec base bifunctors bytestring case-insensitive
conduit conduit-extra cryptonite exceptions hashable http-client
@@ -19961,8 +19957,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-datapipeline";
- version = "1.2.0.2";
- sha256 = "a4f8c95147fd34fabe6544c5d8893aac7259a95fc37d9d900e121cc1d479d230";
+ version = "1.3.0";
+ sha256 = "8590782df1c3c2a72a3e431caaea66e7c56050766fcd390927ba8568cb3f7155";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19979,8 +19975,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-devicefarm";
- version = "1.2.0.2";
- sha256 = "92d323fbe85ccd284ea76fcba12e8ea70b75994d2195bb12e25a753f5b78424e";
+ version = "1.3.0";
+ sha256 = "4d089812ba01148f2b27c11c5d961ba0a6b47d73fbdaab09cbf30463896d3a89";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19997,8 +19993,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-directconnect";
- version = "1.2.0.2";
- sha256 = "1cd5cda8a0d8ca484582b5d9ef0e50fbe14542e81a49de6f5b3bf32a044ab3c6";
+ version = "1.3.0";
+ sha256 = "1447a87d6c3c1b3fb4572a0c1f1d6f682a1e4f70f3f4526f9ecb81f3c5207ed0";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20015,8 +20011,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-ds";
- version = "1.2.0.2";
- sha256 = "10b5a48951ec7f90b05152d2073b10d154ceea5806f5655d47d1f8a512f2cbbd";
+ version = "1.3.0";
+ sha256 = "8444861b5673d169a4f714a6c12a63773100c8d2aa2c7ea0e65654c2de7b76a6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20033,8 +20029,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-dynamodb";
- version = "1.2.0.2";
- sha256 = "c916d9b55e74ceeb5f1e7a64fb7ebe0de3bea7df3eb9d2d813bce7e945e81634";
+ version = "1.3.0";
+ sha256 = "1696f6c0957c26a5c928111abb8310fef9ea56b133e248abdffd52ef8b8b3124";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20051,8 +20047,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-dynamodb-streams";
- version = "1.2.0.2";
- sha256 = "3ae26f2fdfe11cd7a366dc272d1f43f38cdb949eb5edc7b73e01a176b2096868";
+ version = "1.3.0";
+ sha256 = "edb698acb00e9f7dec593929cca51ae0365000fae05ae066a1d57a762f4782f4";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20069,8 +20065,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-ec2";
- version = "1.2.0.2";
- sha256 = "f93ca4bb2ae863f071a0555f762e365da1616b72c8589d4fe3aad260fc936211";
+ version = "1.3.0";
+ sha256 = "f687259e080587cea9f154d73d076f87b3662d3299d54baa74fcc127cc454f61";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20088,8 +20084,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-ecs";
- version = "1.2.0.2";
- sha256 = "7c322cc5afcdcc92b21c22333c859295a508d84bd8ba83921a105d231dbfa8d6";
+ version = "1.3.0";
+ sha256 = "094ee4d8663efa67edca4b63a771463322c5acd69605c7997a3422b43a549dc6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20106,8 +20102,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-efs";
- version = "1.2.0.2";
- sha256 = "193b91ede9c1abfe195788c03940214f8d54c43fde259674a468f49a5c59834f";
+ version = "1.3.0";
+ sha256 = "d84613773c2a887ec19651c81221db4f3265f3abe12a06630a100ee5887dc461";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20124,8 +20120,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-elasticache";
- version = "1.2.0.2";
- sha256 = "1a5a8883055dcc318a90cc45f1cfd7af198c5e98b8889db86bca951bc2e9be29";
+ version = "1.3.0";
+ sha256 = "c44618aaf4e1306ece40ace9843094621a6577b9f24f4f51b20195620857f337";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20142,8 +20138,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-elasticbeanstalk";
- version = "1.2.0.2";
- sha256 = "fa62e8248e92184e84b482012dd73953bb0892166f95d0d2163b04c42ebcc650";
+ version = "1.3.0";
+ sha256 = "e53ba795b1456aea3d65eb6dfa3db6d072a59c23355167ab56d70253038a950d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20160,8 +20156,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-elastictranscoder";
- version = "1.2.0.2";
- sha256 = "76d26a2d64094dd14090298ead0e920915c31582fe14d949836f1103af238c04";
+ version = "1.3.0";
+ sha256 = "c0365de5873cb3d8603048a482fef27227b73ecf5fe20720d9faea0e857a4a06";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20178,8 +20174,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-elb";
- version = "1.2.0.2";
- sha256 = "21099398af8db511131a4c8bed68b6d04f9b708a77c38d01b037020e18ab2123";
+ version = "1.3.0";
+ sha256 = "88bd2cd08ee1b8cf2f36df53ef5ef50db074e4294195d0c251981b028346fd0c";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20196,8 +20192,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-emr";
- version = "1.2.0.2";
- sha256 = "08728f1ccd95bcce046d6e320391d1c219306b2764a0a551dfea11de3208e1f1";
+ version = "1.3.0";
+ sha256 = "423304b57c509be55017c0f1f957c6a423c5e7631cbd4106ef375248dab69702";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20214,8 +20210,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-glacier";
- version = "1.2.0.2";
- sha256 = "a789aaf0927672e16ceb8202d88ff07ee5218b2244236f94a04f186a0b38a3f5";
+ version = "1.3.0";
+ sha256 = "e1a5298bb692f336dae054f38507298e7d6943a98b5bbdbea3b1c64c71f77d8b";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20232,8 +20228,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-iam";
- version = "1.2.0.2";
- sha256 = "00454769f0848db0b6a273ff2e6e0f4b7dcfc94db067ce4774806aa0687b9f6d";
+ version = "1.3.0";
+ sha256 = "e4e2ce1d0a13ff1a69ee292a6be8560d8037e56359dbbc74b8972de8b6895a6d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20250,8 +20246,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-importexport";
- version = "1.2.0.2";
- sha256 = "e8e9f4a8fb5762a929c9462d7d8187207a1334aa3922890ec08a6a949ba9264e";
+ version = "1.3.0";
+ sha256 = "0915509dceaec445062900d2ceb6677558cb6bc6ad1de5512c41925849587df3";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20268,8 +20264,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-kinesis";
- version = "1.2.0.2";
- sha256 = "7b5d2a726111352d21594a1704dade4d2b706286c8cec427b912a2318f91bc20";
+ version = "1.3.0";
+ sha256 = "4f241b76393553ac61604a14f734ba5b7060ef170001e1585f8c795cba7adc8c";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20286,8 +20282,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-kms";
- version = "1.2.0.2";
- sha256 = "7c67b24e31d293411960f68efd4199e5fd4fd4274ea62619f96faa37553c8246";
+ version = "1.3.0";
+ sha256 = "658305fdd8ae3c310b75fdd7ec79706e92327c67ae6880dceb242e0ea6a2b773";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20304,8 +20300,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-lambda";
- version = "1.2.0.2";
- sha256 = "91f88bc3fa32f5c6350f2f49afb949e63a860614d7f90d169af216115f0927c2";
+ version = "1.3.0";
+ sha256 = "de13741402358d3442934368c6bdeae46a0d6da96987983f0eecbf5fae0317c4";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20322,8 +20318,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-ml";
- version = "1.2.0.2";
- sha256 = "c3a3eee8d0bb4987d96b35b48dc074d2912883573e8859fdabf16f744641b9f0";
+ version = "1.3.0";
+ sha256 = "6b25d8df0cb3ccb27602dbb36279bfde43b0377cac0111bde157aaab708e0519";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20340,8 +20336,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-opsworks";
- version = "1.2.0.2";
- sha256 = "bad8fc80941bdecd1799213837ef1923c88ef96b59ec2efe439a564f68e06f40";
+ version = "1.3.0";
+ sha256 = "22cf650032fedf956e34b548e7e81ee02c9c8dc43b5f46c395e6b6a1474ab037";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20358,8 +20354,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-rds";
- version = "1.2.0.2";
- sha256 = "d4ae1dec9b45df0db245022c5e098ad4814f2ab2261bde850adb42b38200b248";
+ version = "1.3.0";
+ sha256 = "b06a847c3cef8d5335e699a7d3d6b52206aa04aca9437bbfb111d3574ab21c18";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20377,8 +20373,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-redshift";
- version = "1.2.0.2";
- sha256 = "b7fd76de142bc6c346d10645fe07c64c09ee26c828fe89abd6d0f44d99c39a89";
+ version = "1.3.0";
+ sha256 = "999b613233bf1971950628e6d0273073783187f2f93222ccff9baffef87691d6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20395,8 +20391,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-route53";
- version = "1.2.0.2";
- sha256 = "bfe1e8d82ea77ab1a4b95cfef89a6cefc5dc2bcd349c17964fcab9ce2f00ec9b";
+ version = "1.3.0";
+ sha256 = "098eba1804f24b374a5b5cf5d0fdeb69d4c5733ca2ce892d7d01575a27adf9c6";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20413,8 +20409,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-route53-domains";
- version = "1.2.0.2";
- sha256 = "e0a70770d5fea792f15e5ed7c6fac093dc52e98d5a140c8ac769d09d87a11760";
+ version = "1.3.0";
+ sha256 = "bd00978c2fc6b53403d06194a41f82c527929b4fd7c25d2e86adabcee791089d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20431,8 +20427,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-s3";
- version = "1.2.0.2";
- sha256 = "e38c08253fee58cbf3f503d7f3f5c2a96e99c74cc343c99751a44adb3fc82a27";
+ version = "1.3.0";
+ sha256 = "7245d983beb418a9c06f48a159d32caccb866bbc10502c3095e0374f9a517616";
libraryHaskellDepends = [ amazonka-core base lens text ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20450,8 +20446,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-sdb";
- version = "1.2.0.2";
- sha256 = "58e01ab2120c1f680148fed558c1cb179867eb3770fc3a119a5770ab187de7c9";
+ version = "1.3.0";
+ sha256 = "83e1fd3234d1a936cf1b23a67925ce132c47a8e7e66b7c7c339b4118379a0a49";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20468,8 +20464,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-ses";
- version = "1.2.0.2";
- sha256 = "3f81529747d25fbdff258c6027592650b5de4537fe4600a40d60116ddc7cb539";
+ version = "1.3.0";
+ sha256 = "3ca9102b7b91c3867ba70724f789ac3dda1d2c9b47e36e95ac5bebbb0ee7c05d";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20486,8 +20482,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-sns";
- version = "1.2.0.2";
- sha256 = "e7585e9186ab3bb1e71405f3e01b31a0a9a0e6aa228b1a78a8f65d55cff782f9";
+ version = "1.3.0";
+ sha256 = "520d7258ae543e8cc847187be1b767aaf8d101c075b0e84407baf11bc838bba4";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20504,8 +20500,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-sqs";
- version = "1.2.0.2";
- sha256 = "0fa349f412a216cb1bd3c2ed6d9fa97ce0f95522caa2099fdc473e1b433ce4ef";
+ version = "1.3.0";
+ sha256 = "db765483114452f6f479b790d2ad18426781fa9c440539f96c67feb6ff3e228e";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20523,8 +20519,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-ssm";
- version = "1.2.0.2";
- sha256 = "d227c62cd71a81cb02bcfe6a7024ea423940dbbae18f3d8f59be6ccdb346657e";
+ version = "1.3.0";
+ sha256 = "08a14a8bf072bb807e0dd03f7db7738dc0606064f5c9db4a62f8c9da6cddaae8";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20541,8 +20537,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-storagegateway";
- version = "1.2.0.2";
- sha256 = "66f0781991832ddc0a8b68098f1d1213ffea9ed9b29effad53f4987c96914ea6";
+ version = "1.3.0";
+ sha256 = "5b1cb452a4d751700e4220e7ca36823cd99b0c96b90d25dd738ce5736662deca";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20559,8 +20555,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-sts";
- version = "1.2.0.2";
- sha256 = "629d92d11fc73e7d3fe7e428a309c2cd93e42291a5102075ed9220fb37b916fd";
+ version = "1.3.0";
+ sha256 = "86ba866f2afb5a462b0d61da9692744bbe43fe066094cae8507801aaea0560d9";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20577,8 +20573,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-support";
- version = "1.2.0.2";
- sha256 = "c650edb5679dbc337c2aaf6eecafa85725f02e580c913164c1381ceb0f724fbe";
+ version = "1.3.0";
+ sha256 = "ff272967d112bd6886cc83f1af4df1b60be2ed416a235af76814c6d67d53c725";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20595,8 +20591,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-swf";
- version = "1.2.0.2";
- sha256 = "ae3a8a9b918c9bc4d1bfe6e855686fc3bbc78484c7e863186295b30318761892";
+ version = "1.3.0";
+ sha256 = "9e2bae7e0ff131f013746032118ee8e6ac0dd7fdca011ab1ad24ff294e423076";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20617,8 +20613,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-test";
- version = "1.2.0.2";
- sha256 = "cc54d2f2514d714b5261e75090f97d9432e7dd84be5c4c314d4747c733d732a8";
+ version = "1.3.0";
+ sha256 = "fe906b399eff538ddbd44e31eada4407c2d9945d7fbd3bc3372dabda76df523e";
libraryHaskellDepends = [
aeson amazonka-core base bifunctors bytestring case-insensitive
conduit conduit-extra groom http-client http-types lens process
@@ -20636,8 +20632,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-workspaces";
- version = "1.2.0.2";
- sha256 = "4c685ff3dca7dc5fac2ecd6d07f4400f045901a75985d62f4e38d6561a82c0d6";
+ version = "1.3.0";
+ sha256 = "485a812a315951d0e8b71ca7d156d4f14544096f852180507e59e8811feada96";
libraryHaskellDepends = [ amazonka-core base ];
testHaskellDepends = [
amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -72459,25 +72455,27 @@ self: {
}) {};
"hpc-coveralls" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, cmdargs
+ ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
, containers, curl, directory, directory-tree, hpc, HUnit, process
- , pureMD5, regex-posix, retry, safe, split
+ , pureMD5, regex-posix, retry, safe, split, transformers
}:
mkDerivation {
pname = "hpc-coveralls";
- version = "0.9.0";
- sha256 = "0601c2f7ed840df815715d00a977c20796a9fd59b0890ada8e13d539c7016a46";
+ version = "1.0.0";
+ sha256 = "6454522df019cf126130544ab557a96324e8faedcc864773225f0e68a3867310";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring cmdargs containers curl directory
- directory-tree hpc process pureMD5 retry safe split
+ aeson base bytestring Cabal cmdargs containers curl directory
+ directory-tree hpc process pureMD5 retry safe split transformers
];
executableHaskellDepends = [
- aeson async base bytestring cmdargs containers curl directory
+ aeson async base bytestring Cabal cmdargs containers curl directory
directory-tree hpc process pureMD5 regex-posix retry safe split
+ transformers
];
testHaskellDepends = [ base HUnit ];
+ jailbreak = true;
homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
description = "Coveralls.io support for Haskell.";
license = stdenv.lib.licenses.bsd3;
@@ -72568,6 +72566,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hpp" = callPackage
+ ({ mkDerivation, base, directory, filepath, time }:
+ mkDerivation {
+ pname = "hpp";
+ version = "0.1.0.0";
+ sha256 = "f1c2645cb7ee681bf1d6a02ea0f98c3fc2fe880fd408ff3dd1870d817197d736";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath time ];
+ executableHaskellDepends = [ base directory filepath time ];
+ homepage = "https://github.com/acowley/hpp";
+ description = "A Haskell pre-processor";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hpqtypes" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
, data-default-class, exceptions, HUnit, lifted-base, monad-control
@@ -77394,8 +77407,8 @@ self: {
}:
mkDerivation {
pname = "hunch";
- version = "0.1.1";
- sha256 = "2b959733b68066abcb8bddfb982c859b772070c2a16f27d183f1c61028817bae";
+ version = "0.2.0";
+ sha256 = "52e214b7b9af8fed9735ab65d1c241f2f11204909b4b29345054557dfd236331";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -82239,6 +82252,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ja-base-extra" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "ja-base-extra";
+ version = "0.1.0.0";
+ sha256 = "da7fb172ae72672ab42b50631f9d03ea00c4c9f5607db890f6cd0d389a7bde4b";
+ libraryHaskellDepends = [ base ];
+ description = "Extra functions I require in base";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"jack" = callPackage
({ mkDerivation, array, base, bytestring, enumset, event-list
, explicit-exception, libjack2, midi, non-negative, transformers
@@ -90244,8 +90268,8 @@ self: {
({ mkDerivation, base, hspec, mtl }:
mkDerivation {
pname = "loop";
- version = "0.2.0";
- sha256 = "bd6c3cf86ab4b2ce801ec4eb069647dc2cb79dd7d08516e92c7ea647a1c22e86";
+ version = "0.3.0";
+ sha256 = "92962010bdab28cc0092dd3fe42819d6f215c717dd10d9349626d92a0d0b3ecf";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec mtl ];
homepage = "https://github.com/nh2/loop";
@@ -99166,8 +99190,8 @@ self: {
({ mkDerivation, array, base, containers, mtl }:
mkDerivation {
pname = "network-house";
- version = "0.1.0.1";
- sha256 = "16bb57f41ffea2b7c181e42f8c9d6c7d0a7a6081ec70619ec049348bc4d53e69";
+ version = "0.1.0.2";
+ sha256 = "071fbc22fc516175e78235d9e29ccefd8eec7c3caa2e6de74dddf62cdbffab43";
libraryHaskellDepends = [ array base containers mtl ];
homepage = "https://github.com/nh2/network-house";
description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
@@ -109122,12 +109146,11 @@ self: {
}:
mkDerivation {
pname = "probability";
- version = "0.2.4.1";
- sha256 = "6c4bcb7343d1fda94fb1799e3e1d8dc45c5a018ac40b38d4f8d19e36001d075a";
+ version = "0.2.5";
+ sha256 = "1dccf0a260f37f0725f02d2f1d4f1cd61da67477dacc77caf5007584ec53a9c0";
libraryHaskellDepends = [
base containers random transformers utility-ht
];
- jailbreak = true;
homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
description = "Probabilistic Functional Programming";
license = stdenv.lib.licenses.bsd3;
@@ -109792,8 +109815,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "2.7.2";
- sha256 = "9c1cc565bfdea30d58c5306ef2dda9d4e86984f9f9004c0fe43011b481ce4db8";
+ version = "2.7.3";
+ sha256 = "0309899702da827d8fa3184c08e2de664cb0ba8df007b66caedd66894e85d151";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -120140,8 +120163,8 @@ self: {
}:
mkDerivation {
pname = "serversession-backend-acid-state";
- version = "1.0.1";
- sha256 = "470d11dc0d4a445babe240698ef4b6abc3fd48ab832ff52907ad5f81fcdd85c1";
+ version = "1.0.2";
+ sha256 = "3495c43b0ba669ee623a8b5365d7df1388f4f0326bb0999c5aff4310bcbcf026";
libraryHaskellDepends = [
acid-state base containers mtl safecopy serversession
unordered-containers
@@ -120150,7 +120173,6 @@ self: {
acid-state base containers hspec mtl safecopy serversession
unordered-containers
];
- jailbreak = true;
homepage = "https://github.com/yesodweb/serversession";
description = "Storage backend for serversession using acid-state";
license = stdenv.lib.licenses.mit;
@@ -126300,20 +126322,21 @@ self: {
, containers, cryptohash, cryptohash-conduit, deepseq
, deepseq-generics, directory, either, enclosed-exceptions
, exceptions, extra, fast-logger, file-embed, filelock, filepath
- , fsnotify, hashable, hastache, hspec, http-client, http-client-tls
- , http-conduit, http-types, lifted-base, monad-control
- , monad-logger, monad-loops, mtl, old-locale, optparse-applicative
- , optparse-simple, path, persistent, persistent-sqlite
- , persistent-template, pretty, process, project-template
- , QuickCheck, resourcet, retry, safe, split, stm, streaming-commons
- , tar, template-haskell, temporary, text, time, transformers
- , transformers-base, unix, unix-compat, unordered-containers
- , vector, vector-binary-instances, void, word8, yaml, zlib
+ , fsnotify, gitrev, hashable, hastache, hspec, http-client
+ , http-client-tls, http-conduit, http-types, ignore, lifted-base
+ , monad-control, monad-logger, monad-loops, mtl, old-locale
+ , optparse-applicative, optparse-simple, path, persistent
+ , persistent-sqlite, persistent-template, pretty, process
+ , project-template, QuickCheck, resourcet, retry, safe, split, stm
+ , streaming-commons, tar, template-haskell, temporary, text, time
+ , transformers, transformers-base, unix, unix-compat
+ , unordered-containers, vector, vector-binary-instances, void
+ , word8, yaml, zlib
}:
mkDerivation {
pname = "stack";
- version = "0.1.3.1";
- sha256 = "af5542c838fa33bd633cad5b9cbd411748a259a06bd0b437094c9d79b0e01e6a";
+ version = "0.1.4.1";
+ sha256 = "09a076537d546b005788326fb734b47a203ae9507303a9ce554566179dfdfd24";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126323,21 +126346,21 @@ self: {
cryptohash-conduit deepseq deepseq-generics directory
enclosed-exceptions exceptions extra fast-logger file-embed
filelock filepath fsnotify hashable hastache http-client
- http-client-tls http-conduit http-types lifted-base monad-control
- monad-logger monad-loops mtl old-locale optparse-applicative
- optparse-simple path persistent persistent-sqlite
- persistent-template pretty process project-template resourcet retry
- safe split stm streaming-commons tar template-haskell temporary
- text time transformers transformers-base unix unix-compat
- unordered-containers vector vector-binary-instances void word8 yaml
- zlib
+ http-client-tls http-conduit http-types ignore lifted-base
+ monad-control monad-logger monad-loops mtl old-locale
+ optparse-applicative optparse-simple path persistent
+ persistent-sqlite persistent-template pretty process
+ project-template resourcet retry safe split stm streaming-commons
+ tar template-haskell temporary text time transformers
+ transformers-base unix unix-compat unordered-containers vector
+ vector-binary-instances void word8 yaml zlib
];
executableHaskellDepends = [
- base bytestring conduit containers directory either exceptions
- filelock filepath hashable http-client http-conduit lifted-base
- monad-control monad-logger mtl old-locale optparse-applicative
- optparse-simple path process resourcet split text transformers
- unordered-containers
+ base bytestring Cabal conduit containers directory either
+ exceptions filelock filepath gitrev hashable http-client
+ http-conduit lifted-base monad-control monad-logger mtl old-locale
+ optparse-applicative optparse-simple path process resourcet split
+ text transformers unordered-containers
];
testHaskellDepends = [
async base bytestring Cabal conduit conduit-extra containers
@@ -139741,14 +139764,14 @@ self: {
"validate-input" = callPackage
({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy
- , QuickCheck, stringable, text
+ , QuickCheck, string-conversions, text
}:
mkDerivation {
pname = "validate-input";
- version = "0.2.0.0";
- sha256 = "9abebe0e9eccfeb35398e8fb0c1a7ee7582f83743f15b8403e5edefea39b5446";
+ version = "0.3.0.0";
+ sha256 = "ee469618a0a4ec7a154f694512383ae1441dd634dd5079f4612dc12e519a0a16";
libraryHaskellDepends = [
- base bytestring either mtl pcre-heavy stringable text
+ base bytestring either mtl pcre-heavy string-conversions text
];
testHaskellDepends = [ base hspec QuickCheck ];
homepage = "https://github.com/agrafix/validate-input";
@@ -147221,13 +147244,12 @@ self: {
}:
mkDerivation {
pname = "yesod-crud";
- version = "0.1.2";
- sha256 = "c1419b05e292044df44c2d31e4dda6150ee077b4ef5166c17dd53f99a786324f";
+ version = "0.1.3";
+ sha256 = "56b1ed4ad8ac35887e6e327774890a31e662de04afb2b295b88df4a85b89c776";
libraryHaskellDepends = [
base classy-prelude containers MissingH monad-control persistent
random safe stm uuid yesod-core yesod-form yesod-persistent
];
- jailbreak = true;
homepage = "https://github.com/league/yesod-crud";
description = "Generic administrative CRUD operations as a Yesod subsite";
license = stdenv.lib.licenses.bsd3;
@@ -148046,8 +148068,8 @@ self: {
}:
mkDerivation {
pname = "yesod-static-angular";
- version = "0.1.6";
- sha256 = "c16af2c227bc51da843e8032218939d804e5d36b7619492c318a9a038099b89d";
+ version = "0.1.7";
+ sha256 = "73278c6d5a4c5dce23f0c20de08f7f98f3069b4443d16d027f09a0653a203e73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148062,7 +148084,6 @@ self: {
base bytestring hamlet hspec HUnit shakespeare template-haskell
text yesod-core yesod-static yesod-test
];
- jailbreak = true;
homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
license = stdenv.lib.licenses.mit;
diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 1b63fb422dc..0aa6e9f90ce 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
src = fetchgit {
url = "https://github.com/bundler/bundler.git";
rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
- sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr";
+ sha256 = "1p7kzhmicfljy9n7nq3qh6lvrsckiq76ddypf6s55gfh1l98z4k9";
leaveDotGit = true;
};
dontPatchShebangs = true;
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index 6edeacac11e..a8fddad2d88 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
};
+ patches = [ ./fix-printfs.patch ];
+
postPatch = ''
# Don't build broken examples
sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch
new file mode 100644
index 00000000000..23b2f40e42f
--- /dev/null
+++ b/pkgs/development/libraries/accelio/fix-printfs.patch
@@ -0,0 +1,615 @@
+diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c
+--- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:59:13.258697472 -0400
+@@ -246,7 +246,7 @@ static void *worker_thread(void *data)
+ } else {
+ vmsg_sglist_set_nents(&msg->out, 0);
+ }
+- msg->user_context = (void *)get_cycles();
++ msg->user_context = (void *)(intptr_t)get_cycles();
+ /* send first message */
+ if (xio_send_request(tdata->conn, msg) == -1) {
+ if (xio_errno() != EAGAIN)
+@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio
+ {
+ struct thread_data *tdata = (struct thread_data *)cb_user_context;
+
+- cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context);
++ cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context);
+
+ if (tdata->do_stat) {
+ if (rtt > tdata->stat.max_rtt)
+@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio
+ msg->in.header.iov_len = 0;
+ vmsg_sglist_set_nents(&msg->in, 0);
+
+- msg->user_context = (void *)get_cycles();
++ msg->user_context = (void *)(intptr_t)get_cycles();
+ if (xio_send_request(tdata->conn, msg) == -1) {
+ if (xio_errno() != EAGAIN)
+ printf("**** [%p] Error - xio_send_request " \
+@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete
+ sess_data.min_lat_us,
+ sess_data.max_lat_us);
+ if (fd)
+- fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n",
++ fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n",
+ data_len,
+ threads_iter,
+ sess_data.tps,
+diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h
+--- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:57:30.856215123 -0400
+@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb;
+ /* The format of the results */
+ #define RESULT_FMT " #bytes #threads #TPS BW average[MBps] Latency average[usecs] Latency low[usecs] Latency peak[usecs]\n"
+ /* Result print format */
+-#define REPORT_FMT " %-7lu %-2d %-9.2lu %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n"
++#define REPORT_FMT " %-7" PRIu64 " %-2d %-9.2" PRIu64 " %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n"
+
+
+ struct perf_parameters {
+diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c
+--- accelio/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:42:19.983984370 -0400
+@@ -224,7 +224,7 @@ static void process_response(struct sess
+ len = 64;
+ tmp = str[len];
+ str[len] = '\0';
+- printf("message header : [%lu] - %s\n",
++ printf("message header : [%" PRIu64 "] - %s\n",
+ (rsp->request->sn + 1), str);
+ str[len] = tmp;
+ }
+@@ -236,7 +236,7 @@ static void process_response(struct sess
+ len = 64;
+ tmp = str[len];
+ str[len] = '\0';
+- printf("message data: [%lu][%d][%zd] - %s\n",
++ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
+ (rsp->request->sn + 1), i, sglist[i].iov_len, str);
+ str[len] = tmp;
+ }
+diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c
+--- accelio/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:43:07.353204184 -0400
+@@ -203,7 +203,7 @@ static void process_request(struct serve
+ len = 64;
+ tmp = str[len];
+ str[len] = '\0';
+- printf("message header : [%lu] - %s\n",
++ printf("message header : [%" PRIu64 "] - %s\n",
+ (req->sn + 1), str);
+ str[len] = tmp;
+ }
+@@ -215,7 +215,7 @@ static void process_request(struct serve
+ len = 64;
+ tmp = str[len];
+ str[len] = '\0';
+- printf("message data: [%lu][%d][%zd] - %s\n",
++ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
+ (req->sn + 1), i, sglist[i].iov_len, str);
+ str[len] = tmp;
+ }
+@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi
+ struct server_data *sdata = (struct server_data *)cb_user_context;
+
+ if (direction == XIO_MSG_DIRECTION_OUT) {
+- printf("**** [%p] message %lu failed. reason: %s\n",
++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+ } else {
+ xio_release_response(msg);
+- printf("**** [%p] message %lu failed. reason: %s\n",
++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+ }
+
+diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c
+--- accelio/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:36:25.612337524 -0400
++++ accelio.new/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:43:32.748322028 -0400
+@@ -87,7 +87,7 @@ static void process_response(struct sess
+ {
+ if (++session_data->cnt == PRINT_COUNTER) {
+ ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
+- printf("message: [%lu] - %s\n",
++ printf("message: [%" PRIu64 "] - %s\n",
+ (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
+ session_data->cnt = 0;
+ }
+diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c
+--- accelio/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:36:25.612337524 -0400
++++ accelio.new/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:43:50.556404665 -0400
+@@ -82,7 +82,7 @@ static void process_request(struct serve
+ len = 64;
+ tmp = str[len];
+ str[len] = '\0';
+- printf("message header : [%lu] - %s\n",
++ printf("message header : [%" PRIu64 "] - %s\n",
+ (req->sn + 1), str);
+ str[len] = tmp;
+ }
+@@ -94,7 +94,7 @@ static void process_request(struct serve
+ len = 64;
+ tmp = str[len];
+ str[len] = '\0';
+- printf("message data: [%lu][%d][%d] - %s\n",
++ printf("message data: [%" PRIu64 "][%d][%d] - %s\n",
+ (req->sn + 1), i, len, str);
+ str[len] = tmp;
+ }
+diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c
+--- accelio/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:41:13.493675827 -0400
+@@ -40,6 +40,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "libxio.h"
+
+@@ -133,7 +134,7 @@ static void process_response(struct thre
+ {
+ if (++tdata->cnt == PRINT_COUNTER) {
+ ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
+- printf("thread [%d] - tid:%p - message: [%lu] - %s\n",
++ printf("thread [%d] - tid:%p - message: [%" PRIu64 "] - %s\n",
+ tdata->affinity,
+ (void *)pthread_self(),
+ (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
+diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c
+--- accelio/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:41:31.730760455 -0400
+@@ -104,7 +104,7 @@ static void process_request(struct threa
+ struct xio_msg *req)
+ {
+ if (++tdata->cnt == PRINT_COUNTER) {
+- printf("thread [%d] tid:%p - message: [%lu] - %s\n",
++ printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n",
+ tdata->affinity,
+ (void *)pthread_self(),
+ (req->sn + 1), (char *)req->in.header.iov_base);
+diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c
+--- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 20:00:15.169989095 -0400
+@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
+ struct thread_data *tdata = conn_entry->tdata;
+
+ if (direction == XIO_MSG_DIRECTION_OUT) {
+- DEBUG("**** [%p] message %lu failed. reason: %s\n",
++ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, req->sn, xio_strerror(error));
+ } else {
+ xio_release_response(req);
+- DEBUG("**** [%p] message %lu failed. reason: %s\n",
++ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, req->request->sn, xio_strerror(error));
+ }
+ obj_pool_put(tdata->req_pool, req);
+diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c
+--- accelio/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:40:06.398364476 -0400
+@@ -43,6 +43,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #define cpusmask_test_bit(nr, addr) (*(addr) & (1ULL << (nr)))
+ #define cpusmask_set_bit(nr, addr) (*(addr) |= (1ULL << (nr)))
+@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
+ }
+ intf_cpusmask_str(cpusmask, cpusnum, cpus_str);
+
+- printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n",
++ printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n",
+ ifa->ifa_name, host, flags, numa_node, cpusmask,
+ "cpus", cpusnum, cpus_str);
+ }
+diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c
+--- accelio/src/tools/usr/xio_mem_usage.c 2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/src/tools/usr/xio_mem_usage.c 2015-09-03 19:38:57.596044838 -0400
+@@ -73,7 +73,7 @@
+ while (i++ < 48) { \
+ printf("."); \
+ } \
+- printf(" %6lu\n", sizeof(type)); \
++ printf(" %zu\n", sizeof(type)); \
+ }
+
+ int main(int argc, char **argv)
+diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c
+--- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:56:25.521908028 -0400
+@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio
+ * this flag must be on */
+ rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP;
+
+- rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr;
++ rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr;
+ rdma_test_buf.length = rdma_reg_mem.length;
+ rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp);
+
+diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c
+--- accelio/tests/usr/hello_test/xio_client.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test/xio_client.c 2015-09-03 19:45:43.055926711 -0400
+@@ -181,13 +181,13 @@ static void process_response(struct test
+
+ double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
+ double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB);
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ pps, txbw, rxbw,
+ test_params->stat.txlen, test_params->stat.rxlen);
+ get_time(timeb, 40);
+
+- printf("**** [%s] - message [%zd] %s - %s\n",
++ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ timeb, (rsp->request->sn + 1),
+ (char *)rsp->in.header.iov_base,
+ (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s
+
+ switch (event_data->event) {
+ case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+- printf("nsent:%lu, nrecv:%lu, " \
+- "delta:%lu\n",
++ printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \
++ "delta:%" PRIu64 "\n",
+ test_params->nsent, test_params->nrecv,
+ test_params->nsent-test_params->nrecv);
+
+@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi
+ struct test_params *test_params = (struct test_params *)cb_user_context;
+
+ if (direction == XIO_MSG_DIRECTION_OUT) {
+- printf("**** [%p] message %lu failed. reason: %s\n",
++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+ } else {
+ xio_release_response(msg);
+- printf("**** [%p] message %lu failed. reason: %s\n",
++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+ }
+
+diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c
+--- accelio/tests/usr/hello_test/xio_server.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test/xio_server.c 2015-09-03 19:46:35.777171360 -0400
+@@ -112,7 +112,7 @@ static void process_request(struct xio_m
+ if (++cnt == PRINT_COUNTER) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+
+- printf("**** message [%lu] %s - %s\n",
++ printf("**** message [%" PRIu64 "] %s - %s\n",
+ (msg->sn+1),
+ (char *)msg->in.header.iov_base,
+ (char *)sglist[0].iov_base);
+@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s
+ break;
+ case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+ if (event_data->reason != XIO_E_SESSION_REJECTED) {
+- printf("last sent:%lu, last comp:%lu, " \
+- "delta:%lu\n",
++ printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \
++ "delta:%" PRIu64 "\n",
+ test_params->nsent, test_params->ncomp,
+ test_params->nsent-test_params->ncomp);
+ test_params->connection = NULL;
+@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ struct test_params *test_params = (struct test_params *)cb_user_context;
+
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+
+ msg_pool_put(test_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c
+--- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:49:10.164887785 -0400
+@@ -114,7 +114,7 @@ static void process_request(struct xio_m
+ if (++cnt == print_counter) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
+
+- printf("**** request [%lu] %s - %s\n",
++ printf("**** request [%" PRIu64 "] %s - %s\n",
+ (req->sn+1),
+ (char *)req->in.header.iov_base,
+ (char *)sglist[0].iov_base);
+@@ -171,11 +171,11 @@ static void process_response(struct xio_
+ double txbw = (1.0*pps*txlen/ONE_MB);
+ double rxbw = (1.0*pps*rxlen/ONE_MB);
+
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ pps, txbw, rxbw, txlen, rxlen);
+ get_time(timeb, 40);
+- printf("**** [%s] - response [%lu] %s - %s\n",
++ printf("**** [%s] - response [%" PRIu64 "] %s - %s\n",
+ timeb, (rsp->request->sn + 1),
+ (char *)rsp->in.header.iov_base,
+ (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ switch (msg->type) {
+ case XIO_MSG_TYPE_REQ:
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+ msg_pool_put(pool, msg);
+ switch (error) {
+@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi
+ };
+ break;
+ case XIO_MSG_TYPE_RSP:
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+ /* message is no longer needed */
+ switch (error) {
+diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c
+--- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:49:52.860085909 -0400
+@@ -143,11 +143,11 @@ static void process_response(struct xio_
+ double txbw = (1.0*pps*txlen/ONE_MB);
+ double rxbw = (1.0*pps*rxlen/ONE_MB);
+
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ pps, txbw, rxbw, txlen, rxlen);
+ get_time(timeb, 40);
+- printf("**** [%s] - response complete [%lu] %s - %s\n",
++ printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n",
+ timeb, (rsp->request->sn + 1),
+ (char *)rsp->in.header.iov_base,
+ (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -171,7 +171,7 @@ static void process_request(struct xio_m
+ if (++cnt == print_counter) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
+
+- printf("**** request complete [%lu] %s - %s [%zd]\n",
++ printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n",
+ (req->sn+1),
+ (char *)req->in.header.iov_base,
+ (char *)sglist[0].iov_base,
+@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ switch (msg->type) {
+ case XIO_MSG_TYPE_REQ:
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+ msg_pool_put(pool, msg);
+ switch (error) {
+@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi
+ };
+ break;
+ case XIO_MSG_TYPE_RSP:
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+ /* message is no longer needed */
+ switch (error) {
+diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c
+--- accelio/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:50:51.111356220 -0400
+@@ -139,7 +139,7 @@ static void process_response(struct xio_
+ double rxbw = (1.0*pps*rxlen/ONE_MB);
+ double lat = (1000000.0/pps);
+
+- printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \
+ "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ pps, lat, txbw, rxbw, txlen, rxlen);
+ get_time(timeb, 40);
+@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi
+ struct xio_msg *msg,
+ void *cb_user_context)
+ {
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+
+ msg_pool_put(pool, msg);
+diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c
+--- accelio/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:51:16.803475442 -0400
+@@ -103,7 +103,7 @@ static void process_request(struct xio_m
+ if (++cnt == PRINT_COUNTER) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+
+- printf("**** message [%lu] %s - %s\n",
++ printf("**** message [%" PRIu64 "] %s - %s\n",
+ (msg->sn+1),
+ (char *)msg->in.header.iov_base,
+ (char *)sglist[0].iov_base);
+@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi
+ struct xio_msg *msg,
+ void *cb_user_context)
+ {
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+
+ msg_pool_put(pool, msg);
+diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c
+--- accelio/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:47:39.218465755 -0400
+@@ -179,12 +179,12 @@ static void process_response(struct thre
+ double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB);
+ double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB);
+
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \
+ "RX: %zd B\n",
+ pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen);
+ get_time(timeb, 40);
+- printf("[%s] thread [%d] - tid:%p - message [%lu] " \
++ printf("[%s] thread [%d] - tid:%p - message [%" PRIu64 "] " \
+ "%s - %s\n",
+ timeb,
+ tdata->affinity,
+@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
+ struct thread_data *tdata = (struct thread_data *)cb_user_context;
+
+ if (direction == XIO_MSG_DIRECTION_OUT) {
+- printf("**** [%p] message %lu failed. reason: %s\n",
++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+ } else {
+ xio_release_response(msg);
+- printf("**** [%p] message %lu failed. reason: %s\n",
++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+ }
+
+diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c
+--- accelio/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:48:02.876575538 -0400
+@@ -171,7 +171,7 @@ static void process_request(struct threa
+ if (++tdata->stat.cnt == PRINT_COUNTER) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+
+- printf("thread [%d] - message [%lu] %s - %s\n",
++ printf("thread [%d] - message [%" PRIu64 "] %s - %s\n",
+ tdata->affinity,
+ (msg->sn+1),
+ (char *)msg->in.header.iov_base,
+@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ struct thread_data *tdata = (struct thread_data *)cb_user_context;
+
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+
+ msg_pool_put(tdata->pool, msg);
+diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c
+--- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:54:18.142316932 -0400
+@@ -150,11 +150,11 @@ static void process_rx_message(struct ow
+
+ double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB);
+
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "RX: %.2f MB/s, RX: %zd B\n",
+ pps, rxbw, ow_params->rx_stat.xlen);
+ get_time(timeb, 40);
+- printf("**** [%s] - message [%lu] %s - %s\n",
++ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ timeb, (msg->sn + 1),
+ (char *)msg->in.header.iov_base,
+ (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -202,11 +202,11 @@ static void process_tx_message(struct ow
+
+ double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB);
+
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "TX %.2f MB/s,length: TX: %zd B\n",
+ pps, txbw, ow_params->tx_stat.xlen);
+ get_time(timeb, 40);
+- printf("**** [%s] - message [%lu] %s - %s\n",
++ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ timeb, (msg->sn + 1),
+ (char *)msg->out.header.iov_base,
+ (char *)(onents > 0 ? osglist[0].iov_base : NULL));
+@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi
+ struct ow_test_params *ow_params =
+ (struct ow_test_params *)cb_user_context;
+
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+
+ msg_pool_put(ow_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c
+--- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:54:32.797384938 -0400
+@@ -112,7 +112,7 @@ static void process_request(struct xio_m
+ if (++cnt == PRINT_COUNTER) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+
+- printf("**** message [%lu] %s - %s\n",
++ printf("**** message [%" PRIu64 "] %s - %s\n",
+ (msg->sn+1),
+ (char *)msg->in.header.iov_base,
+ (char *)sglist[0].iov_base);
+@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi
+ struct ow_test_params *ow_params =
+ (struct ow_test_params *)cb_user_context;
+
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+
+ msg_pool_put(ow_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c
+--- accelio/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:52:24.905791466 -0400
+@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++)
+
+ double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
+
+- printf("transactions per second: %lu, bandwidth: " \
++ printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ "TX %.2f MB/s, length: TX: %zd B\n",
+ pps, txbw,
+ test_params->stat.txlen);
+@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s
+ test_params->closed = 1;
+ break;
+ case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+- printf("nsent:%lu, ncomp:%lu, " \
+- "delta:%lu\n",
++ printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \
++ "delta:%" PRIu64 "\n",
+ test_params->nsent, test_params->ncomp,
+ test_params->nsent-test_params->ncomp);
+
+@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ struct test_params *test_params = (struct test_params *)cb_user_context;
+
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->sn, xio_strerror(error));
+
+ msg_pool_put(test_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c
+--- accelio/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:52:57.947944796 -0400
+@@ -110,7 +110,7 @@ static void process_request(struct xio_m
+ if (++cnt == PRINT_COUNTER) {
+ struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+
+- printf("**** message [%lu] %s - %s\n",
++ printf("**** message [%" PRIu64 "] %s - %s\n",
+ (msg->sn+1),
+ (char *)msg->in.header.iov_base,
+ (char *)sglist[0].iov_base);
+@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s
+ xio_disconnect(event_data->conn);
+ break;
+ case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+- printf("last recv:%lu\n",
++ printf("last recv:%" PRIu64 "\n",
+ test_params->nrecv);
+
+ xio_connection_destroy(event_data->conn);
+@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi
+ struct xio_msg *msg,
+ void *cb_user_context)
+ {
+- printf("**** [%p] message [%lu] failed. reason: %s\n",
++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ session, msg->request->sn, xio_strerror(error));
+
+ return 0;
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix
index 1a860496a4d..cce73904619 100644
--- a/pkgs/development/libraries/agda/categories/default.nix
+++ b/pkgs/development/libraries/agda/categories/default.nix
@@ -19,5 +19,6 @@ agda.mkDerivation (self: rec {
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ broken = true; # doesn't work due to new agdastdlib, see #9471
};
})
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 528ef71cda4..399640f6c4a 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libinput-0.21.0";
+ name = "libinput-1.0.1";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "0l7mhdr50g11hxg2pz8ihsgzbm0810syj05d3555rzhda6g7mkkw";
+ sha256 = "17prgxxq95i2l8a00clwwmvvskbb9xza9fmym1jvlmxl358v6bs8";
};
configureFlags = [
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 8abacf6f1c8..6c3314e0923 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
stdenv.mkDerivation rec {
- name = "libxkbcommon-0.4.3";
+ name = "libxkbcommon-0.5.0";
src = fetchurl {
url = "http://xkbcommon.org/download/${name}.tar.xz";
- sha1 = "2251adc7425c816ec7af4f1c3776a619a53293b6";
+ sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi";
};
buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 9e54be8aa90..a2b79d77e22 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
let
name = "scons";
- version = "2.3.5";
+ version = "2.3.6";
in
stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
- sha256 = "0hlwkrr5fkjpjgmwipp9a2bnc9riqks2pjc3rvjsq0a8j7hr72ca";
+ sha256 = "1pq44h0ndclbrwvx901zih63jnzqsyyr865zlml40klg3lssmbcq";
};
buildInputs = [python makeWrapper];
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index eb80937b6a3..25fd1a5cbbf 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation rec {
name = "${prefix}jack2-${version}";
- version = "2015-06-02";
+ version = "1.9.10";
src = fetchFromGitHub {
owner = "jackaudio";
repo = "jack2";
- rev = "b5bceb50c708f55cc569c3e1f0f1876a49fbdade";
- sha256 = "0dc00729wkbxnbhnmyfam1wdwd5m8jvrjccypb32bj072jqaqaw7";
+ rev = "v${version}";
+ sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
};
nativeBuildInputs = [ pkgconfig python makeWrapper ];
@@ -41,10 +41,12 @@ stdenv.mkDerivation rec {
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
];
- patchPhase = ''
+ prePatch = ''
substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
'';
+ patches = [ ./jack-gcc5.patch ];
+
configurePhase = ''
python waf configure --prefix=$out \
${optionalString (optDbus != null) "--dbus"} \
diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch
new file mode 100644
index 00000000000..f18042c6e32
--- /dev/null
+++ b/pkgs/misc/jackaudio/jack-gcc5.patch
@@ -0,0 +1,26 @@
+From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
+From: Adrian Knoth
+Date: Thu, 18 Sep 2014 18:29:23 +0200
+Subject: [PATCH] Fix FTBFS with clang++
+
+Forwarded from http://bugs.debian.org/757820
+---
+ common/memops.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/memops.c b/common/memops.c
+index 27f6194..2d416b6 100644
+--- a/common/memops.c
++++ b/common/memops.c
+@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
+ */
+ static unsigned int seed = 22222;
+
+-inline unsigned int fast_rand() {
++static inline unsigned int fast_rand() {
+ seed = (seed * 96314165) + 907633515;
+ return seed;
+ }
+--
+2.4.0
+
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index efd3515ff24..2dcdcdc4a91 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -23,10 +23,13 @@ stdenv.mkDerivation {
# perf refers both to newt and slang
# binutils is required for libbfd.
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ];
- buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++
+ buildInputs = [ python perl newt slang pkgconfig libunwind binutils ] ++
stdenv.lib.optional withGtk gtk;
- NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
+ # Note: we don't add elfutils to buildInputs, since it provides a
+ # bad `ld' and other stuff.
+ NIX_CFLAGS_COMPILE = "-I${elfutils}/include -Wno-error=cpp";
+ NIX_CFLAGS_LINK = "-L${elfutils}/lib";
installFlags = "install install-man ASCIIDOC8=1";
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
new file mode 100644
index 00000000000..a16e102bc08
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation rec {
+ name = "rtl8812au-${kernel.version}-${version}";
+ version = "4.2.2-1";
+
+ src = fetchFromGitHub {
+ owner = "csssuf";
+ repo = "rtl8812au";
+ rev = "874906aec694c800bfc29b146737b88dae767832";
+ sha256 = "14ifhplawipfd6971mxw76dv3ygwc0n8sbz2l3f0vvkin6x88bsj";
+ };
+
+ patchPhase = ''
+ substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
+ substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
+ substituteInPlace ./Makefile --replace /sbin/depmod #
+ substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+ '';
+
+ preInstall = ''
+ mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+ '';
+
+ meta = {
+ description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod.";
+ homepage = "https://github.com/csssuf/rtl8812au";
+ license = stdenv.lib.licenses.gpl2;
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
\ No newline at end of file
diff --git a/pkgs/servers/x11/xorg/fix_segfault.patch b/pkgs/servers/x11/xorg/fix_segfault.patch
new file mode 100644
index 00000000000..b3a7d2ed5e0
--- /dev/null
+++ b/pkgs/servers/x11/xorg/fix_segfault.patch
@@ -0,0 +1,63 @@
+From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001
+From: Martin Peres
+Date: Fri, 17 Jul 2015 17:21:26 +0300
+Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized
+ before use
+
+In WaitForSomething(), the fd_set clientsWritable may be used unitialized when
+the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to
+a crash in FlushAllOutput() after x11proto's commit
+2c94cdb453bc641246cc8b9a876da9799bee1ce7.
+
+The problem did not manifest before because both the XFD_SIZE and the maximum
+number of clients were set to 256. As the connectionTranslation table was
+initalized for the 256 clients to 0, the test on the index not being 0 was
+aborting before dereferencing the client #0.
+
+As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE
+got bumped to 512. This lead the OutputPending fd_set to have any fd above 256
+to be uninitialized which in turns lead to reading an index after the end of
+the ConnectionTranslation table. This index would then be used to find the
+client corresponding to the fd marked as pending writes and would also result
+to an out-of-bound access which would usually be the fatal one.
+
+Fix this by zeroing the clientsWritable fd_set at the beginning of
+WaitForSomething(). In this case, the bottom part of the loop, which would
+indirectly call FlushAllOutput, will not do any work but the next call to
+select will result in the execution of the right codepath. This is exactly what
+we want because we need to know the writable clients before handling them. In
+the end, it also makes sure that the fds above MaxClient are initialized,
+preventing the crash in FlushAllOutput().
+
+Thanks to everyone involved in tracking this one down!
+
+Reported-by: Karol Herbst
+Reported-by: Tobias Klausmann
+Signed-off-by: Martin Peres
+Tested-by: Martin Peres
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316
+Cc: Ilia Mirkin
+Cc: Martin Peres
+Cc: Olivier Fourdan
+Cc: Alan Coopersmith
+---
+ os/WaitFor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/os/WaitFor.c b/os/WaitFor.c
+index 431f1a6..993c14e 100644
+--- a/os/WaitFor.c
++++ b/os/WaitFor.c
+@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady)
+ Bool someReady = FALSE;
+
+ FD_ZERO(&clientsReadable);
++ FD_ZERO(&clientsWritable);
+
+ if (nready)
+ SmartScheduleStopTimer();
+--
+2.4.5
+
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2036e62ee94..c1a8fec596f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -282,7 +282,8 @@ in
inputproto xextproto randrproto renderproto presentproto
dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
];
- commonPatches = [ ./xorgserver-xkbcomp-path.patch ];
+ # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
+ commonPatches = [ ./xorgserver-xkbcomp-path.patch ./fix_segfault.patch ];
# XQuartz requires two compilations: the first to get X / XQuartz,
# and the second to get Xvfb, Xnest, etc.
darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index c5614506901..a36e29c6f08 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "2015-08-29";
+ version = "2015-09-04";
src = fetchgit {
url = "git://github.com/ceph/ceph.git";
- rev = "54626351679fe312d5b96cc0304755ae5f1ece40";
- sha256 = "12rdp1q7arxhg259y08pzix22yjlrjs5qmwv342qcl5xbfkg502r";
+ rev = "8c17e0197481205f8726b06d57313ffe08fba2bf";
+ sha256 = "189l412m6x0f0mqzhgzwfa3sgm5xfxzb9synlvbfm3n1fgdhj5iy";
};
patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index d9310e2372e..dfe2de9b96d 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, udev }:
stdenv.mkDerivation rec {
- name = "dhcpcd-6.9.2";
+ name = "dhcpcd-6.9.3";
src = fetchurl {
url = "mirror://roy/dhcpcd/${name}.tar.xz";
- sha256 = "0w4aqpn6wczvrffc51lq87acvqwqdskk7948z3sz9laslci29y79";
+ sha256 = "0lxfis066ijjlqha2mf49v8mydmnnjb6nijihfn65ylmsqg4g2b0";
};
buildInputs = [ pkgconfig udev ];
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 3a89922ca9e..f7d74b6a39a 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
stdenv.mkDerivation rec {
- name = "tinc-1.1pre-2015-07-17";
+ name = "tinc-1.1pre-2015-07-22";
src = fetchgit {
url = "git://tinc-vpn.org/tinc";
- rev = "f92c3446f2052a59d1e6a28f1bc7cec278cb1e48";
- sha256 = "1y15fk4i6jm9w3qkami2vgp5zfrm5frjxwfmwr4xiw23bmy9cgim";
+ rev = "56a8b90d863171d62e0a337b5635fbfc53a67fb0";
+ sha256 = "081z4xs5l988g1s0yr7fvnysajd05bx6s54sh84jvq7ij8af71dm";
};
- buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];
+ nativeBuildInputs = [ autoreconfHook texinfo ];
+ buildInputs = [ ncurses readline zlib lzo openssl ];
configureFlags = [
"--sysconfdir=/etc"
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index e773b1ff2e1..d193cfa438e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -86,13 +86,15 @@ in rec {
nix = nixStable;
nixStable = common rec {
- name = "nix-1.9";
+ name = "nix-1.10";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
+ sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6";
};
};
+ nixUnstable = nix;
+ /*
nixUnstable = lib.lowPrio (common rec {
name = "nix-1.10pre4212_e12cf82";
src = fetchurl {
@@ -100,5 +102,6 @@ in rec {
sha256 = "4165db0ea9bb6b5cd96d294348299f20ac045fc18db680104ff98fe9ac893f72";
};
});
+ */
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2673540382..07dcb2b53fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -723,7 +723,7 @@ let
bc = callPackage ../tools/misc/bc { };
- bdf2psf = callPackage ../tools/misc/bdf2psf { };
+ bdf2psf = callPackage ../tools/misc/bdf2psf { };
bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
@@ -5948,7 +5948,7 @@ let
aalib = callPackage ../development/libraries/aalib { };
- accelio = callPackage ../development/libraries/accelio { };
+ accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; };
accounts-qt = callPackage ../development/libraries/accounts-qt { };
@@ -6320,8 +6320,8 @@ let
freealut = callPackage ../development/libraries/freealut { };
freeglut = callPackage ../development/libraries/freeglut { };
-
- freenect = callPackage ../development/libraries/freenect {
+
+ freenect = callPackage ../development/libraries/freenect {
inherit (xlibs) libXi libXmu;
};
@@ -9915,6 +9915,8 @@ let
nvidia_x11_beta = callPackage ../os-specific/linux/nvidia-x11/beta.nix { };
nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
+ rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
+
openafsClient = callPackage ../servers/openafs-client { };
openiscsi = callPackage ../os-specific/linux/open-iscsi { };
@@ -11265,6 +11267,8 @@ let
htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
+ ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { };
+
icicles = callPackage ../applications/editors/emacs-modes/icicles { };
idris = callPackage ../applications/editors/emacs-modes/idris { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d6c31cfd72..b81bb0e247a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2742,18 +2742,18 @@ let
license = "BSD-style";
};
});
-
+
dask = buildPythonPackage rec {
name = "dask-${version}";
version = "0.7.0";
-
+
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/d/dask/${name}.tar.gz";
sha256 = "3b48646e9e66ec21a6885700d39ea90e2c2a7ad5d26773a8413b570eb1a67b3e";
};
-
+
propagatedBuildInputs = with self; [numpy toolz dill];
-
+
meta = {
description = "Minimal task scheduling abstraction";
homepage = "http://github.com/ContinuumIO/dask/";
@@ -2987,18 +2987,18 @@ let
license = licenses.mit;
};
};
-
+
dill = buildPythonPackage rec {
name = "dill-${version}";
version = "0.2.4";
-
+
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/d/dill/${name}.tgz";
sha256 = "deca57da33ad2121ab1b9c4493bf8eb2b3a72b6426d4b9a3a853a073c68b97ca";
};
-
+
propagatedBuildInputs = with self; [objgraph];
-
+
meta = {
description = "Serialize all of python (almost)";
homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm;
@@ -9063,21 +9063,21 @@ let
maintainers = with maintainers; [ phreedom thoughtpolice ];
};
});
-
+
objgraph = buildPythonPackage rec {
name = "objgraph-${version}";
version = "2.0.1";
-
+
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/o/objgraph/${name}.tar.gz";
sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a";
};
-
+
# Tests fail with PyPy.
disabled = isPyPy;
-
+
propagatedBuildInputs = with self; [pkgs.graphviz];
-
+
meta = {
description = "Draws Python object reference graphs with graphviz";
homepage = http://mg.pov.lt/objgraph/;
@@ -10399,7 +10399,6 @@ let
description = "A collection of tools for internationalizing Python applications";
license = "BSD";
maintainers = with maintainers; [ garbas ];
- platforms = platforms.linux;
};
});
@@ -15099,24 +15098,24 @@ let
license = licenses.mit;
};
});
-
+
xray = buildPythonPackage rec {
name = "xray-${version}";
version = "0.6.0";
-
+
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/x/xray/${name}.tar.gz";
sha256 = "c8c4aadb0d39662a81c259bd609f42708ff31c90012a9dd0a1f9ee56a798196f";
};
-
+
buildInputs = with self; [nose];
propagatedBuildInputs = with self; [numpy pandas];
-
+
meta = {
description = "N-D labeled arrays and datasets in Python";
homepage = https://github.com/xray/xray;
license = licenses.asl20;
- };
+ };
};
youtube-dl = callPackage ../tools/misc/youtube-dl {