From 7961a79751ae7b2ac4cc0e96cc8760ffd62a5543 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 13 Oct 2023 21:16:21 +0300 Subject: [PATCH] chore: update flake deps --- flake.lock | 145 +++++++++++----------------------------------------- flake.nix | 5 +- src/main.rs | 7 ++- 3 files changed, 36 insertions(+), 121 deletions(-) diff --git a/flake.lock b/flake.lock index b4abb9c..4717120 100644 --- a/flake.lock +++ b/flake.lock @@ -3,128 +3,57 @@ "crane": { "flake": false, "locked": { - "lastModified": 1681175776, - "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", + "lastModified": 1686108916, + "narHash": "sha256-looLH5MdY4erLiJw0XwQohGdr0fJL9y6TJY3898RA2U=", "owner": "ipetkov", "repo": "crane", - "rev": "445a3d222947632b5593112bb817850e8a9cf737", + "rev": "8ab1a49432695bd80ff4b7f6c6515da0e926d922", "type": "github" }, "original": { "owner": "ipetkov", - "ref": "v0.12.1", + "ref": "v0.12.2", "repo": "crane", "type": "github" } }, "dream2nix": { "inputs": { - "all-cabal-json": [ - "nci" - ], - "crane": "crane", "devshell": [ "nci" ], - "drv-parts": "drv-parts", - "flake-compat": "flake-compat", + "flake-compat": [ + "nci" + ], "flake-parts": [ "nci", "parts" ], - "flake-utils-pre-commit": [ - "nci" - ], - "ghc-utils": [ - "nci" - ], - "gomod2nix": [ - "nci" - ], - "mach-nix": [ - "nci" - ], - "nix-pypi-fetcher": [ + "nix-unit": [ "nci" ], "nixpkgs": [ "nci", "nixpkgs" ], - "nixpkgsV1": "nixpkgsV1", - "poetry2nix": [ - "nci" - ], "pre-commit-hooks": [ "nci" - ], - "pruned-racket-catalog": [ - "nci" ] }, "locked": { - "lastModified": 1688815683, - "narHash": "sha256-mGeQgTcAltpQlr3KUBA1WoGBQadq6OAhuF864ci4+vI=", + "lastModified": 1697064937, + "narHash": "sha256-yZ5OlQkPnNUDnEzUY/Su2gu52i1+w7h5HHK/kBk5oUg=", "owner": "nix-community", "repo": "dream2nix", - "rev": "99373e29568de05287d391a745947154ddbf4e3e", + "rev": "1caf997f694c3144ed8fa6752c4af36d1e68851c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "legacy", "repo": "dream2nix", "type": "github" } }, - "drv-parts": { - "inputs": { - "flake-compat": [ - "nci", - "dream2nix", - "flake-compat" - ], - "flake-parts": [ - "nci", - "dream2nix", - "flake-parts" - ], - "nixpkgs": [ - "nci", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1680698112, - "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", - "owner": "davhau", - "repo": "drv-parts", - "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", - "type": "github" - }, - "original": { - "owner": "davhau", - "repo": "drv-parts", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "mk-naked-shell": { "flake": false, "locked": { @@ -143,6 +72,7 @@ }, "nci": { "inputs": { + "crane": "crane", "dream2nix": "dream2nix", "mk-naked-shell": "mk-naked-shell", "nixpkgs": [ @@ -153,11 +83,11 @@ "treefmt": "treefmt" }, "locked": { - "lastModified": 1690537257, - "narHash": "sha256-wosBxxp6U2YZ4iFOOknK0Ybv8NGJs/6V4/9o/6TmAfw=", + "lastModified": 1697220707, + "narHash": "sha256-hycPu8SirzPYwCzRJ89ardLvnTJ3oR1WuGtsE4GH67c=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "b46c8aa9e612b9b9dfa1f3e9b27a7756756e877d", + "rev": "b5a5e688c26c11961f85cc66b25111b91d4eedb2", "type": "github" }, "original": { @@ -168,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -182,21 +112,6 @@ "type": "github" } }, - "nixpkgsV1": { - "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -205,11 +120,11 @@ ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -225,11 +140,11 @@ ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -248,11 +163,11 @@ "rust-overlay": { "flake": false, "locked": { - "lastModified": 1690510705, - "narHash": "sha256-6mjs3Gl9/xrseFh9iNcNq1u5yJ/MIoAmjoaG7SXZDIE=", + "lastModified": 1697163235, + "narHash": "sha256-HzGr9LbTKf8x4NeDH94i1J2Cq/0CY1Qrt4z5pETk9HA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "851ae4c128905a62834d53ce7704ebc1ba481bea", + "rev": "b48a7e5dab1b472dd9c9ee9053401489dbb4d6fc", "type": "github" }, "original": { @@ -269,11 +184,11 @@ ] }, "locked": { - "lastModified": 1689620039, - "narHash": "sha256-BtNwghr05z7k5YMdq+6nbue+nEalvDepuA7qdQMAKoQ=", + "lastModified": 1697018566, + "narHash": "sha256-tOhoeq621JQOULO9X2U+Io03PK/TQrYFYB4sJFaDCuQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "719c2977f958c41fa60a928e2fbc50af14844114", + "rev": "0b2ffeb3ae1a7449a48a952f3e731cfa41eaf780", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 98ba00a..c184aba 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,7 @@ crateName = "musikquadrupled"; crateOutputs = config.nci.outputs.${crateName}; in { - nci.projects.${crateName}.relPath = ""; - nci.crates.${crateName} = { - export = true; - }; + nci.projects.${crateName}.path = ./.; devShells.default = crateOutputs.devShell.overrideAttrs (old: { RUST_SRC_PATH = "${config.nci.toolchains.shell}/lib/rustlib/src/rust/library"; packages = diff --git a/src/main.rs b/src/main.rs index 678bf7c..8eac476 100644 --- a/src/main.rs +++ b/src/main.rs @@ -57,13 +57,16 @@ async fn app() -> Result<(), AppError> { let state = AppState::new(AppStateInternal::new(public_port).await?); let (public_router, internal_router) = router::handler(state).await?; + let internal_addr = SocketAddr::from(([127, 0, 0, 1], internal_port)); let internal_make_service = internal_router.into_make_service(); let internal_task = tokio::spawn( - axum_server::bind(SocketAddr::from(([127, 0, 0, 1], internal_port))) - .serve(internal_make_service), + axum_server::bind(internal_addr).serve(internal_make_service), ); + info!("internal: listening on http://{internal_addr}"); let public_addr = SocketAddr::from(([127, 0, 0, 1], public_port)); + info!("will listen on {{http,https}}://{public_addr}"); + let public_make_service = public_router.into_make_service(); let (pub_task, scheme) = if let (Some(cert_path), Some(key_path)) = (cert_path, key_path) { info!("cert path is: {cert_path}");