From e694ba74ca793b0312ccdb4fef79c2f609ef4a1c Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 26 Mar 2024 09:14:28 -0400 Subject: [PATCH] Update to Rust 1.77 --- Cargo.nix | 314 ++++++++++++++++++++++++------------------------- rust-toolchain | 2 +- 2 files changed, 158 insertions(+), 158 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 3e99d22..e2cb1d7 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -205,26 +205,6 @@ rec { # File a bug if you depend on any for non-debug work! debug = internal.debugCrate { inherit packageId; }; }; - "kifu-core" = rec { - packageId = "kifu-core"; - build = internal.buildRustCrateWithFeatures { - packageId = "kifu-core"; - }; - - # Debug support which might change between releases. - # File a bug if you depend on any for non-debug work! - debug = internal.debugCrate { inherit packageId; }; - }; - "kifu-gtk" = rec { - packageId = "kifu-gtk"; - build = internal.buildRustCrateWithFeatures { - packageId = "kifu-gtk"; - }; - - # Debug support which might change between releases. - # File a bug if you depend on any for non-debug work! - debug = internal.debugCrate { inherit packageId; }; - }; "memorycache" = rec { packageId = "memorycache"; build = internal.buildRustCrateWithFeatures { @@ -245,6 +225,26 @@ rec { # File a bug if you depend on any for non-debug work! debug = internal.debugCrate { inherit packageId; }; }; + "otg-core" = rec { + packageId = "otg-core"; + build = internal.buildRustCrateWithFeatures { + packageId = "otg-core"; + }; + + # Debug support which might change between releases. + # File a bug if you depend on any for non-debug work! + debug = internal.debugCrate { inherit packageId; }; + }; + "otg-gtk" = rec { + packageId = "otg-gtk"; + build = internal.buildRustCrateWithFeatures { + packageId = "otg-gtk"; + }; + + # Debug support which might change between releases. + # File a bug if you depend on any for non-debug work! + debug = internal.debugCrate { inherit packageId; }; + }; "result-extended" = rec { packageId = "result-extended"; build = internal.buildRustCrateWithFeatures { @@ -7086,143 +7086,6 @@ rec { ]; }; - "kifu-core" = rec { - crateName = "kifu-core"; - version = "0.1.0"; - edition = "2021"; - # We can't filter paths with references in Nix 2.4 - # See https://github.com/NixOS/nix/issues/5410 - src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) - then lib.cleanSourceWith { filter = sourceFilter; src = ./kifu/core; } - else ./kifu/core; - dependencies = [ - { - name = "async-std"; - packageId = "async-std"; - } - { - name = "chrono"; - packageId = "chrono"; - } - { - name = "config"; - packageId = "config"; - } - { - name = "config-derive"; - packageId = "config-derive"; - } - { - name = "grid"; - packageId = "grid"; - } - { - name = "serde"; - packageId = "serde 1.0.193"; - features = [ "derive" ]; - } - { - name = "serde_json"; - packageId = "serde_json"; - } - { - name = "sgf"; - packageId = "sgf"; - } - { - name = "thiserror"; - packageId = "thiserror"; - } - ]; - devDependencies = [ - { - name = "cool_asserts"; - packageId = "cool_asserts"; - } - ]; - - }; - "kifu-gtk" = rec { - crateName = "kifu-gtk"; - version = "0.1.0"; - edition = "2021"; - crateBin = [ - { - name = "kifu-gtk"; - path = "src/main.rs"; - requiredFeatures = [ ]; - } - ]; - # We can't filter paths with references in Nix 2.4 - # See https://github.com/NixOS/nix/issues/5410 - src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) - then lib.cleanSourceWith { filter = sourceFilter; src = ./kifu/gtk; } - else ./kifu/gtk; - dependencies = [ - { - name = "async-channel"; - packageId = "async-channel 2.1.1"; - } - { - name = "async-std"; - packageId = "async-std"; - } - { - name = "cairo-rs"; - packageId = "cairo-rs"; - } - { - name = "gio"; - packageId = "gio"; - } - { - name = "glib"; - packageId = "glib"; - } - { - name = "gtk4"; - packageId = "gtk4"; - rename = "gtk"; - features = [ "v4_10" ]; - } - { - name = "image"; - packageId = "image 0.24.7"; - } - { - name = "kifu-core"; - packageId = "kifu-core"; - } - { - name = "libadwaita"; - packageId = "libadwaita"; - rename = "adw"; - features = [ "v1_4" ]; - } - { - name = "pango"; - packageId = "pango"; - } - { - name = "sgf"; - packageId = "sgf"; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "full" ]; - } - ]; - buildDependencies = [ - { - name = "glib-build-tools"; - packageId = "glib-build-tools 0.17.10"; - } - ]; - features = { - }; - resolvedDefaultFeatures = [ "screenplay" ]; - }; "kv-log-macro" = rec { crateName = "kv-log-macro"; version = "1.0.7"; @@ -8658,6 +8521,143 @@ rec { "vendored" = [ "openssl-src" ]; }; }; + "otg-core" = rec { + crateName = "otg-core"; + version = "0.1.0"; + edition = "2021"; + # We can't filter paths with references in Nix 2.4 + # See https://github.com/NixOS/nix/issues/5410 + src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) + then lib.cleanSourceWith { filter = sourceFilter; src = ./otg/core; } + else ./otg/core; + dependencies = [ + { + name = "async-std"; + packageId = "async-std"; + } + { + name = "chrono"; + packageId = "chrono"; + } + { + name = "config"; + packageId = "config"; + } + { + name = "config-derive"; + packageId = "config-derive"; + } + { + name = "grid"; + packageId = "grid"; + } + { + name = "serde"; + packageId = "serde 1.0.193"; + features = [ "derive" ]; + } + { + name = "serde_json"; + packageId = "serde_json"; + } + { + name = "sgf"; + packageId = "sgf"; + } + { + name = "thiserror"; + packageId = "thiserror"; + } + ]; + devDependencies = [ + { + name = "cool_asserts"; + packageId = "cool_asserts"; + } + ]; + + }; + "otg-gtk" = rec { + crateName = "otg-gtk"; + version = "0.1.0"; + edition = "2021"; + crateBin = [ + { + name = "otg-gtk"; + path = "src/main.rs"; + requiredFeatures = [ ]; + } + ]; + # We can't filter paths with references in Nix 2.4 + # See https://github.com/NixOS/nix/issues/5410 + src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) + then lib.cleanSourceWith { filter = sourceFilter; src = ./otg/gtk; } + else ./otg/gtk; + dependencies = [ + { + name = "async-channel"; + packageId = "async-channel 2.1.1"; + } + { + name = "async-std"; + packageId = "async-std"; + } + { + name = "cairo-rs"; + packageId = "cairo-rs"; + } + { + name = "gio"; + packageId = "gio"; + } + { + name = "glib"; + packageId = "glib"; + } + { + name = "gtk4"; + packageId = "gtk4"; + rename = "gtk"; + features = [ "v4_10" ]; + } + { + name = "image"; + packageId = "image 0.24.7"; + } + { + name = "libadwaita"; + packageId = "libadwaita"; + rename = "adw"; + features = [ "v1_4" ]; + } + { + name = "otg-core"; + packageId = "otg-core"; + } + { + name = "pango"; + packageId = "pango"; + } + { + name = "sgf"; + packageId = "sgf"; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "full" ]; + } + ]; + buildDependencies = [ + { + name = "glib-build-tools"; + packageId = "glib-build-tools 0.17.10"; + } + ]; + features = { + }; + resolvedDefaultFeatures = [ "screenplay" ]; + }; "pango" = rec { crateName = "pango"; version = "0.18.3"; diff --git a/rust-toolchain b/rust-toolchain index 3e044fb..09aa8a4 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "1.73.0" +channel = "1.77.0" targets = [ "wasm32-unknown-unknown" ]