Merge staging into master

Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
parent 003ab1d9fd 838c75398c
commit 8c4aeb1780
270 changed files with 460 additions and 403 deletions
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig python ];

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    sha256 = "9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [
    pkgconfig python gobjectIntrospection
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    sha256 = "9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];
  outputBin = "dev";

  nativeBuildInputs = [
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    sha256 = "a1d57ff9461407cca1f6e7a9f31a5bdb73f73f33c488a3e3318b27e10a4332ae";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig ];

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    sha256 = "8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig python ];

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig file ];

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    sha256 = "b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  configureFlags = stdenv.lib.optionalString withSystemLibav
    "--with-system-libav";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  patches = [ ./different-path-with-pygobject.patch ];

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig python ];

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    })
  ];

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
  propagatedBuildInputs = [ boost ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    sha256 = "9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ pkgconfig python ];

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    sha256 = "33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe";
  };

-  outputs = [ "dev" "out" ];
+  outputs = [ "out" "dev" ];

  nativeBuildInputs = [
    pkgconfig gobjectIntrospection