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

Commits on Oct 14, 2019

  1. Merge pull request #69366 from erosennin/gajim-setuptools 

    gajim: add missing setuptools dependency
(cherry picked from commit aad0efd)
    @7c6f434c
    7c6f434c committed Oct 14, 2019
    Copy the full SHA
    45a25ff View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/networking/instant-messengers/gajim/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/gajim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec {
];

propagatedBuildInputs = with python3.pkgs; [
nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring
nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]