diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2021-03-09 21:19:53 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2021-03-09 21:19:53 +0100 |
| commit | d34f9be764e86653b7ddb67129385672978aecf4 (patch) | |
| tree | 459f326d08f0daf8f379f1fe4c79e7bc2aa0d78e | |
| parent | bb5f28a3db3d798270b26f428da7239c6060437a (diff) | |
Cleaning up build files
| -rw-r--r-- | development/libs/atomptr/shell.nix | 2 | ||||
| -rw-r--r-- | development/tools/cargo-workspace2/Cargo.lock | 2 | ||||
| -rw-r--r-- | games/rstnode/rst-client/src/ui/container.rs | 6 | ||||
| -rw-r--r-- | games/rstnode/rst-client/src/ui/mod.rs | 3 | ||||
| -rw-r--r-- | infra/website/default.nix | 7 |
5 files changed, 17 insertions, 3 deletions
diff --git a/development/libs/atomptr/shell.nix b/development/libs/atomptr/shell.nix index 3a13912055f1..e67364bbd946 100644 --- a/development/libs/atomptr/shell.nix +++ b/development/libs/atomptr/shell.nix @@ -3,6 +3,6 @@ with import <nixpkgs> {}; stdenv.mkDerivation { name = "atomicptr"; buildInputs = with pkgs; [ - rustracer rustup clangStdenv + rustc cargo rust-analyzer rustfmt ]; } diff --git a/development/tools/cargo-workspace2/Cargo.lock b/development/tools/cargo-workspace2/Cargo.lock index 3b59ec93405b..f538b4834e26 100644 --- a/development/tools/cargo-workspace2/Cargo.lock +++ b/development/tools/cargo-workspace2/Cargo.lock @@ -20,7 +20,7 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "cargo-workspace2" -version = "0.2.1" +version = "0.2.2" dependencies = [ "semver", "textwrap", diff --git a/games/rstnode/rst-client/src/ui/container.rs b/games/rstnode/rst-client/src/ui/container.rs new file mode 100644 index 000000000000..770a6feb7059 --- /dev/null +++ b/games/rstnode/rst-client/src/ui/container.rs @@ -0,0 +1,6 @@ + + +/// A UI container +pub struct Container { + +} diff --git a/games/rstnode/rst-client/src/ui/mod.rs b/games/rstnode/rst-client/src/ui/mod.rs index 449f04efc1e7..6d1c023692ac 100644 --- a/games/rstnode/rst-client/src/ui/mod.rs +++ b/games/rstnode/rst-client/src/ui/mod.rs @@ -2,3 +2,6 @@ mod button; pub use button::*; + +mod container; +pub use container::*; diff --git a/infra/website/default.nix b/infra/website/default.nix index dd9bb7c1daa6..c33e034a559d 100644 --- a/infra/website/default.nix +++ b/infra/website/default.nix @@ -1,13 +1,18 @@ with import <nixpkgs> {}; +let + pelican = (pkgs.python3Packages.pelican.overrideAttrs ({ ... }: { + doInstallCheck = false; + })); +in stdenv.mkDerivation { name = "website"; src = ./.; buildInputs = with pkgs; [ python3 - ] ++ (with pkgs.python3Packages; [ pelican + ] ++ (with pkgs.python3Packages; [ markdown webassets ]); |