1
Fork 0

Update dependencies

This commit is contained in:
Tobias Berger 2024-10-21 18:19:33 +02:00
parent eafda5fc8b
commit 872d1a9511
Signed by: toby
GPG key ID: 2D05EFAB764D6A88
4 changed files with 17 additions and 71 deletions

8
Cargo.lock generated
View file

@ -269,9 +269,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.159" version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
@ -452,9 +452,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.79" version = "2.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

View file

@ -1,6 +1,6 @@
[package] [package]
name = "minesweeper-nojs" name = "minesweeper-nojs"
version = "1.4.5" version = "1.4.8"
edition = "2021" edition = "2021"
[profile.release] [profile.release]

View file

@ -1,33 +1,12 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728863046, "lastModified": 1729265718,
"narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,28 +18,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -68,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729077719, "lastModified": 1729242555,
"narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -8,11 +8,6 @@
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -20,7 +15,6 @@
self, self,
nixpkgs, nixpkgs,
treefmt-nix, treefmt-nix,
fenix,
}: }:
let let
supportedSystems = [ supportedSystems = [
@ -37,16 +31,10 @@
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ fenix.overlays.default ];
};
fenix' = (import fenix { inherit system pkgs; });
toolchain = fenix'.fromToolchainFile {
file = ./rust-toolchain.toml;
sha256 = "sha256-VZZnlyP69+Y3crrLHQyJirqlHrTtGTsyiSnZB8jEvVo=";
}; };
in in
{ {
inherit pkgs toolchain; inherit pkgs;
} }
) )
); );
@ -56,24 +44,21 @@
{ pkgs, ... }: (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper { pkgs, ... }: (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper
); );
devShells = forEachSupportedSystem ( devShells = forEachSupportedSystem (
{ pkgs, toolchain }: { pkgs }:
{ {
default = pkgs.mkShell { default = pkgs.mkShell {
nativeBuildInputs = [ toolchain ]; # nativeBuildInputs = [ pkgs.rustPlatform ];
buildInputs = [ toolchain ]; # buildInputs = [ pkgs.rustPlatform ];
}; };
} }
); );
packages = forEachSupportedSystem ( packages = forEachSupportedSystem (
{ pkgs, toolchain }: { pkgs }:
{ {
default = ( default = (
let let
manifest = (pkgs.lib.importTOML ./Cargo.toml).package; manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
rustPlatform = pkgs.makeRustPlatform { rustPlatform = pkgs.rustPlatform;
cargo = toolchain;
rustc = toolchain;
};
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = manifest.name; pname = manifest.name;