Skip to content

meson: 1.0.0 -> 1.1.0 #226265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssais merged 2 commits into from
Apr 19, 2023
Merged

meson: 1.0.0 -> 1.1.0 #226265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87cbf1b
meson: 1.0.0 -> 1.1.0
alyssais Apr 15, 2023
df8f308
fwupd,power-profiles-daemon: remove pkexec hack
alyssais Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "1.0.0";
version = "1.1.0";

src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-qlCkukVXwl59SERqv96FeVfc31g4X/++Zwug6O+szgU=";
hash = "sha256-2WFsRM1sU2if+PBfxpWKaT8uF8NHKo2vg87lXav/gp8=";
};

patches = [
Expand Down Expand Up @@ -72,13 +72,6 @@ python3.pkgs.buildPythonApplication rec {
"docs/yaml/objects/dep.yaml"
];
})

# tests: avoid unexpected failure when cmake is not installed
# https://github.com/mesonbuild/meson/pull/11321
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/a38ad3039d0680f3ac34a6dc487776c79c48acf3.patch";
hash = "sha256-9YaXwc+F3Pw4BjuOXqva4MD6DAxX1k5WLbn0xzwuEmw=";
})
];

setupHook = ./setup-hook.sh;
Expand Down
10 changes: 0 additions & 10 deletions pkgs/os-specific/linux/firmware/fwupd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,16 +297,6 @@ stdenv.mkDerivation (finalAttrs: {
LD_PRELOAD=${libredirect}/lib/libredirect.so
'';

preInstall = ''
# We have pkexec on PATH so Meson will try to use it when installation fails
# due to being unable to write to e.g. /etc.
# Let’s pretend we already ran pkexec –
# the pkexec on PATH would complain it lacks setuid bit,
# obscuring the underlying error.
# https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558
export PKEXEC_UID=-1
'';

postInstall = ''
# These files have weird licenses so they are shipped separately.
cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd"
Expand Down
10 changes: 0 additions & 10 deletions pkgs/os-specific/linux/power-profiles-daemon/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,6 @@ stdenv.mkDerivation rec {
tests/unittest_inspector.py
'';

preInstall = ''
# We have pkexec on PATH so Meson will try to use it when installation fails
# due to being unable to write to e.g. /etc.
# Let’s pretend we already ran pkexec –
# the pkexec on PATH would complain it lacks setuid bit,
# obscuring the underlying error.
# https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558
export PKEXEC_UID=-1
'';

postCheck = ''
# Do not contaminate the wrapper with test dependencies.
unset GI_TYPELIB_PATH
Expand Down