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: 4a906efce5c5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 405cb8603724
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 22, 2018

  1. meson: 0.45.1 → 0.46.1

    @jtojnar
    jtojnar committed May 22, 2018
    Copy the full SHA
    405cb86 View commit details
Showing with 2 additions and 18 deletions.
  1. +2 −6 pkgs/development/tools/build-managers/meson/default.nix
  2. +0 −12 pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch
8 changes: 2 additions & 6 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@
targetPrefix = lib.optionalString stdenv.isCross
(targetPlatform.config + "-");
in python3Packages.buildPythonApplication rec {
version = "0.45.1";
version = "0.46.1";
pname = "meson";
name = "${pname}-${version}";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14";
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
};

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

# No one will ever need more than 128 bytes of data structure
# https://github.com/mesonbuild/meson/issues/3113
./overly-strict-size-check.patch
];

setupHook = ./setup-hook.sh;
12 changes: 0 additions & 12 deletions pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch
View file

This file was deleted.