From e7572dfb7471d157e265340260e289a618f5aaa2 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 26 Oct 2025 19:30:12 +0200 Subject: [PATCH 1/3] genemichaels: switch to fetchCrate This way we can avoid tests failing due to unstable libraries in the workspace (they'll be replaced by stable versions from Crates) --- pkgs/by-name/ge/genemichaels/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 0dbbe783edab..63b1d44e0846 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -1,28 +1,19 @@ { lib, rustPlatform, - fetchFromGitHub, + fetchCrate, }: rustPlatform.buildRustPackage rec { pname = "genemichaels"; version = "0.5.13"; - src = fetchFromGitHub { - owner = "andrewbaxter"; - repo = "genemichaels"; - rev = "genemichaels-v${version}"; - hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ="; + src = fetchCrate { + inherit pname version; + hash = "sha256-ZJr5cN+Bam71fPDwhcYUVop5JW8145tzY7Sk75fjhvQ="; }; - cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM="; - - cargoBuildFlags = [ "--package ${pname}" ]; - # cargoTestFlags is not used because genemichaels is tightly coupled to the - # other crates in the workspace and by not setting it, we run all the tests. - # If a dependency crate is failing its tests, we want to know about it. For - # example, between versions 0.5.8 and 0.5.12, there was a failing test in one - # of the other workspace members that genemichaels depends on. + cargoHash = "sha256-SVJ3vXa2yNhdayUsYNpXSqLrMzi4JzjKuh0VTteIOLs="; meta = { description = "Even formats macros"; From 1ed025fe46f6618d49d1c6f7bb79bdd3db17d817 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 26 Oct 2025 20:14:28 +0200 Subject: [PATCH 2/3] genemichaels: add updateScript --- pkgs/by-name/ge/genemichaels/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 63b1d44e0846..5759076c2bd5 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchCrate, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SVJ3vXa2yNhdayUsYNpXSqLrMzi4JzjKuh0VTteIOLs="; + passthru.updateScript = nix-update-script { }; + meta = { description = "Even formats macros"; homepage = "https://github.com/andrewbaxter/genemichaels"; From 842cff02d8e9c480e4e1fb616c2ce30ef738d49e Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 26 Oct 2025 18:15:16 +0000 Subject: [PATCH 3/3] genemichaels: 0.5.13 -> 0.8.5 --- pkgs/by-name/ge/genemichaels/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 5759076c2bd5..9e3e21c6dae5 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "genemichaels"; - version = "0.5.13"; + version = "0.8.5"; src = fetchCrate { inherit pname version; - hash = "sha256-ZJr5cN+Bam71fPDwhcYUVop5JW8145tzY7Sk75fjhvQ="; + hash = "sha256-5cM5VyS5w92CjP3nVumuUNkCFlhipukRhM8ERhE36n4="; }; - cargoHash = "sha256-SVJ3vXa2yNhdayUsYNpXSqLrMzi4JzjKuh0VTteIOLs="; + cargoHash = "sha256-aJDtXsGVUxUrh3yLWEcobvFUqy/7PGFQHWIWU54zYdE="; passthru.updateScript = nix-update-script { };