Skip to content

Repin makepad-script to makepad main f08eec53 #43

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

Merged
ymote merged 1 commit into from
Sep 28, 2026
Merged

Repin makepad-script to makepad main f08eec53 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UPSTREAM.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ parser, derive crate, and their leaf dependencies come from the `octoscript`
branch of the OctoSense fork of Makepad, consumed as a pinned git dependency:

```toml
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" }
```

The pin appears in exactly two manifests, `crates/octoscript-core/Cargo.toml`
Expand Down
2 changes: 1 addition & 1 deletion crates/octoscript-capabilities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
blake3 = { version = "1.8.5", features = ["pure"] }
getrandom = { version = "0.3.4", features = ["wasm_js"] }
keyring = { version = "3.6.3", default-features = false, features = ["apple-native", "windows-native"], optional = true }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.150"
octoscript-core = { path = "../octoscript-core" }
Expand Down
2 changes: 1 addition & 1 deletion crates/octoscript-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ workspace = true

[dependencies]
octoscript-ui-l0 = { path = "../octoscript-ui-l0" }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" }
makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" }
serde_json = "1.0.150"
26 changes: 13 additions & 13 deletions fuzz/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading