Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Bazel 2.1 #108

Merged
merged 2 commits into from
Mar 9, 2020
Merged

Update to Bazel 2.1 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a897d1a
nixpkgs: Update to Bazel 2.1
aherrmann Mar 9, 2020
0e60817
Work around Bazel toolchain constraint issue
aherrmann Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"owner": "NixOS",
"repo": "nixpkgs-channels",
"branch": "nixpkgs-unstable",
"rev": "1ee040724a417d9e6e8e28dfd88a0c8c35070689",
"sha256": "0r8dv6p1vhxzv50j50bjvwrq5wi9sg35nkm12ga25pw1lzvv6yr9"
"rev": "6b6f9d769a5086df38a06b680104d0c5fd1a8e0e",
"sha256": "1pc6ypxas76i2l2dhr58bml2f0hmgz8py0d8zylwivhs6zg9fcgs"
}
2 changes: 1 addition & 1 deletion nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let
# nixpkgs-unstable as of 2019-11-17
# nixpkgs-unstable as of 2020-03-09
spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
nixpkgs = fetchTarball {
url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
Expand Down
4 changes: 2 additions & 2 deletions nixpkgs/constraints/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ platform(
constraint_values = [
"@platforms//cpu:x86_64",
"@platforms//os:linux",
":nixpkgs",
"@io_tweag_rules_nixpkgs//nixpkgs/constraints:nixpkgs",
],
visibility = ["//visibility:public"],
)
Expand All @@ -19,7 +19,7 @@ platform(
constraint_values = [
"@platforms//cpu:x86_64",
"@platforms//os:osx",
":nixpkgs",
"@io_tweag_rules_nixpkgs//nixpkgs/constraints:nixpkgs",
],
visibility = ["//visibility:public"],
)