diff options
author | Tobias Mayer <tobim@fastmail.fm> | 2020-01-28 15:30:23 +0100 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2020-02-09 16:57:56 -0600 |
commit | 3a39ea06d20fb062658c36afa70eba700dfb4b36 (patch) | |
tree | 0b3cd0fd529cea04ac1104c57e316b9dcd4d32b3 /pkgs/development/tools/build-managers | |
parent | 3b17e6559bc5c411372667c6151ad1d38c28377e (diff) | |
download | nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.tar nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.tar.gz nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.tar.bz2 nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.tar.lz nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.tar.xz nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.tar.zst nixlib-3a39ea06d20fb062658c36afa70eba700dfb4b36.zip |
ninja: 1.9.0 -> 1.10.0
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/ninja/default.nix | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 7001510d52d6..9702a1979030 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,31 +4,15 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610"; + sha256 = "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"; }; - patches = [ - # Make builds reproducible by generating the same IDs from the same inputs. - (fetchpatch { - name = "consistent-doc-ids"; - url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch"; - sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; - }) - # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? - # - (fetchpatch { - name = "fix-issue-1510.patch"; - url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; - sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69"; - }) - ]; - nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; buildPhase = '' |