From a82835c0d7e020237e9af9e7d327c2cc4fb03fa4 Mon Sep 17 00:00:00 2001 From: h4rl Date: Sun, 16 Aug 2026 21:15:22 +0200 Subject: [PATCH] Revert "feat: bump nvfetcher lock + make versioning nightly + rev instead of just rev for easy distinction" This reverts commit 408683f99b42c87e063dac1c2a6913718c281501. --- _sources/generated.json | 44 +++++++++---------- _sources/generated.nix | 44 +++++++++---------- .../Cargo.lock | 12 ++--- pkgs/by-name/ne/neovide/package.nix | 2 +- 4 files changed, 51 insertions(+), 51 deletions(-) rename _sources/{sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU= => sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=}/Cargo.lock (99%) diff --git a/_sources/generated.json b/_sources/generated.json index 4a927dd..e364d00 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,7 +1,7 @@ { "ath-tools": { "cargoLock": null, - "date": "2026-08-05", + "date": "2026-04-15", "extract": null, "name": "ath-tools", "passthru": null, @@ -11,17 +11,17 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce", - "sha256": "sha256-FFoV58YVK7KGBw/JPFWcvGkJOONrfKCvACprYCzIKeg=", + "rev": "324903e86fbd30d601f404125da74b28d812be4b", + "sha256": "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=", "sparseCheckout": [], "type": "git", "url": "https://github.com/qca/qca-swiss-army-knife.git" }, - "version": "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce" + "version": "324903e86fbd30d601f404125da74b28d812be4b" }, "base24-schemes": { "cargoLock": null, - "date": "2026-08-09", + "date": "2026-05-03", "extract": null, "name": "base24-schemes", "passthru": null, @@ -31,13 +31,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1", - "sha256": "sha256-LMHxSQJIv6QJJkO9W7sAkJujlwusFf9/Ct0SYJ6GyHQ=", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "sha256": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "sparseCheckout": [], "type": "git", "url": "https://github.com/tinted-theming/schemes.git" }, - "version": "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1" + "version": "0c94645546f4f3ddac77a1a5fce54eb95bf50795" }, "claude-code-acp": { "cargoLock": null, @@ -53,12 +53,12 @@ "name": null, "owner": "zed-industries", "repo": "claude-code-acp", - "rev": "v0.69.0", - "sha256": "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM=", + "rev": "v0.35.0", + "sha256": "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=", "sparseCheckout": [], "type": "github" }, - "version": "v0.69.0" + "version": "v0.35.0" }, "flightcore": { "cargoLock": null, @@ -84,11 +84,11 @@ "neovide": { "cargoLock": { "Cargo.lock": [ - "sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock", + "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock", {} ] }, - "date": "2026-08-12", + "date": "2026-05-16", "extract": null, "name": "neovide", "passthru": null, @@ -98,13 +98,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf", - "sha256": "sha256-t/ayXFn2hXrSgAGZKn6FpZLbrMXekXL/+xhOXdsZvKU=", + "rev": "8c48a699e201aa5559227a96d879b2f57192b354", + "sha256": "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=", "sparseCheckout": [], "type": "git", "url": "https://github.com/neovide/neovide.git" }, - "version": "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf" + "version": "8c48a699e201aa5559227a96d879b2f57192b354" }, "qebspil": { "cargoLock": null, @@ -140,12 +140,12 @@ "name": null, "owner": "radareorg", "repo": "r2ghidra", - "rev": "6.2.0", - "sha256": "sha256-+iHJpArFu1txVQ5chpg9/aBXDGoDAPlCRqRbgTSnCiQ=", + "rev": "6.1.4", + "sha256": "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=", "sparseCheckout": [], "type": "github" }, - "version": "6.2.0" + "version": "6.1.4" }, "radare2-mcp": { "cargoLock": null, @@ -161,12 +161,12 @@ "name": null, "owner": "radareorg", "repo": "radare2-mcp", - "rev": "1.8.6", - "sha256": "sha256-btJfvsIC/xRfdQYJL0FYqUHsvP7zn/2EnUzLesWZPK4=", + "rev": "1.8.0", + "sha256": "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=", "sparseCheckout": [], "type": "github" }, - "version": "1.8.6" + "version": "1.8.0" }, "slbounce": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 7868147..164ff1e 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -8,41 +8,41 @@ { ath-tools = { pname = "ath-tools"; - version = "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce"; + version = "324903e86fbd30d601f404125da74b28d812be4b"; src = fetchgit { url = "https://github.com/qca/qca-swiss-army-knife.git"; - rev = "6df4dae3e2f5e4c2903f3cafd40996fc1b3639ce"; + rev = "324903e86fbd30d601f404125da74b28d812be4b"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-FFoV58YVK7KGBw/JPFWcvGkJOONrfKCvACprYCzIKeg="; + sha256 = "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4="; }; - date = "2026-08-05"; + date = "2026-04-15"; }; base24-schemes = { pname = "base24-schemes"; - version = "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1"; + version = "0c94645546f4f3ddac77a1a5fce54eb95bf50795"; src = fetchgit { url = "https://github.com/tinted-theming/schemes.git"; - rev = "fdca32a0d14ec80ad83a78a9ccb85592ca6cb9e1"; + rev = "0c94645546f4f3ddac77a1a5fce54eb95bf50795"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-LMHxSQJIv6QJJkO9W7sAkJujlwusFf9/Ct0SYJ6GyHQ="; + sha256 = "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs="; }; - date = "2026-08-09"; + date = "2026-05-03"; }; claude-code-acp = { pname = "claude-code-acp"; - version = "v0.69.0"; + version = "v0.35.0"; src = fetchFromGitHub { owner = "zed-industries"; repo = "claude-code-acp"; - rev = "v0.69.0"; + rev = "v0.35.0"; fetchSubmodules = false; - sha256 = "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM="; + sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo="; }; }; flightcore = { @@ -58,23 +58,23 @@ }; neovide = { pname = "neovide"; - version = "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf"; + version = "8c48a699e201aa5559227a96d879b2f57192b354"; src = fetchgit { url = "https://github.com/neovide/neovide.git"; - rev = "ba8c41f423c9a8f0cb14ff19baa6f538c95e52bf"; + rev = "8c48a699e201aa5559227a96d879b2f57192b354"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-t/ayXFn2hXrSgAGZKn6FpZLbrMXekXL/+xhOXdsZvKU="; + sha256 = "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw="; }; cargoLock."Cargo.lock" = { - lockFile = ./. + "/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock"; + lockFile = ./. + "/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock"; outputHashes = { }; }; - date = "2026-08-12"; + date = "2026-05-16"; }; qebspil = { pname = "qebspil"; @@ -92,24 +92,24 @@ }; radare2-ghidra = { pname = "radare2-ghidra"; - version = "6.2.0"; + version = "6.1.4"; src = fetchFromGitHub { owner = "radareorg"; repo = "r2ghidra"; - rev = "6.2.0"; + rev = "6.1.4"; fetchSubmodules = false; - sha256 = "sha256-+iHJpArFu1txVQ5chpg9/aBXDGoDAPlCRqRbgTSnCiQ="; + sha256 = "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM="; }; }; radare2-mcp = { pname = "radare2-mcp"; - version = "1.8.6"; + version = "1.8.0"; src = fetchFromGitHub { owner = "radareorg"; repo = "radare2-mcp"; - rev = "1.8.6"; + rev = "1.8.0"; fetchSubmodules = false; - sha256 = "sha256-btJfvsIC/xRfdQYJL0FYqUHsvP7zn/2EnUzLesWZPK4="; + sha256 = "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8="; }; }; slbounce = { diff --git a/_sources/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock b/_sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock similarity index 99% rename from _sources/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock rename to _sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock index 8bf2e5d..666006b 100644 --- a/_sources/sha256-t_ayXFn2hXrSgAGZKn6FpZLbrMXekXL_+xhOXdsZvKU=/Cargo.lock +++ b/_sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock @@ -2849,9 +2849,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skia-bindings" -version = "0.97.2" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a38f4d460276ea40588c958396a9de0eec808c679009a5b52afdf6ebf34132" +checksum = "d6e3bcf8f25bf047e83110838463e8d06696c12fccc3d3794adf448b4d81f34b" dependencies = [ "bindgen", "cc", @@ -2866,9 +2866,9 @@ dependencies = [ [[package]] name = "skia-safe" -version = "0.97.2" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecfc54fcd40dc5dea15dd2a84f8422cdb0f76c6a51ebb8835ce0b7ef590a21f" +checksum = "935d4d174fb749bac9265eb41cad75039d32fda2d9c1a1e81b430df0e210a409" dependencies = [ "bitflags 2.10.0", "skia-bindings", @@ -3070,7 +3070,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix 1.1.2", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3689,7 +3689,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 4570644..29ecbdd 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -33,7 +33,7 @@ in rustPlatform.buildRustPackage.override {stdenv = clangStdenv;} (finalAttrs: { pname = "neovide"; - version = "nightly-${src.rev}"; + version = src.rev; src = src; cargoLock = sources.neovide.cargoLock."Cargo.lock";