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

Commits on Mar 18, 2019

  1. meld: fix checkPhase 

    Needs some more inputs after checkInputs went native.

(cherry picked from commit 99fac0a)
(cherry picked from commit 4a75888)
    @hedning @xeji
    hedning authored and xeji committed Mar 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: 06121D366FE9435C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6a0bc21 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/version-management/meld/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/meld/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
];
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];
checkInputs = [ xvfb_run python3.pkgs.pytest dbus gtksourceview gtk3 ];

installPhase = ''
runHook preInstall