From 6583d69a405d31e6889d189e98a8d77e93797846 Mon Sep 17 00:00:00 2001 From: m0ssc0de Date: Sat, 12 Feb 2022 14:40:05 +0800 Subject: [PATCH 1/3] nix --- shell.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 shell.nix diff --git a/shell.nix b/shell.nix new file mode 100644 index 00000000..f45ee025 --- /dev/null +++ b/shell.nix @@ -0,0 +1,23 @@ +let + moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); + pkgs = import { overlays = [ moz_overlay ]; }; + channel = pkgs.rustChannelOf { + channel = "nightly"; + }; + rust = (channel.rust.override { + targets = [ "wasm32-unknown-unknown" ]; + }); +in + with pkgs; + stdenv.mkDerivation { + name = "rust-dev-env"; + buildInputs = [ + rust + llvmPackages.libclang + llvmPackages.libcxxClang + clang + pkg-config openssl + ]; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion clang}/include"; +} From 99b33ab550b9a3cafcc874479105bef2be8a729d Mon Sep 17 00:00:00 2001 From: m0ssc0de Date: Sat, 12 Feb 2022 19:49:07 +0800 Subject: [PATCH 2/3] add rust-src for rust-analyzer --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index f45ee025..6bbf5afb 100644 --- a/shell.nix +++ b/shell.nix @@ -6,6 +6,7 @@ let }; rust = (channel.rust.override { targets = [ "wasm32-unknown-unknown" ]; + extensions = ["rust-src"]; }); in with pkgs; From 655dd0c26f8ec8a8111bd2617030380769dd1773 Mon Sep 17 00:00:00 2001 From: Moss Date: Mon, 21 Feb 2022 01:10:57 +0800 Subject: [PATCH 3/3] migrate docker-compose.yaml for new version --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index afa5859b..e135c7fa 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -46,7 +46,6 @@ services: networks: default: - name: sa-network ipam: config: - subnet: 172.10.10.0/24