From 0627a145029af8e3ae20ab307affb8ec20070557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Wed, 25 Mar 2020 18:10:55 +0100 Subject: [PATCH 1/2] Adapt to change in sh_posix_toolchain prototype: https://github.com/tweag/rules_sh/pull/14 --- nixpkgs/nixpkgs.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs/nixpkgs.bzl b/nixpkgs/nixpkgs.bzl index a1e6fafe5..2c3d004fe 100644 --- a/nixpkgs/nixpkgs.bzl +++ b/nixpkgs/nixpkgs.bzl @@ -504,7 +504,7 @@ runCommand "bazel-nixpkgs-posix-toolchain" def create_posix_toolchain(): sh_posix_toolchain( name = "nixpkgs_sh_posix", - **{{ + cmds = {{ cmd: discovered[cmd] for cmd in posix.commands if cmd in discovered From 12867dd44088ad039cc66feeaf08185bca6a314d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Thu, 26 Mar 2020 16:34:07 +0100 Subject: [PATCH 2/2] Update rules_sh to 0.2.0, to use new sh_posix_toolchain prototype; as required by previous commit --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b2fb63566..f37ab6cf9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -151,9 +151,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_sh", - sha256 = "2613156e96b41fe0f91ac86a65edaea7da910b7130f2392ca02e8270f674a734", - strip_prefix = "rules_sh-0.1.0", - urls = ["https://github.com/tweag/rules_sh/archive/v0.1.0.tar.gz"], + sha256 = "83a065ba6469135a35786eb741e17d50f360ca92ab2897857475ab17c0d29931", + strip_prefix = "rules_sh-0.2.0", + urls = ["https://github.com/tweag/rules_sh/archive/v0.2.0.tar.gz"], ) load("@rules_sh//sh:repositories.bzl", "rules_sh_dependencies")