Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 205f42b1422f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65336dc3cf71
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 28, 2020

  1. meson: 0.52.1 -> 0.53.2 

    https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
    @mpoquet @jtojnar
    mpoquet authored and jtojnar committed Feb 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65336dc View commit details
Showing with 2 additions and 11 deletions.
  1. +2 −11 pkgs/development/tools/build-managers/meson/default.nix
13 changes: 2 additions & 11 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib
, python3Packages
, fetchpatch
, stdenv
, writeTextDir
, substituteAll
@@ -20,11 +19,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "meson";
version = "0.52.1";
version = "0.53.2";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
};

postFixup = ''
@@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})

# Fix detecting incorrect compiler in the store path hash.
# https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
# https://github.com/mesonbuild/meson/pull/6185
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
})
];

setupHook = ./setup-hook.sh;