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

Upgrade nixpkgs to revision 23.05, Bazel upgrade #51

Merged
merged 6 commits into from
Dec 5, 2023
Merged

Upgrade nixpkgs to revision 23.05, Bazel upgrade #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9e180a
Upgrade nixpkgs to revision 23.05
avdv Nov 28, 2023
3b98274
Upgrade GHC 9.2.2 to 9.2.5
avdv Nov 28, 2023
6437de0
Upgrade rules_haskell to version 0.17
avdv Nov 28, 2023
8868149
Upgrade rules_go to version 0.39.0
avdv Nov 28, 2023
eab7099
Use bazel_6 and openjdk11_headless from nixpkgs
avdv Nov 28, 2023
56b02e4
CI: Cancel old PR workflow runs automatically
avdv Nov 28, 2023
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
2 changes: 1 addition & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ common:ghc_8_10_7 --repo_env=GHC_VERSION=8.10.7

common:ghc_9_0_2 --repo_env=GHC_VERSION=9.0.2

common:ghc_9_2_2 --repo_env=GHC_VERSION=9.2.2
common:ghc_9_2_5 --repo_env=GHC_VERSION=9.2.5

# Try to load a file that includes the remote cache authentication flag
try-import %workspace%/.bazelrc.auth
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ env:
jobs:
test-nixpkgs:
name: Build & Test - Nixpkgs
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.ghc-version }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
ghc-version: ["ghc_8_10_7", "ghc_9_0_2", "ghc_9_2_2"]
ghc-version: ["ghc_8_10_7", "ghc_9_0_2", "ghc_9_2_5"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions WORKSPACE
View file
Open in desktop
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 = "57e55ca74c9dd2710da852c6c9a70fc0274f038ff37216b6c48fd9389bbfbce7",
strip_prefix = "rules_haskell-b8ac6c18d26c0011a2464200762e45302a70bbf6",
urls = ["https://github.com/tweag/rules_haskell/archive/b8ac6c18d26c0011a2464200762e45302a70bbf6.zip"],
sha256 = "298f6f0db23391274b4eca215daa01797d05699469048ef94540d5829b466377",
strip_prefix = "rules_haskell-0.17",
url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.17.tar.gz",
)

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

http_archive(
name = "io_bazel_rules_go",
sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f",
sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
],
)

Expand Down
12 changes: 6 additions & 6 deletions example/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ local_repository(

http_archive(
name = "rules_haskell",
sha256 = "57e55ca74c9dd2710da852c6c9a70fc0274f038ff37216b6c48fd9389bbfbce7",
strip_prefix = "rules_haskell-b8ac6c18d26c0011a2464200762e45302a70bbf6",
urls = ["https://github.com/tweag/rules_haskell/archive/b8ac6c18d26c0011a2464200762e45302a70bbf6.zip"],
sha256 = "298f6f0db23391274b4eca215daa01797d05699469048ef94540d5829b466377",
strip_prefix = "rules_haskell-0.17",
url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.17.tar.gz",
)

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

http_archive(
name = "io_bazel_rules_go",
sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f",
sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
],
)

Expand Down
2 changes: 1 addition & 1 deletion nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.tar.gz")
import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/tags/23.05.tar.gz")
6 changes: 3 additions & 3 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ mkShell {
# will be catched earlier
# See: https://github.com/bazelbuild/bazel/issues/4231
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1;
buildInputs = [
bazel_4
packages = [
bazel_6
binutils
cacert
diffutils # for buildifier-diff
git
nix
openjdk11
openjdk11_headless
python3
# convenience dependencies
less
Expand Down
26 changes: 12 additions & 14 deletions snapshot-9.2.2.json → snapshot-9.2.5.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion snapshot-9.2.2.yaml → snapshot-9.2.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2022-06-06
resolver: lts-20.11

packages:
- git: https://github.com/tweag/cabal
Expand Down
12 changes: 6 additions & 6 deletions tests/alternative-deps/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ local_repository(

http_archive(
name = "rules_haskell",
sha256 = "57e55ca74c9dd2710da852c6c9a70fc0274f038ff37216b6c48fd9389bbfbce7",
strip_prefix = "rules_haskell-b8ac6c18d26c0011a2464200762e45302a70bbf6",
urls = ["https://github.com/tweag/rules_haskell/archive/b8ac6c18d26c0011a2464200762e45302a70bbf6.zip"],
sha256 = "298f6f0db23391274b4eca215daa01797d05699469048ef94540d5829b466377",
strip_prefix = "rules_haskell-0.17",
url = "https://github.com/tweag/rules_haskell/archive/refs/tags/v0.17.tar.gz",
)

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

http_archive(
name = "io_bazel_rules_go",
sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f",
sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
],
)

Expand Down
Loading