diff options
| author | John Titor <50095635+JohnRTitor@users.noreply.github.com> | 2024-04-11 23:19:57 +0530 |
|---|---|---|
| committer | John Titor <50095635+JohnRTitor@users.noreply.github.com> | 2024-05-13 11:33:07 +0530 |
| commit | 4852dc647998d029dce997e217063a2920f40d00 (patch) | |
| tree | 67cfc520112c8123aa698bda2fc8bf75a4961f08 /pkgs/by-name/ni | |
| parent | 493d74ef4a597b7c00bb2db4134f8912df0697f1 (diff) | |
ninja: 1.11.1 -> 1.12.0
Remove patch for files in large fs, since it is merged to v1.12.0
Diffstat (limited to 'pkgs/by-name/ni')
| -rw-r--r-- | pkgs/by-name/ni/ninja/package.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index 3402bcfca625f..9ca66b2be5055 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , asciidoc , docbook_xml_dtd_45 , docbook_xsl @@ -15,13 +14,13 @@ stdenv.mkDerivation rec { pname = "ninja"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; + hash = "sha256-ewMn735TJTiQZYk3Y7QxNLRnKh6xdRUcdJzCX+HCmEo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,15 +37,6 @@ stdenv.mkDerivation rec { libxslt.bin ]; - patches = lib.optionals stdenv.is32bit [ - # Otherwise ninja may fail on some files in a larger FS. - (fetchpatch { - name = "stat64.patch"; - url = "https://github.com/ninja-build/ninja/commit/7bba11ae704efc84cac5fde5e9be53f653f237d1.diff"; - hash = "sha256-tINS57xLh1lwnYFWCQs5OudfgtIShaOh5zbmv7w5BnQ="; - }) - ]; - postPatch = '' # write rebuild args to file after bootstrap substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])" |