Skip to content

Commit

Permalink
ninja_1_11: init at 1.11.1
Browse files Browse the repository at this point in the history
Swift 5.8 doesn’t reliably build with Ninja 1.12, and apparently
neither do old versions of ROCm, due to a build scheduling change
breaking builds with undeclared dependencies. Upstream Swift have
pinned 1.11 for now.

Reintroducing it isn’t a good long‐term solution, but seems
like the easiest way to avoid shipping 24.11 with a broken Swift
on Darwin. The patch for 32‐bit systems has not been restored,
as Swift doesn’t support them anyway.
  • Loading branch information
emilazy committed Nov 8, 2024
1 parent 14434de commit 5f0b2a5
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 7 deletions.
31 changes: 24 additions & 7 deletions pkgs/by-name/ni/ninja/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,35 @@
, buildPackages
, buildDocs ? true
, nix-update-script
, ninjaRelease ? "latest"
}:

let
releases = {
# TODO: Remove Ninja 1.11 as soon as possible.
"1.11" = fetchFromGitHub {
owner = "ninja-build";
repo = "ninja";
rev = "v1.11.1";
hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
};

latest = fetchFromGitHub {
owner = "ninja-build";
repo = "ninja";
rev = "v1.12.1";
hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
};
};
in

assert lib.assertMsg (releases ? ${ninjaRelease}) "Unsupported Ninja release: ${ninjaRelease}";

stdenv.mkDerivation (finalAttrs: {
pname = "ninja";
version = "1.12.1";
version = lib.removePrefix "v" finalAttrs.src.rev;

src = fetchFromGitHub {
owner = "ninja-build";
repo = "ninja";
rev = "v${finalAttrs.version}";
hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
};
src = releases.${ninjaRelease};

depsBuildBuild = [ buildPackages.stdenv.cc ];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30944,6 +30944,8 @@ with pkgs;

node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };

ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };

ninjas2 = callPackage ../applications/audio/ninjas2 { };

nootka = qt5.callPackage ../applications/audio/nootka { };
Expand Down

0 comments on commit 5f0b2a5

Please sign in to comment.