From 04c0cc4606540be1b75ec4debd05650106d6395b Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 16 Sep 2024 00:01:38 +0000 Subject: [PATCH 1/4] Lock file maintenance --- Cargo.lock | 4 ++-- Cargo.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50c49b2..5b2ea9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -175,9 +175,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "wasi" diff --git a/Cargo.nix b/Cargo.nix index 1a4d965..e0dc9dd 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -22,7 +22,7 @@ args @ { workspaceSrc, ignoreLockHash, }: let - nixifiedLockHash = "680ec1c028e8bd30deec1823757f2d9ccb0fe8d194949ef95d15a41d3a488ebe"; + nixifiedLockHash = "a0c35c5dbb7b7f0a97aaa0410b0bcdce042cdade80df9c137817016071bf7fee"; workspaceSrc = if args.workspaceSrc == null then ./. @@ -243,7 +243,7 @@ in ["proc-macro"] ]; dependencies = { - unicode_ident = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".unicode-ident."1.0.12" {inherit profileName;}).out; + unicode_ident = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".unicode-ident."1.0.13" {inherit profileName;}).out; }; }); @@ -386,7 +386,7 @@ in dependencies = { proc_macro2 = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".proc-macro2."1.0.86" {inherit profileName;}).out; quote = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".quote."1.0.37" {inherit profileName;}).out; - unicode_ident = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".unicode-ident."1.0.12" {inherit profileName;}).out; + unicode_ident = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".unicode-ident."1.0.13" {inherit profileName;}).out; }; }); @@ -400,13 +400,13 @@ in }; }); - "registry+https://github.com/rust-lang/crates.io-index".unicode-ident."1.0.12" = overridableMkRustCrate (profileName: rec { + "registry+https://github.com/rust-lang/crates.io-index".unicode-ident."1.0.13" = overridableMkRustCrate (profileName: rec { name = "unicode-ident"; - version = "1.0.12"; + version = "1.0.13"; registry = "registry+https://github.com/rust-lang/crates.io-index"; src = fetchCratesIo { inherit name version; - sha256 = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"; + sha256 = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"; }; }); From 54b9cd916884b9f684f806c6caa812aa5c420be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 17 Sep 2024 07:47:04 +0200 Subject: [PATCH 2/4] remove url literals --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index a2535ec..cefa91c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,17 @@ description = "rand-testsuite"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs; - flake-utils.url = github:numtide/flake-utils; + nixpkgs.url = "github:NixOS/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; rust-overlay = { - url = github:oxalica/rust-overlay; + url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; cargo2nix = { - url = github:DarkKirb/cargo2nix/master; + url = "github:DarkKirb/cargo2nix/master"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; inputs.rust-overlay.follows = "rust-overlay"; From 87f9a8c3456a2e26c5bb6cd8529758ca05b37d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 17 Sep 2024 07:47:48 +0200 Subject: [PATCH 3/4] update flake lock --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 74b476a..59fc787 100644 --- a/flake.lock +++ b/flake.lock @@ -51,7 +51,7 @@ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "revCount": 57, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz?rev=0f9255e01c2351cc7d116c072cb317785dd33b33&revCount=57" }, "original": { "type": "tarball", @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725839224, - "narHash": "sha256-QfmN/UPEJxnRl8lG1xBOVmp/G/vT2r4ucltiYGPDw0w=", + "lastModified": 1726547454, + "narHash": "sha256-ORlOjR97LbxyJ28Iyd/mstcWAJ4VbKjYuULLx+icpFU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49ba5e4e4523963870fdbd39a0cf42610d75aa57", + "rev": "762dd3d899e1c3dbde61212e454afc54ec579f7a", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1725762472, - "narHash": "sha256-thdxLVdcfrJNMFV3Ej9mDIh6QgHyoYswiW0SFNwod8A=", + "lastModified": 1726539203, + "narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "57a1564c924ee4acbffe0ad3d65c7e90d3e77cd8", + "rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033", "type": "github" }, "original": { From 12a19e33f08d787f1c24430379a9dc90ea3a49f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 17 Sep 2024 08:18:42 +0200 Subject: [PATCH 4/4] update cargo2nix --- Cargo.nix | 2 +- flake.lock | 12 ++++++------ flake.nix | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index e0dc9dd..f8fa69d 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -118,7 +118,7 @@ in version = "0.1.1"; registry = "sparse+https://git.chir.rs/api/packages/ProcyOS/cargo/"; src = fetchCrateAlternativeRegistry { - index = sparse+https://git.chir.rs/api/packages/ProcyOS/cargo/; + index = "sparse+https://git.chir.rs/api/packages/ProcyOS/cargo/"; name = "extra-math"; version = "0.1.1"; sha256 = "0efe6931de01f01ec0afe614a0299e811e34292ef28368ffcef1c3c7e15b24fb"; diff --git a/flake.lock b/flake.lock index 59fc787..cccdf4d 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1725812914, - "narHash": "sha256-xYdN9kbpLScjJGll6IE7Cnnn1UhIMKUwGyrzKjQvPgI=", + "lastModified": 1726552619, + "narHash": "sha256-ytTBILVMnRZYvjiLYz+J6IFf/TOXdGuP6RDesMx9qgA=", "owner": "DarkKirb", "repo": "cargo2nix", - "rev": "7bb1ee00029ab2e7bd8ba03f5563cdbb998ab6f7", + "rev": "baa12124e2de09e1cbbdac320f14809fa55af1a2", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726547454, - "narHash": "sha256-ORlOjR97LbxyJ28Iyd/mstcWAJ4VbKjYuULLx+icpFU=", + "lastModified": 1726552853, + "narHash": "sha256-IiMC/CUatt5uvU5oHfWfqoaCjNs/vqRHj0B8JTZLrTg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "762dd3d899e1c3dbde61212e454afc54ec579f7a", + "rev": "683fddf43ec6cbb85bb61de54349090beb190173", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cefa91c..87cbd28 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; cargo2nix = {