Skip to content
Merged
Changes from 1 commit
Commits
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
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"
Comment thread
alyssais marked this conversation as resolved.
];
})

# 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