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: 0535597ca83f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca55015ed827
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 28, 2020

  1. Revert "meson: 0.52.1 -> 0.53.2" 

    This reverts commit d607564.

should go to staging
    @jtojnar
    jtojnar committed Feb 28, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    ca55015 View commit details
Showing with 11 additions and 2 deletions.
  1. +11 −2 pkgs/development/tools/build-managers/meson/default.nix
13 changes: 11 additions & 2 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib
, python3Packages
, fetchpatch
, stdenv
, writeTextDir
, substituteAll
@@ -19,11 +20,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "meson";
version = "0.53.2";
version = "0.52.1";

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

postFixup = ''
@@ -61,6 +62,14 @@ 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;