From 00eae402c32eb23a7be320a9bbb40d2021befd82 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Mon, 16 Jun 2025 17:16:39 +0200 Subject: [PATCH 1/4] Add yannham to the maintainer list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ca444cecfd5..7f2e1acd7d99 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27363,6 +27363,11 @@ github = "yanganto"; githubId = 10803111; }; + yannham = { + github = "yannham"; + githubId = 6530104; + name = "Yann Hamdaoui"; + }; yannickulrich = { email = "yannick.ulrich@proton.me"; github = "yannickulrich"; From c7082db884a50d425c1c07bf871fef6a07a12d87 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Mon, 16 Jun 2025 17:17:39 +0200 Subject: [PATCH 2/4] nickel: add yannham to maintainers --- pkgs/by-name/ni/nickel/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 5435356e206e..c60a028d5388 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -99,6 +99,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ felschr matthiasbeyer + yannham ]; mainProgram = "nickel"; }; From 1713262d28c814f3f01bb461718d1534fbdc82c3 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Mon, 16 Jun 2025 17:18:47 +0200 Subject: [PATCH 3/4] nickel: disable nix feature by default See https://github.com/tweag/nickel/issues/2284 --- pkgs/by-name/ni/nickel/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index c60a028d5388..e9ce620603ef 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -9,7 +9,7 @@ pkg-config, nixVersions, nix-update-script, - enableNixImport ? true, + enableNixImport ? false, }: rustPlatform.buildRustPackage (finalAttrs: { From e0ec68aee570cc84a402ad9ed66327ac51c0438f Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Mon, 16 Jun 2025 17:19:35 +0200 Subject: [PATCH 4/4] nickel: 1.11.0 -> 1.12.0 --- pkgs/by-name/ni/nickel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index e9ce620603ef..556b4cfdb6f0 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nickel"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; tag = finalAttrs.version; - hash = "sha256-I7cLVrkJhB3aJeE/A3tpFEUj0AkvcONSXD8NtnE5eQ0="; + hash = "sha256-iKLjYE4uT+luIRXjEuO7KjgkO+/jFpLjhCI5tO7TVMM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DzSfwBVeRT/GAXWyZKZjlDvj95bQzrkqIgZZ2EZw7eQ="; + cargoHash = "sha256-O/iat0JOvA90LD+ngAByLYQyd1VBeoa8yj7/NdEYprE="; cargoBuildFlags = [ "-p nickel-lang-cli"