From fa3b1fd9bd330169f91934257d3d5ca1a4398bf5 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 16 Jul 2023 13:37:40 -0700
Subject: [PATCH 1/4] update flake.lock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'crane':
'github:ipetkov/crane/75f7d715f8088f741be9981405f6444e2d49efdd' (2023-06-13)
→ 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
• Updated input 'crane/rust-overlay':
'github:oxalica/rust-overlay/c535b4f3327910c96dcf21851bbdd074d0760290' (2023-06-03)
→ 'github:oxalica/rust-overlay/f9b92316727af9e6c7fee4a761242f7f46880329' (2023-07-03)
• Updated input 'fenix':
'github:nix-community/fenix/df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791' (2023-06-17)
→ 'github:nix-community/fenix/39096fe3f379036ff4a5fa198950b8e79defe939' (2023-07-16)
• Updated input 'fenix/rust-analyzer-src':
'github:rust-lang/rust-analyzer/a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6' (2023-06-16)
→ 'github:rust-lang/rust-analyzer/996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8' (2023-07-15)
• Updated input 'flake-utils':
'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
→ 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/04af42f3b31dba0ef742d254456dc4c14eedac86' (2023-06-17)
→ 'github:NixOS/nixpkgs/8acef304efe70152463a6399f73e636bcc363813' (2023-07-15)
---
flake.lock | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/flake.lock b/flake.lock
index b69bb8c0..00655252 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1686621798,
- "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=",
+ "lastModified": 1688772518,
+ "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "75f7d715f8088f741be9981405f6444e2d49efdd",
+ "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
"type": "github"
},
"original": {
@@ -33,11 +33,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1687004852,
- "narHash": "sha256-wRSUs+v8xtIJaFlWO5NLFQjkq5+eYhxHHXnZKsZ9DpQ=",
+ "lastModified": 1689488573,
+ "narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791",
+ "rev": "39096fe3f379036ff4a5fa198950b8e79defe939",
"type": "github"
},
"original": {
@@ -67,11 +67,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "lastModified": 1689068808,
+ "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@@ -82,11 +82,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1686960236,
- "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
+ "lastModified": 1689444953,
+ "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
+ "rev": "8acef304efe70152463a6399f73e636bcc363813",
"type": "github"
},
"original": {
@@ -107,11 +107,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1686936697,
- "narHash": "sha256-mCoPr1nNWKpsoGMBFaK/sswkLloRCZuoWi2a+OKs3vk=",
+ "lastModified": 1689441253,
+ "narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6",
+ "rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8",
"type": "github"
},
"original": {
@@ -133,11 +133,11 @@
]
},
"locked": {
- "lastModified": 1685759304,
- "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
+ "lastModified": 1688351637,
+ "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
+ "rev": "f9b92316727af9e6c7fee4a761242f7f46880329",
"type": "github"
},
"original": {
From abd8e1bf54ecd0f385d472914aff4ba2a5eeaf8c Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 16 Jul 2023 13:38:33 -0700
Subject: [PATCH 2/4] nixpkgs' rocksdb is now new enough :)
This reverts commit abd0a014e852d41d25320f6ccd19ac1de4156f96.
---
flake.nix | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/flake.nix b/flake.nix
index ef1a04b2..369759fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,10 @@
sha256 = "sha256-gdYqng0y9iHYzYPAdkC/ka3DRny3La/S5G8ASj0Ayyc=";
};
+ # The system's RocksDB
+ ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
+ ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
+
# Shared between the package and the devShell
nativeBuildInputs = (with pkgs.rustPlatform; [
bindgenHook
@@ -57,7 +61,9 @@
inherit
stdenv
- nativeBuildInputs;
+ nativeBuildInputs
+ ROCKSDB_INCLUDE_DIR
+ ROCKSDB_LIB_DIR;
};
devShells.default = (pkgs.mkShell.override { inherit stdenv; }) {
@@ -65,6 +71,10 @@
# sources, and it can read this environment variable to do so
RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";
+ inherit
+ ROCKSDB_INCLUDE_DIR
+ ROCKSDB_LIB_DIR;
+
# Development tools
nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [
cargo
From 742331e054b3570e1f02f02162ee667afa1f8281 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 16 Jul 2023 13:39:13 -0700
Subject: [PATCH 3/4] Revert "only use musl on x86_64"
This reverts commit 56f0f3dfa44834478a4157cb91f0c860f844953f.
This shouldn't be needed anymore since [this][0] reached nixos-unstable.
[0]: https://github.com/NixOS/nixpkgs/pull/242889
---
flake.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flake.nix b/flake.nix
index 369759fe..eb3a31cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,8 +25,8 @@
let
pkgs = nixpkgs.legacyPackages.${system};
- # Use mold where possible
- stdenv = if pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64 then
+ # Use mold on Linux
+ stdenv = if pkgs.stdenv.isLinux then
pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv
else
pkgs.stdenv;
From 6ae5143ff5b5d009beaff58c2559027269e4792c Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Fri, 21 Jul 2023 12:12:37 -0700
Subject: [PATCH 4/4] only listen on IPv6 since that's what conduit does
---
nix/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nix/README.md b/nix/README.md
index f8537d54..bd6f0962 100644
--- a/nix/README.md
+++ b/nix/README.md
@@ -179,7 +179,7 @@ in
upstreams = {
"backend_conduit" = {
servers = {
- "localhost:${toString config.services.matrix-conduit.settings.global.port}" = { };
+ "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = { };
};
};
};