nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Upgrade conduit from 0.6 to next

Browse source
This commit is contained in:
Natsu Kagami 2023-11-07 13:48:55 +01:00
parent 7d71caa8db
commit 2693126dca
Signed by: nki
GPG key ID: 55A032EB38B49ADB
5 changed files with 47 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -31,16 +31,16 @@
]
},
"locked": {
"lastModified": 1691686916,
"narHash": "sha256-TpNssMHvSKcxJMas5lQNWEbIv09u4/niBN2C27Mp0JY=",
"lastModified": 1694631477,
"narHash": "sha256-35SgWnBkWTyyRwVPyUKoShjzXfX0H1+HDdEEjZ/LsXc=",
"owner": "famedly",
"repo": "conduit",
"rev": "0c2cfda3ae923d9e922d5edf379e4d8976a52d4e",
"rev": "3bfdae795d4d9ec9aeaac7465e7535ac88e47756",
"type": "gitlab"
},
"original": {
"owner": "famedly",
"ref": "v0.6.0",
"ref": "next",
"repo": "conduit",
"type": "gitlab"
}

2
flake.nix
View file

@ -39,7 +39,7 @@
};
dtth-phanpy.url = "git+ssh://gitea@git.dtth.ch/nki/phanpy";
conduit = {
url = gitlab:famedly/conduit/v0.6.0;
url = gitlab:famedly/conduit/next;
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
eza.url = github:eza-community/eza/v0.12.0;

13
modules/cloud/conduit/default.nix
View file

@ -138,10 +138,15 @@ with lib;
}))
];
};
# Enable CORS from anywhere since we want all clients to find us out
extraConfig = ''
add_header 'Access-Control-Allow-Origin' "*";
'';
extraConfig =
# Enable CORS from anywhere since we want all clients to find us out
''
add_header 'Access-Control-Allow-Origin' "*";
'' +
# Force returning values to be JSON data
''
default_type application/json;
'';
})
cfg.instances;
};

6
overlay.nix
View file

@ -29,7 +29,11 @@ let
sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
deploy-rs = inputs.deploy-rs.packages.default;
dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default;
matrix-conduit = inputs.conduit.packages.${final.system}.default;
matrix-conduit = inputs.conduit.packages.${final.system}.default.overrideAttrs (attrs: {
patches = (if "patches" ? attrs then attrs.patches else [ ]) ++ [
./overlays/conduit-remove-dbg.patch
];
});
exa = inputs.eza.packages.${final.system}.default.overrideAttrs (attrs: {
postInstall = attrs.postInstall + ''
ln -sv $out/bin/eza $out/bin/exa

28
overlays/conduit-remove-dbg.patch Normal file
View file

@ -0,0 +1,28 @@
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index a275b06..ed4e5c6 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -1172,7 +1172,6 @@ fn share_encrypted_room(
pub async fn sync_events_v4_route(
body: Ruma<sync_events::v4::Request>,
) -> Result<sync_events::v4::Response, RumaResponse<UiaaResponse>> {
- dbg!(&body.body);
let sender_user = body.sender_user.expect("user is authenticated");
let sender_device = body.sender_device.expect("user is authenticated");
let mut body = body.body;
@@ -1689,7 +1688,7 @@ pub async fn sync_events_v4_route(
let _ = tokio::time::timeout(duration, watcher).await;
}
- Ok(dbg!(sync_events::v4::Response {
+ Ok(sync_events::v4::Response {
initial: globalsince == 0,
txn_id: body.txn_id.clone(),
pos: next_batch.to_string(),
@@ -1744,5 +1743,5 @@ pub async fn sync_events_v4_route(
},
},
delta_token: None,
- }))
+ })
}