diff --git a/Cargo.lock b/Cargo.lock index 8072300..e1124a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -269,9 +269,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "lock_api" @@ -452,9 +452,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 57615d6..9c1492b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minesweeper-nojs" -version = "1.4.5" +version = "1.4.8" edition = "2021" [profile.release] diff --git a/flake.lock b/flake.lock index 288f53b..8dd74fd 100644 --- a/flake.lock +++ b/flake.lock @@ -1,33 +1,12 @@ { "nodes": { - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1728973961, - "narHash": "sha256-Jkqaw9O7WXTf5SHrK7xr9HpVU/mEPVg0Sp6s3AENC90=", - "owner": "nix-community", - "repo": "fenix", - "rev": "d6a9ff4d1e60c347a23bc96ccdb058d37a810541", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -39,28 +18,10 @@ }, "root": { "inputs": { - "fenix": "fenix", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1728921748, - "narHash": "sha256-BOCZ5osPOMh2BPHnkK4sVdTGj7sn47rBn1nxjrzWe5U=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "0319586ef2a2636f6d6b891690b7ebebf4337c85", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -68,11 +29,11 @@ ] }, "locked": { - "lastModified": 1729077719, - "narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1ea70c8..9295b21 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,6 @@ url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -20,7 +15,6 @@ self, nixpkgs, treefmt-nix, - fenix, }: let supportedSystems = [ @@ -37,16 +31,10 @@ let pkgs = import nixpkgs { inherit system; - overlays = [ fenix.overlays.default ]; - }; - fenix' = (import fenix { inherit system pkgs; }); - toolchain = fenix'.fromToolchainFile { - file = ./rust-toolchain.toml; - sha256 = "sha256-VZZnlyP69+Y3crrLHQyJirqlHrTtGTsyiSnZB8jEvVo="; }; in { - inherit pkgs toolchain; + inherit pkgs; } ) ); @@ -56,24 +44,21 @@ { pkgs, ... }: (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper ); devShells = forEachSupportedSystem ( - { pkgs, toolchain }: + { pkgs }: { default = pkgs.mkShell { - nativeBuildInputs = [ toolchain ]; - buildInputs = [ toolchain ]; + # nativeBuildInputs = [ pkgs.rustPlatform ]; + # buildInputs = [ pkgs.rustPlatform ]; }; } ); packages = forEachSupportedSystem ( - { pkgs, toolchain }: + { pkgs }: { default = ( let manifest = (pkgs.lib.importTOML ./Cargo.toml).package; - rustPlatform = pkgs.makeRustPlatform { - cargo = toolchain; - rustc = toolchain; - }; + rustPlatform = pkgs.rustPlatform; in rustPlatform.buildRustPackage { pname = manifest.name;