Merge branch 'master' into closure-size

Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
344 changed files with 58220 additions and 29215 deletions
+6 -6
View File
@@ -5,13 +5,13 @@
let
plexpkg = if enablePlexPass then {
version = "0.9.16.3.1840";
vsnHash = "cece46d";
sha256 = "0p1rnia18a67h05f7l7smkpry1ldkpdkyvs9fgrqpay3w0jfk9gd";
version = "0.9.16.4.1911";
vsnHash = "ee6e505";
sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd";
} else {
version = "0.9.15.6.1714";
vsnHash = "7be11e1";
sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
version = "0.9.16.4.1911";
vsnHash = "ee6e505";
sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd";
};
in stdenv.mkDerivation rec {