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: dfa36eda9200
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dabc1256900d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 19, 2018

  1. meson: remove obsolete and blocking patch 

    meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
    @hedning
    hedning committed Nov 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a48c7c View commit details

  2. Merge pull request #50710 from hedning/remove-obsolete-meson-patch 

    meson: remove obsolete and blocking patch
    @jtojnar
    jtojnar authored Nov 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dabc125 View commit details
Showing with 1 addition and 7 deletions.
  1. +1 −7 pkgs/development/tools/build-managers/meson/default.nix
8 changes: 1 addition & 7 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages, fetchpatch }:
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:

python3Packages.buildPythonApplication rec {
version = "0.48.2";
@@ -44,12 +44,6 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})

# Support Python 3.7. This is part of 0.47 and 0.48.1.
(fetchpatch {
url = https://github.com/mesonbuild/meson/commit/a87496addd9160300837aa50193f4798c6f1d251.patch;
sha256 = "1jfn9dgib5bc8frcd65cxn3fzhp19bpbjadxjkqzbjk1v4hdbl88";
})
];

setupHook = ./setup-hook.sh;