From acde1794e14eaf3156273068fa0a46c6b4c50f83 Mon Sep 17 00:00:00 2001 From: Psionik K <73710933+psionic-k@users.noreply.github.com> Date: Tue, 3 Oct 2023 05:44:53 -0500 Subject: [PATCH 1/2] invert dependency following and update rust Signed-off-by: Psionik K <73710933+psionic-k@users.noreply.github.com> --- flake.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 0bb36e2..08821f8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,18 @@ { inputs = { - cargo2nix.url = "github:cargo2nix/cargo2nix/release-0.11.0"; - flake-utils.follows = "cargo2nix/flake-utils"; - nixpkgs.follows = "cargo2nix/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs?ref=release-23.05"; + flake-utils.url = "github:numtide/flake-utils"; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; + cargo2nix = { + url = "github:cargo2nix/cargo2nix/release-0.11.0"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + inputs.rust-overlay.follows = "rust-overlay"; + }; }; outputs = inputs: with inputs; @@ -25,7 +35,7 @@ # create the workspace & dependencies package set rustPkgs = pkgs.rustBuilder.makePackageSet { packageFun = import ./Cargo.nix; - rustVersion = "1.61.0"; + rustVersion = "1.72.1"; }; # The workspace defines a development shell with all of the dependencies From f60260b9ad015f799722acef0ceeffa7153b08bb Mon Sep 17 00:00:00 2001 From: Psionik K <73710933+psionic-k@users.noreply.github.com> Date: Tue, 3 Oct 2023 05:45:07 -0500 Subject: [PATCH 2/2] generated Signed-off-by: Psionik K <73710933+psionic-k@users.noreply.github.com> --- flake.lock | 69 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 740e827..36c0970 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,22 @@ "cargo2nix": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { - "lastModified": 1654334140, - "narHash": "sha256-8Suq8K1Eitp1wkZw+pBfMQ87hWUsgHn+7Qly5MQ+3fg=", + "lastModified": 1682891040, + "narHash": "sha256-hjajsi7lq24uYitUh4o04UJi1g0Qe6ruPL0s5DgPQMY=", "owner": "cargo2nix", "repo": "cargo2nix", - "rev": "82b1f5c2f5bd97146c3483de7b68686c63042538", + "rev": "0167b39f198d72acdf009265634504fd6f5ace15", "type": "github" }, "original": { @@ -39,12 +45,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -55,16 +64,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654275867, - "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", + "lastModified": 1696323343, + "narHash": "sha256-u7WLUrh5eb+6SBYwtkaGL2ryHpLcHzmLml+a+VqKJWE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", + "rev": "3b79cc4bcd9c09b5aa68ea1957c25e437dc6bc58", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-22.05", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -72,33 +81,26 @@ "root": { "inputs": { "cargo2nix": "cargo2nix", - "flake-utils": [ - "cargo2nix", - "flake-utils" - ], - "nixpkgs": [ - "cargo2nix", - "nixpkgs" - ] + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "cargo2nix", "flake-utils" ], "nixpkgs": [ - "cargo2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1653878966, - "narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=", + "lastModified": 1696299134, + "narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8526d618af012a923ca116be9603e818b502a8db", + "rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d", "type": "github" }, "original": { @@ -106,6 +108,21 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root",