Merge branch 'master' into staging

Hydra: ?compare=1399476
2017-10-07 10:16:36 +02:00
parent 656a0089f6 893df17c5a
commit ef41fc7f51
89 changed files with 2041 additions and 888 deletions
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -85,7 +85,6 @@ let
      license = licenses.postgresql;
      maintainers = [ maintainers.ocharles ];
      platforms = platforms.unix;
-      hydraPlatforms = platforms.linux;
    };
  });

@@ -115,4 +114,10 @@ in {
    sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6";
  };

+  postgresql100 = common {
+    version = "10.0";
+    psqlSchema = "10.0";
+    sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi";
+  };
+
 }