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

Commits on Nov 12, 2019

  1. Merge pull request #73250 from wamserma/guake-add-setuptools 

    guake: add missing dependency on setuptools
    @jtojnar @wamserma
    jtojnar authored and wamserma committed Nov 12, 2019
    Copy the full SHA
    5ab3224 View commit details

Commits on Jan 19, 2020

  1. Merge pull request #73276 from wamserma/r19.09-guake-add-setuptools 

    Merge pull request #73250 from wamserma/guake-add-setuptools
    @jtojnar
    jtojnar authored Jan 19, 2020
    Copy the full SHA
    d14cea0 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/misc/guake/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/misc/guake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ in python3.pkgs.buildPythonApplication {

buildInputs = [ gtk3 keybinder3 libnotify python3 vte ];

propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 libwnck3 ];
propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 setuptools libwnck3 ];

LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699