From fb32d3737ca58d45c2e714b95ba76b0fdb972c9f Mon Sep 17 00:00:00 2001 From: Joakim Pettersvold Date: Sat, 26 Jan 2019 19:51:59 +0100 Subject: [PATCH] Fixes rust requiring newer version and malformed state.json --- shell.nix | 4 ++-- static/state.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 599dce3..d04316b 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ let moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); nixpkgs = import { overlays = [ moz_overlay ]; }; - rustNightlyChannel = (nixpkgs.rustChannelOf { date = "2019-01-07"; channel = "nightly"; }).rust; + rustNightlyChannel = (nixpkgs.rustChannelOf { date = "2019-01-26"; channel = "nightly"; }).rust; rustStableChannel = nixpkgs.latest.rustChannels.stable.rust.override { extensions = [ "rust-src" @@ -17,4 +17,4 @@ with nixpkgs; buildInputs = [ rustNightlyChannel ]; - } \ No newline at end of file + } diff --git a/static/state.json b/static/state.json index 6c4b11b..37f8e42 100644 --- a/static/state.json +++ b/static/state.json @@ -60,7 +60,7 @@ "race_picture": "images/Cybkatte.png", "race_bio": null }, - "color": "#0000FF" + "color": "#0000FF", "tech": { "weapons": { "level": 1,