Skip to content

Commit

Permalink
Revert "Update:"
Browse files Browse the repository at this point in the history
This reverts commit 94451cd.
  • Loading branch information
facundominguez committed Feb 10, 2022
1 parent d2ea389 commit d174200
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
16 changes: 8 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "rules_haskell",
sha256 = "851e16edc7c33b977649d66f2f587071dde178a6e5bcfeca5fe9ebbe81924334",
strip_prefix = "rules_haskell-0.14",
url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.14.tar.gz",
sha256 = "427f7363d4b6addafaae1a371d60da6eb0a236b6fb7884d5a087e47e92f55403",
strip_prefix = "rules_haskell-f929776456ee3814991c6dcc4d67d15088cb148e",
url = "https://github.com/tweag/rules_haskell/archive/f929776456ee3814991c6dcc4d67d15088cb148e.zip",
)

load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies")
Expand Down Expand Up @@ -64,7 +64,7 @@ stack_snapshot(
load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")

haskell_register_ghc_nixpkgs(
attribute_path = "haskell.compiler.ghc8107",
attribute_path = "haskell.compiler.ghc8104",
compiler_flags = [
"-Werror",
"-Wall",
Expand All @@ -73,7 +73,7 @@ haskell_register_ghc_nixpkgs(
"-Wredundant-constraints",
],
repositories = {"nixpkgs": "@nixpkgs"},
version = "8.10.7",
version = "8.10.4",
)

###############
Expand All @@ -82,10 +82,10 @@ haskell_register_ghc_nixpkgs(

http_archive(
name = "io_bazel_rules_go",
sha256 = "d6b2513456fe2229811da7eb67a444be7785f5323c6708b38d851d2b51e54d83",
sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
],
)

Expand Down
17 changes: 9 additions & 8 deletions example/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ local_repository(
##########################
# rules_haskell preamble
##########################

http_archive(
name = "rules_haskell",
sha256 = "851e16edc7c33b977649d66f2f587071dde178a6e5bcfeca5fe9ebbe81924334",
strip_prefix = "rules_haskell-0.14",
url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.14.tar.gz",
sha256 = "427f7363d4b6addafaae1a371d60da6eb0a236b6fb7884d5a087e47e92f55403",
strip_prefix = "rules_haskell-f929776456ee3814991c6dcc4d67d15088cb148e",
url = "https://github.com/tweag/rules_haskell/archive/f929776456ee3814991c6dcc4d67d15088cb148e.zip",
)

load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies")
Expand Down Expand Up @@ -59,7 +60,7 @@ stack_snapshot(
load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")

haskell_register_ghc_nixpkgs(
attribute_path = "haskell.compiler.ghc8107",
attribute_path = "haskell.compiler.ghc8104",
compiler_flags = [
"-Werror",
"-Wall",
Expand All @@ -68,7 +69,7 @@ haskell_register_ghc_nixpkgs(
"-Wredundant-constraints",
],
repositories = {"nixpkgs": "@nixpkgs"},
version = "8.10.7",
version = "8.10.4",
)

###############
Expand All @@ -77,10 +78,10 @@ haskell_register_ghc_nixpkgs(

http_archive(
name = "io_bazel_rules_go",
sha256 = "d6b2513456fe2229811da7eb67a444be7785f5323c6708b38d851d2b51e54d83",
sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion nixpkgs.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import (fetchTarball "https://github.com/nixos/nixpkgs/archive/89f196fe781c53cb50fef61d3063fa5e8d61b6e5.tar.gz")
import (fetchTarball "https://github.com/nixos/nixpkgs/archive/46113713d4f25579e07b78116a61ab6f178f4153.tar.gz")
1 change: 0 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ mkShell {
binutils
cacert
nix
git
openjdk11
python3
# convenience dependencies
Expand Down
12 changes: 6 additions & 6 deletions tests/alternative-deps/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ local_repository(

http_archive(
name = "rules_haskell",
sha256 = "851e16edc7c33b977649d66f2f587071dde178a6e5bcfeca5fe9ebbe81924334",
strip_prefix = "rules_haskell-0.14",
url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.14.tar.gz",
sha256 = "427f7363d4b6addafaae1a371d60da6eb0a236b6fb7884d5a087e47e92f55403",
strip_prefix = "rules_haskell-f929776456ee3814991c6dcc4d67d15088cb148e",
url = "https://github.com/tweag/rules_haskell/archive/f929776456ee3814991c6dcc4d67d15088cb148e.zip",
)

load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies")
Expand Down Expand Up @@ -83,10 +83,10 @@ haskell_register_ghc_nixpkgs(

http_archive(
name = "io_bazel_rules_go",
sha256 = "d6b2513456fe2229811da7eb67a444be7785f5323c6708b38d851d2b51e54d83",
sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
],
)

Expand Down

0 comments on commit d174200

Please sign in to comment.