From 5ce9b06f6a048c5449f14316ef84a629efc0cbc4 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Tue, 18 Jun 2019 17:31:30 +0200
Subject: [PATCH] Bazel 0.27

---
 .bazelrc             | 22 ++++++++++++++++++++++
 .circleci/config.yml |  4 ++--
 .netlify/install.sh  |  2 +-
 azure-pipelines.yml  |  2 +-
 nixpkgs/default.nix  |  5 ++---
 shell.nix            |  1 -
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 73654329f3..feb6ecd6b9 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -18,6 +18,28 @@ test:ci --test_output=errors
 # see: https://github.com/tweag/rules_haskell/issues/647#issuecomment-459001362
 test:windows --experimental_enable_runfiles
 
+# WIP: bazel 0.27 fixs
+build\
+      --incompatible_disable_genrule_cc_toolchain_dependency=false\
+      --incompatible_no_transitive_loads=false\
+      --incompatible_disable_deprecated_attr_params=false\
+      --incompatible_new_actions_api=false\
+      --incompatible_no_support_tools_in_action_inputs=false\
+      --incompatible_require_ctx_in_configure_features=false\
+      --incompatible_depset_is_not_iterable=false\
+      --incompatible_depset_union=false\
+      --incompatible_use_python_toolchains=false
+test\
+      --incompatible_disable_genrule_cc_toolchain_dependency=false\
+      --incompatible_no_transitive_loads=false\
+      --incompatible_disable_deprecated_attr_params=false\
+      --incompatible_new_actions_api=false\
+      --incompatible_no_support_tools_in_action_inputs=false\
+      --incompatible_require_ctx_in_configure_features=false\
+      --incompatible_depset_is_not_iterable=false\
+      --incompatible_depset_union=false\
+      --incompatible_use_python_toolchains=false
+
 # test environment does not propagate locales by default
 # some tests reads files written in UTF8, we need to propagate the correct
 # environment variables, such as LOCALE_ARCHIVE
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd1416338a..f7f47dcc42 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,8 +32,8 @@ jobs:
             apt-get install -y wget gnupg golang make libgmp3-dev libtinfo-dev pkg-config zip g++ zlib1g-dev unzip python python3 bash-completion locales
             echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
             locale-gen
-            wget "https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel_0.24.0-linux-x86_64.deb"
-            dpkg -i bazel_0.24.0-linux-x86_64.deb
+            wget "https://github.com/bazelbuild/bazel/releases/download/0.27.0/bazel_0.27.0-linux-x86_64.deb"
+            dpkg -i bazel_0.27.0-linux-x86_64.deb
             echo "common:ci --build_tag_filters -requires_hackage,-requires_zlib,-requires_doctest,-requires_c2hs,-requires_threaded_rts,-dont_test_with_bindist" > .bazelrc.local
       - run:
           name: Build tests
diff --git a/.netlify/install.sh b/.netlify/install.sh
index 7d8e148317..fba6a2a7da 100755
--- a/.netlify/install.sh
+++ b/.netlify/install.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-V=0.20.0
+V=0.27.0
 
 curl -LO https://github.com/bazelbuild/bazel/releases/download/$V/bazel-$V-installer-linux-x86_64.sh
 chmod +x bazel-$V-installer-linux-x86_64.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d7d38059f3..c1914af575 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,7 +9,7 @@ jobs:
       architecture: 'x64'
   - bash: |
       set -e
-      curl -LO https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel-0.24.0-windows-x86_64.exe
+      curl -LO https://github.com/bazelbuild/bazel/releases/download/0.27.0/bazel-0.27.0-windows-x86_64.exe
       mv bazel-*.exe bazel.exe
       mkdir /c/bazel
       mv bazel.exe /c/bazel
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
index f4303b0c47..2fe790966f 100644
--- a/nixpkgs/default.nix
+++ b/nixpkgs/default.nix
@@ -1,5 +1,4 @@
 import (fetchTarball {
-   # Checkout from 2019-05-06.
-   url = https://github.com/mboes/nixpkgs/archive/361e9185c83166b44419e05e75fc8473875df6ea.tar.gz;
-   sha256 = "0c6izp9i1ln4yy2h9jlm48k94f018h8pw60jfbhq49p076aaafrb";
+   url = https://github.com/NixOS/nixpkgs/archive/a2075a2c314ccb3df6522dd957bb4e237446dc49.tar.gz;
+   sha256 = "1jbnjw06mca7867q81v3i3jljj0wpm38y9zjwij3nd6pp2bqhvbr";
 })
diff --git a/shell.nix b/shell.nix
index 62bac4d8f5..9190859ff6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,6 @@
 { pkgs ? import ./nixpkgs {}, docTools ? true }:
 
 with pkgs;
-
 mkShell {
   # XXX: hack for macosX, this flags disable bazel usage of xcode
   # Note: this is set even for linux so any regression introduced by this flag