Merge remote-tracking branch 'upstream/master' into staging

2018-05-03 16:24:30 -04:00
parent cbe21ac614 b45ef79b74
commit cf06e42d1c
330 changed files with 20112 additions and 16126 deletions
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -1,7 +1,5 @@
 { stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }:

-assert stdenv.system == "x86_64-linux";
-
 with stdenv.lib;

 stdenv.mkDerivation rec {
@@ -79,5 +77,6 @@ stdenv.mkDerivation rec {
    description = "Oracle Database Express Edition";
    homepage = http://www.oracle.com/technetwork/products/express-edition/;
    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
  };
 }