MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-11 20:52:56 +01:00
Code Issues Releases Activity

Merge branch 'nix-upkeep' into 'next'

Browse source 
Nix upkeep

See merge request famedly/conduit!505
This commit is contained in:
Timo Kösters 2023-07-23 09:23:41 +00:00
commit 1e560529d8
3 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flake.lock
View file

@ -12,11 +12,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1686621798, "lastModified": 1688772518,
"narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "75f7d715f8088f741be9981405f6444e2d49efdd", "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1687004852, "lastModified": 1689488573,
"narHash": "sha256-wRSUs+v8xtIJaFlWO5NLFQjkq5+eYhxHHXnZKsZ9DpQ=", "narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791", "rev": "39096fe3f379036ff4a5fa198950b8e79defe939",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1689068808,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +82,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686960236, "lastModified": 1689444953,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "rev": "8acef304efe70152463a6399f73e636bcc363813",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +107,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1686936697, "lastModified": 1689441253,
"narHash": "sha256-mCoPr1nNWKpsoGMBFaK/sswkLloRCZuoWi2a+OKs3vk=", "narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6", "rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685759304, "lastModified": 1688351637,
"narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c535b4f3327910c96dcf21851bbdd074d0760290", "rev": "f9b92316727af9e6c7fee4a761242f7f46880329",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View file

@ -25,8 +25,8 @@
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
# Use mold where possible # Use mold on Linux
stdenv = if pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64 then stdenv = if pkgs.stdenv.isLinux then
pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv
else else
pkgs.stdenv; pkgs.stdenv;
@ -43,6 +43,10 @@
sha256 = "sha256-gdYqng0y9iHYzYPAdkC/ka3DRny3La/S5G8ASj0Ayyc="; 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 # Shared between the package and the devShell
nativeBuildInputs = (with pkgs.rustPlatform; [ nativeBuildInputs = (with pkgs.rustPlatform; [
bindgenHook bindgenHook
@ -57,7 +61,9 @@
inherit inherit
stdenv stdenv
nativeBuildInputs; nativeBuildInputs
ROCKSDB_INCLUDE_DIR
ROCKSDB_LIB_DIR;
}; };
devShells.default = (pkgs.mkShell.override { inherit stdenv; }) { devShells.default = (pkgs.mkShell.override { inherit stdenv; }) {
@ -65,6 +71,10 @@
# sources, and it can read this environment variable to do so # sources, and it can read this environment variable to do so
RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library"; RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";
inherit
ROCKSDB_INCLUDE_DIR
ROCKSDB_LIB_DIR;
# Development tools # Development tools
nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [ nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [
cargo cargo

2
nix/README.md
View file

@ -179,7 +179,7 @@ in
upstreams = { upstreams = {
"backend_conduit" = { "backend_conduit" = {
servers = { servers = {
"localhost:${toString config.services.matrix-conduit.settings.global.port}" = { }; "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = { };
}; };
}; };
}; };