Skip to content

Commit eda15ac

Browse files
committed
WIP
1 parent 5053f78 commit eda15ac

File tree

6 files changed

+395
-37
lines changed

6 files changed

+395
-37
lines changed

BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ package(default_visibility = ["//visibility:public"])
1212
#
1313
# bazel run -c opt //:buildifier
1414
#
15-
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
15+
#load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
1616

17-
buildifier(
18-
name = "buildifier",
19-
)
17+
#buildifier(
18+
# name = "buildifier",
19+
#)

WORKSPACE

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -138,46 +138,46 @@ nixpkgs_python_configure(
138138

139139
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
140140

141-
http_archive(
142-
name = "io_bazel_rules_go",
143-
sha256 = "f99a9d76e972e0c8f935b2fe6d0d9d778f67c760c6d2400e23fc2e469016e2bd",
144-
urls = [
145-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.21.2/rules_go-v0.21.2.tar.gz",
146-
"https://github.com/bazelbuild/rules_go/releases/download/v0.21.2/rules_go-v0.21.2.tar.gz",
147-
],
148-
)
141+
#http_archive(
142+
# name = "io_bazel_rules_go",
143+
# sha256 = "f99a9d76e972e0c8f935b2fe6d0d9d778f67c760c6d2400e23fc2e469016e2bd",
144+
# urls = [
145+
# "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.21.2/rules_go-v0.21.2.tar.gz",
146+
# "https://github.com/bazelbuild/rules_go/releases/download/v0.21.2/rules_go-v0.21.2.tar.gz",
147+
# ],
148+
#)
149149

150-
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
150+
#load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
151151

152-
go_rules_dependencies()
152+
#go_rules_dependencies()
153153

154-
go_register_toolchains()
154+
#go_register_toolchains()
155155

156-
http_archive(
157-
name = "bazel_gazelle",
158-
sha256 = "be9296bfd64882e3c08e3283c58fcb461fa6dd3c171764fcc4cf322f60615a9b",
159-
urls = [
160-
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz",
161-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz",
162-
],
163-
)
156+
#http_archive(
157+
# name = "bazel_gazelle",
158+
# sha256 = "be9296bfd64882e3c08e3283c58fcb461fa6dd3c171764fcc4cf322f60615a9b",
159+
# urls = [
160+
# "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz",
161+
# "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz",
162+
# ],
163+
#)
164164

165-
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
165+
#load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
166166

167-
gazelle_dependencies()
167+
#gazelle_dependencies()
168168

169-
http_archive(
170-
name = "com_google_protobuf",
171-
strip_prefix = "protobuf-master",
172-
urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
173-
)
169+
#http_archive(
170+
# name = "com_google_protobuf",
171+
# strip_prefix = "protobuf-master",
172+
# urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
173+
#)
174174

175-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
175+
#load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
176176

177-
protobuf_deps()
177+
#protobuf_deps()
178178

179-
http_archive(
180-
name = "com_github_bazelbuild_buildtools",
181-
strip_prefix = "buildtools-master",
182-
url = "https://github.com/bazelbuild/buildtools/archive/master.zip",
183-
)
179+
#http_archive(
180+
# name = "com_github_bazelbuild_buildtools",
181+
# strip_prefix = "buildtools-master",
182+
# url = "https://github.com/bazelbuild/buildtools/archive/master.zip",
183+
#)

ghc.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@ in haskellPackages.ghcWithPackages (p: with p; [
3636
vector
3737
xml-conduit
3838
xml-types
39+
xmonad
40+
xmonad-contrib
3941
# tons of other packages here
4042
])

treetide/thirdparty/haskell/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ haskell_toolchain_library(name = "containers")
2020

2121
haskell_toolchain_library(name = "deepseq")
2222

23+
haskell_toolchain_library(name = "directory")
24+
2325
haskell_toolchain_library(name = "mtl")
2426

2527
haskell_toolchain_library(name = "text")
@@ -49,6 +51,9 @@ haskell_toolchain_library(name = "xml-conduit")
4951

5052
haskell_toolchain_library(name = "xml-types")
5153

54+
haskell_toolchain_library(name = "xmonad")
55+
haskell_toolchain_library(name = "xmonad-contrib")
56+
5257
# ...
5358
#
5459
# Tons of stuff here again

xmonad/BUILD

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
load(
4+
"@rules_haskell//haskell:defs.bzl",
5+
"haskell_library",
6+
"haskell_test",
7+
"haskell_binary",
8+
)
9+
load(
10+
"//treetide/haskell/build_defs:build.bzl",
11+
"prebuilt",
12+
"extended",
13+
)
14+
15+
#haskell_library(
16+
# name = "foo",
17+
# srcs = ["foo.hs"],
18+
# deps = [
19+
# extended("attoparsec"),
20+
# prebuilt("base"),
21+
# prebuilt("text"),
22+
# ],
23+
#)
24+
25+
26+
haskell_binary(
27+
name = "xmonad",
28+
srcs = ["xmonad.hs"],
29+
deps = [
30+
prebuilt("base"),
31+
prebuilt("containers"),
32+
prebuilt("directory"),
33+
prebuilt("xmonad"),
34+
prebuilt("xmonad-contrib"),
35+
],
36+
)
37+

0 commit comments

Comments
 (0)