Skip to content

Commit 612f9af

Browse files
committed
use glistix 0.7.0 patches
1 parent 38dc4b0 commit 612f9af

File tree

2 files changed

+10
-26
lines changed

2 files changed

+10
-26
lines changed

gleam.toml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,12 @@ repository = { type = "github", user = "glistix", repo = "json" }
99
links = []
1010

1111
[dependencies]
12-
# Run 'git submodule add --name stdlib -- https://github.com/glistix/stdlib external/stdlib'
13-
# to clone Glistix's stdlib patch to the local path specified below. This is needed so stdlib
14-
# will work on the Nix target. Hex dependents will use the stdlib version specified below,
15-
# in [glistix.preview.hex-patch], instead.
16-
gleam_stdlib = { path = "./external/stdlib" }
12+
gleam_stdlib = "~> 0.19 or ~> 1.0"
1713
thoas = "~> 0.2"
1814

1915
[dev-dependencies]
2016
glistix_gleeunit = ">= 1.0.0 and < 2.0.0"
2117

22-
# The [glistix.preview] namespace contains useful settings which will be needed
23-
# during Glistix beta. In the future, it's likely these won't be necessary
24-
# anymore.
25-
[glistix.preview]
26-
# If you're patching a package using a local dependency/Git submodule and you
27-
# get a local dependency conflict error, add it to the list below.
28-
local-overrides = ["gleam_stdlib"]
29-
30-
# The section below allows publishing your package to Hex despite having
31-
# local dependencies, by declaring that you depend on another Hex package
32-
# instead.
33-
# This is needed to be able to patch stdlib etc. locally during development
34-
# and at the same time publish to Hex without the patch.
35-
# The section below should only be used for this purpose. Please do not abuse
36-
# this feature, as it is mostly a temporary workaround while Gleam doesn't have
37-
# a proper dependency patching system.
38-
[glistix.preview.hex-patch]
39-
gleam_stdlib = "~> 0.19 or ~> 1.0"
18+
# Use glistix_stdlib when running
19+
[glistix.preview.patch]
20+
gleam_stdlib = { name = "glistix_stdlib", version = "~> 0.19 or ~> 1.0" }

manifest.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
# You typically do not need to edit this file
33

44
packages = [
5-
{ name = "gleam_stdlib", version = "0.37.0", build_tools = ["gleam"], requirements = [], source = "local", path = "external/stdlib" },
6-
{ name = "glistix_gleeunit", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glistix_gleeunit", source = "hex", outer_checksum = "6FE984935DCF11DB7E4F2A6D1F8812334F30EBCC62A0CE718D22BA01F7777137" },
5+
{ name = "glistix_gleeunit", version = "1.1.0", build_tools = ["gleam"], requirements = ["glistix_stdlib"], otp_app = "glistix_gleeunit", source = "hex", outer_checksum = "6FE984935DCF11DB7E4F2A6D1F8812334F30EBCC62A0CE718D22BA01F7777137" },
6+
{ name = "glistix_stdlib", version = "0.38.0", build_tools = ["gleam"], requirements = [], otp_app = "glistix_stdlib", source = "hex", outer_checksum = "68B3DE9A370BDEFC9F446F8D25518F862EAC25EB74CF1CA3E01EFA5EC9C09D18" },
77
{ name = "thoas", version = "0.4.1", build_tools = ["rebar3"], requirements = [], otp_app = "thoas", source = "hex", outer_checksum = "4918D50026C073C4AB1388437132C77A6F6F7C8AC43C60C13758CC0ADCE2134E" },
88
]
99

1010
[requirements]
11-
gleam_stdlib = { path = "./external/stdlib" }
1211
glistix_gleeunit = { version = ">= 1.0.0 and < 2.0.0" }
12+
glistix_stdlib = { version = "~> 0.19 or ~> 1.0" }
1313
thoas = { version = "~> 0.2" }
14+
15+
[glistix.preview.patch]
16+
gleam_stdlib = { name = "glistix_stdlib", version = "~> 0.19 or ~> 1.0" }

0 commit comments

Comments
 (0)