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
base: e27e11480323
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f94e0252f387
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 31, 2019

  1. pythonPackages.nbxmpp: 0.6.8 -> 0.6.9 

    Just a small bugfix release, but required for Gajim 1.1.2.

Upstream fixes:

  * Always bind after SM failed
  * Dont try and guess system language

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #54081
    @aszlig
    aszlig authored and Robert Schütz committed Jan 31, 2019
    Copy the full SHA
    9df21ab View commit details
    Browse the repository at this point in the history

  2. pythonPackages.precis-i18n: init at 1.0.0 

    This package is required since Gajim version 1.1.0 and I intentionally
didn't set meta.maintainers because I'm not going to be able to maintain
this package, except if Gajim requires a newer version.

Signed-off-by: aszlig <aszlig@nix.build>
    @aszlig
    aszlig authored and Robert Schütz committed Jan 31, 2019
    Copy the full SHA
    120238b View commit details
    Browse the repository at this point in the history

  3. gajim: 1.0.3 -> 1.1.2 

    The list of upstream changes is huge, so I'm not pasting it here in the
commit message, but here is the upstream URL:

  https://dev.gajim.org/gajim/gajim/blob/gajim-1.1.2/ChangeLog

One of the most visible updates are the design changes for various
dialogs and the Emoji overhauls.

On our end, we now need three more dependencies, namely cssutils,
precis-i18n and keyring, which I added accordingly.

In addition, the test runner is now integrated into setup.py, which we
now use.

I also cleaned up the package expression a bit, eg. it's no longer
wrapped in a big "with lib;", so that "nix-instantiate --parse" is able
to detect attribute errors (which is very useful if you have editor
integration).

Signed-off-by: aszlig <aszlig@nix.build>
    @aszlig
    aszlig authored and Robert Schütz committed Jan 31, 2019
    3
    Copy the full SHA
    32b3615 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #54817 from aszlig/gajim-1.1 

    gajim: 1.0.3 -> 1.1.2
    @dotlambda
    dotlambda committed Jan 31, 2019
    Copy the full SHA
    f94e025 View commit details
    Browse the repository at this point in the history