Skip to content

ninja: adopt mkManyVariants, bump #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonringer merged 2 commits into from
Mar 3, 2026
Merged

ninja: adopt mkManyVariants, bump #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c71ca0
ninja: adopt mkManyVariants
jonringer Mar 3, 2026
e23cc53
ninja: 1.13.1 -> 1.13.2
jonringer Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...nja/0001-spawn-sh-instead-of-bin-sh.patch → ...nja/0001-spawn-sh-instead-of-bin-sh.patch
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions pkgs-many/ninja/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{ mkManyVariants, callPackage }:

mkManyVariants {
variants = ./variants.nix;
aliases = { };
defaultSelector = (p: p.v1_13);
genericBuilder = ./generic.nix;
inherit callPackage;
}
32 changes: 15 additions & 17 deletions pkgs/ninja/default.nix → pkgs-many/ninja/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# First parameter: variant args with helpers
{
version,
src-hash,
buildDocs ? false,
packageOlder,
packageAtLeast,
...
}@variantArgs:

# Second parameter: package dependencies
{
lib,
stdenv,
Expand All @@ -11,31 +22,18 @@
python3,
re2c,
buildPackages,
buildDocs ? true,
nix-update-script,
ninjaRelease ? "latest",
}:
}@args:

stdenv.mkDerivation (finalAttrs: {
pname = "ninja";
version =
{
"1.11" = "1.11.1";
latest = "1.13.1";
}
.${ninjaRelease};
inherit version;

src = fetchFromGitHub {
owner = "ninja-build";
repo = "ninja";
rev = "v${finalAttrs.version}";
hash =
{
# TODO: Remove Ninja 1.11 as soon as possible.
"1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
latest = "sha256-GhAF5wUT19E02ZekW+ywsCMVGYrt56hES+MHCH4lNG4=";
}
.${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
hash = src-hash;
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
Expand All @@ -56,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
./0001-spawn-sh-instead-of-bin-sh.patch
]
# TODO: remove together with ninja 1.11
++ lib.optionals (lib.versionOlder finalAttrs.version "1.12") [
++ lib.optionals (packageOlder "1.12") [
(fetchpatch {
name = "ninja1.11-python3.13-compat.patch";
url = "https://github.com/ninja-build/ninja/commit/9cf13cd1ecb7ae649394f4133d121a01e191560b.patch";
Expand Down
0 pkgs/ninja/setup-hook.sh → pkgs-many/ninja/setup-hook.sh
View file
Open in desktop
File renamed without changes.
17 changes: 17 additions & 0 deletions pkgs-many/ninja/variants.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
v1_11 = rec {
version = "1.11.1";
src-hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
buildDocs = false;
};

v1_13 = rec {
version = "1.13.2";
src-hash = "sha256-D9HsIjv8EJ1qAdXFAKy260K77cCvopgQ2Fx6uXpt6VI=";
buildDocs = false;
};

withDocs = {
buildDocs = true;
};
}