diff --git a/WORKSPACE b/WORKSPACE index d547df8..b95f153 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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") @@ -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", @@ -73,7 +73,7 @@ haskell_register_ghc_nixpkgs( "-Wredundant-constraints", ], repositories = {"nixpkgs": "@nixpkgs"}, - version = "8.10.7", + version = "8.10.4", ) ############### @@ -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", ], ) diff --git a/example/WORKSPACE b/example/WORKSPACE index 75e3e82..198250d 100644 --- a/example/WORKSPACE +++ b/example/WORKSPACE @@ -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") @@ -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", @@ -68,7 +69,7 @@ haskell_register_ghc_nixpkgs( "-Wredundant-constraints", ], repositories = {"nixpkgs": "@nixpkgs"}, - version = "8.10.7", + version = "8.10.4", ) ############### @@ -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", ], ) diff --git a/nixpkgs.nix b/nixpkgs.nix index 25f3774..afb1223 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1 +1 @@ -import (fetchTarball "https://github.com/nixos/nixpkgs/archive/89f196fe781c53cb50fef61d3063fa5e8d61b6e5.tar.gz") +import (fetchTarball "https://github.com/nixos/nixpkgs/archive/46113713d4f25579e07b78116a61ab6f178f4153.tar.gz") diff --git a/shell.nix b/shell.nix index d81fcca..7fa3499 100644 --- a/shell.nix +++ b/shell.nix @@ -13,7 +13,6 @@ mkShell { binutils cacert nix - git openjdk11 python3 # convenience dependencies diff --git a/tests/alternative-deps/WORKSPACE b/tests/alternative-deps/WORKSPACE index 0a49be4..d071f08 100644 --- a/tests/alternative-deps/WORKSPACE +++ b/tests/alternative-deps/WORKSPACE @@ -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") @@ -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", ], )