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
@@ -156,7 +156,7 @@ let
          baseRuby = baseruby;
          libPath = "lib/${rubyEngine}/${versionNoPatch}";
          gemPath = "lib/${rubyEngine}/gems/${versionNoPatch}";
-          dev = import ./dev.nix {
+          devEnv = import ./dev.nix {
            inherit buildEnv bundler bundix;
            ruby = self;
          };