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

Commits on Oct 26, 2020

  1. libsForQt5.qtutilities: 6.0.6 -> 6.3.0

    @doronbehar
    doronbehar committed Oct 26, 2020
    Copy the full SHA
    c9a6cd0 View commit details

  2. syncthingtray: 0.11.0 -> 1.0.0

    @doronbehar
    doronbehar committed Oct 26, 2020
    Copy the full SHA
    a5ca6e8 View commit details

Commits on Oct 29, 2020

  1. Merge pull request #101747 from doronbehar/pkg/syncthingtray

    @doronbehar
    doronbehar authored Oct 29, 2020
    Copy the full SHA
    85eb1b5 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/misc/syncthingtray/default.nix
  2. +2 −2 pkgs/development/libraries/qtutilities/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/syncthingtray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@
}:

mkDerivation rec {
version = "0.11.0";
version = "1.0.0";
pname = "syncthingtray";

src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
sha256 = "1lpjrij6y8l738hd7bfig0piglqinnqbadidzw9k0nm53bh4pqrr";
sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo=";
};

buildInputs = [ qtbase cpp-utilities qtutilities ]
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qtutilities/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "qtutilities";
version = "6.0.6";
version = "6.3.0";

src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "0g3f18530w5f8dlzrh45k868hspga5p3m8qpz7pcg3nsdjda8cwz";
sha256 = "sha256-vHx2JMPqioY8jUpBOIFdhhN1mIUV3LS8ayQOo3g7bY0=";
};

buildInputs = [ qtbase cpp-utilities ];