Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6c007da4e669
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45a25ff41a23
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 14, 2019

  1. documize-communitiy: 3.1.1 -> 3.1.2 

    https://github.com/documize/community/releases/tag/v3.3.2
(cherry picked from commit 2466a5b)
    @Ma27
    Ma27 committed Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0fb21e0 View commit details

  2. 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 3 additions and 3 deletions.
  1. +1 −1 pkgs/applications/networking/instant-messengers/gajim/default.nix
  2. +2 −2 pkgs/servers/documize-community/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 ]
4 changes: 2 additions & 2 deletions pkgs/servers/documize-community/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoPackage rec {
pname = "documize-community";
version = "3.3.1";
version = "3.3.2";

src = fetchFromGitHub {
owner = "documize";
repo = "community";
rev = "v${version}";
sha256 = "1n7cdi76yfdk79ky7six72jg2px0b4hb9s16nshz3qvss469dn2j";
sha256 = "172h3v9absfc0p79a1v9m197x4aprryig0hhyq6bfhjyqd5nq0fd";
};

goPackagePath = "github.com/documize/community";