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: 1c14829a6734
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f95c2644eb75
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 7, 2018

  1. tryton: 4.8.3 -> 4.8.4

    udono committed Aug 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    da670ed View commit details
  2. trytond: 4.8.2 -> 4.8.3

    udono committed Aug 7, 2018
    Copy the full SHA
    b07e617 View commit details
  3. Merge pull request #44594 from udono/update_tryton_4_8

    tryton: 4.8.3 -> 4.8.4, trytond: 4.8.2 -> 4.8.3
    srhb authored Aug 7, 2018
    Copy the full SHA
    f95c264 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/office/tryton/default.nix
  2. +2 −2 pkgs/applications/office/trytond/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/office/tryton/default.nix
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@ with stdenv.lib;

python2Packages.buildPythonApplication rec {
pname = "tryton";
version = "4.8.3";
version = "4.8.4";
src = python2Packages.fetchPypi {
inherit pname version;
sha256 = "1e2862bbe7c943afbbdf2232cdc55f75d2357640115c7f1483f0814b2c5a6882";
sha256 = "6cf3091424853e1270d61f3a9b15ad8e6b36a44c28becf216c324ca8dc1474b0";
};
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
propagatedBuildInputs = with python2Packages; [
4 changes: 2 additions & 2 deletions pkgs/applications/office/trytond/default.nix
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@ with stdenv.lib;

python2Packages.buildPythonApplication rec {
pname = "trytond";
version = "4.8.2";
version = "4.8.3";
src = python2Packages.fetchPypi {
inherit pname version;
sha256 = "ec5c419418517bf9f7d2af08b2bfd3bcc7526f6d6f07d122abf1699c728ae2a9";
sha256 = "11d01dc984d9274229b5c80f883679d130a55e14e9124b051274fce9aea4ef77";
};

# Tells the tests which database to use