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: e113100be020
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: c667aba79ce4
Choose a head ref
  • 6 commits
  • 3 files changed
  • 4 contributors

Commits on Mar 3, 2020

  1. tribler: 7.4.1 -> 7.4.4

    r-ryantm committed Mar 3, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    b66896f View commit details

Commits on Mar 4, 2020

  1. avocode: 4.3.0 -> 4.4.3

    r-ryantm committed Mar 4, 2020
    Copy the full SHA
    6431033 View commit details
  2. Copy the full SHA
    88b22b6 View commit details

Commits on Mar 5, 2020

  1. Merge pull request #81646 from r-ryantm/auto-update/tribler

    tribler: 7.4.1 -> 7.4.4
    ryantm authored Mar 5, 2020
    Copy the full SHA
    e291c90 View commit details
  2. Merge pull request #81741 from r-ryantm/auto-update/avocode

    avocode: 4.3.0 -> 4.4.3
    ryantm authored Mar 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    1426c3e View commit details
  3. Merge pull request #81754 from jtojnar/php-7.4.3

    php74: 7.4.2 → 7.4.3
    etu authored Mar 5, 2020
    Copy the full SHA
    c667aba View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/graphics/avocode/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "avocode";
version = "4.3.0";
version = "4.4.3";

src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids";
sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk";
};

libPath = stdenv.lib.makeLibraryPath (with xorg; [
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = https://avocode.com/;
homepage = "https://avocode.com/";
description = "The bridge between designers and developers";
license = licenses.unfree;
platforms = platforms.linux;
6 changes: 3 additions & 3 deletions pkgs/applications/networking/p2p/tribler/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "tribler";
version = "7.4.1";
version = "7.4.4";

src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
sha256 = "1s9hzr0n00d3hb1z2srq75j7mbml6csylb14hzy9psw27q2c0fqs";
sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p";
};

nativeBuildInputs = [
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
maintainers = with maintainers; [ xvapx ];
homepage = https://www.tribler.org/;
homepage = "https://www.tribler.org/";
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/default.nix
Original file line number Diff line number Diff line change
@@ -286,7 +286,7 @@ in {
};

php74 = generic {
version = "7.4.2";
sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402";
version = "7.4.3";
sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
};
}