Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
24c408f4
Unverified
Commit
24c408f4
authored
6 months ago
by
morguldir
Browse files
Options
Downloads
Patches
Plain Diff
bump rocksdb to 9.6.1, add binutils to devshell
parent
1c1f300e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!571
Implement MSC4133 and MSC4175, some bug fixes and features, drop target CPU for aarch64 to Cortex-A53, bump to Rust 1.81.0, RocksDB v9.6.1, and Nix build fixes
,
!570
update for ruma changes / nix fix
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Cargo.lock
+4
-4
4 additions, 4 deletions
Cargo.lock
deps/rust-rocksdb/Cargo.toml
+1
-1
1 addition, 1 deletion
deps/rust-rocksdb/Cargo.toml
flake.lock
+4
-4
4 additions, 4 deletions
flake.lock
flake.nix
+4
-1
4 additions, 1 deletion
flake.nix
with
13 additions
and
10 deletions
Cargo.lock
+
4
−
4
View file @
24c408f4
...
...
@@ -3194,8 +3194,8 @@ dependencies = [
[[package]]
name = "rust-librocksdb-sys"
version = "0.2
5
.0+9.
5.2
"
source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=
5383ca81
73
2
99
066b516406e3a2cf945ead891cb#5383ca81
73
2
99
066b516406e3a2cf945ead891cb
"
version = "0.2
6
.0+9.
6.1
"
source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=
22f942609921ecf83
7399
e1c2fe6fcb8dbb1095e#22f942609921ecf83
7399
e1c2fe6fcb8dbb1095e
"
dependencies = [
"bindgen",
"bzip2-sys",
...
...
@@ -3211,8 +3211,8 @@ dependencies = [
[[package]]
name = "rust-rocksdb"
version = "0.
29
.0"
source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=
5383ca81
73
2
99
066b516406e3a2cf945ead891cb#5383ca81
73
2
99
066b516406e3a2cf945ead891cb
"
version = "0.
30
.0"
source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=
22f942609921ecf83
7399
e1c2fe6fcb8dbb1095e#22f942609921ecf83
7399
e1c2fe6fcb8dbb1095e
"
dependencies = [
"libc",
"rust-librocksdb-sys",
...
...
This diff is collapsed.
Click to expand it.
deps/rust-rocksdb/Cargo.toml
+
1
−
1
View file @
24c408f4
...
...
@@ -27,7 +27,7 @@ malloc-usable-size = ["rust-rocksdb/malloc-usable-size"]
[dependencies.rust-rocksdb]
git
=
"https://github.com/girlbossceo/rust-rocksdb-zaidoon1"
rev
=
"
5383ca81
73
2
99
066b516406e3a2cf945ead891cb
"
rev
=
"
22f942609921ecf83
7399
e1c2fe6fcb8dbb1095e
"
#branch = "master"
default-features
=
false
...
...
This diff is collapsed.
Click to expand it.
flake.lock
+
4
−
4
View file @
24c408f4
...
...
@@ -680,16 +680,16 @@
"rocksdb": {
"flake": false,
"locked": {
"lastModified": 172
4285323
,
"narHash": "sha256-k6
0kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU
=",
"lastModified": 172
5811807
,
"narHash": "sha256-k6
aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk
=",
"owner": "girlbossceo",
"repo": "rocksdb",
"rev": "
5a67ad7ce46328578ee5587fb0c23faa03d14e67
",
"rev": "
347d50e212b24d98b5ad9841404ff80c1bb873f0
",
"type": "github"
},
"original": {
"owner": "girlbossceo",
"ref": "v9.
5.2
",
"ref": "v9.
6.1
",
"repo": "rocksdb",
"type": "github"
}
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
4
−
1
View file @
24c408f4
...
...
@@ -9,7 +9,7 @@
flake-utils
.
url
=
"github:numtide/flake-utils?ref=main"
;
nix-filter
.
url
=
"github:numtide/nix-filter?ref=main"
;
nixpkgs
.
url
=
"github:NixOS/nixpkgs?ref=nixpkgs-unstable"
;
rocksdb
=
{
url
=
"github:girlbossceo/rocksdb?ref=v9.
5.2
"
;
flake
=
false
;
};
rocksdb
=
{
url
=
"github:girlbossceo/rocksdb?ref=v9.
6.1
"
;
flake
=
false
;
};
liburing
=
{
url
=
"github:axboe/liburing?ref=master"
;
flake
=
false
;
};
};
...
...
@@ -120,6 +120,9 @@
cargo-audit
liburing
# Required by hardened-malloc.rs dep
binutils
# Needed for producing Debian packages
cargo-deb
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment