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: 5a0048ac5ced
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: 6ed74804efdc
Choose a head ref
  • 8 commits
  • 6 files changed
  • 4 contributors

Commits on Sep 28, 2019

  1. kitty: 0.14.3 -> 0.14.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kitty/versions

(cherry picked from commit c03a40a)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Sep 28, 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
    8644998 View commit details

  2. kitty: 0.14.5 -> 0.14.6 

    https://sw.kovidgoyal.net/kitty/changelog.html#id1
(cherry picked from commit 04d6fa1)
    @Ma27
    Ma27 committed Sep 28, 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
    23cc33e View commit details

  3. youtube-dl: 2019.09.12.1 -> 2019.09.28 

    (cherry picked from commit b7c5073)
    @xrelkd @worldofpeace
    xrelkd authored and worldofpeace committed Sep 28, 2019
    Copy the full SHA
    277ec48 View commit details

  4. riot-web: 1.3.3 -> 1.3.5 

    (cherry picked from commit 8e09b94)
    @pacien @worldofpeace
    pacien authored and worldofpeace committed Sep 28, 2019
    Copy the full SHA
    8675cb2 View commit details

  5. riot-desktop: 1.3.3 -> 1.3.5 

    (cherry picked from commit e32515a)
    @pacien @worldofpeace
    pacien authored and worldofpeace committed Sep 28, 2019
    Copy the full SHA
    44d55e1 View commit details

  6. riot-web: 1.3.5 -> 1.4.0 

    (cherry picked from commit 07891af)
    @pacien @worldofpeace
    pacien authored and worldofpeace committed Sep 28, 2019
    Copy the full SHA
    a6c9a6a View commit details

  7. riot-desktop: 1.3.5 -> 1.4.0 

    (cherry picked from commit ec0d11a)
    @pacien @worldofpeace
    pacien authored and worldofpeace committed Sep 28, 2019
    Copy the full SHA
    5681d02 View commit details

  8. minitube: 2.9 -> 3.2 

    https://flavio.tordini.org/minitube-3-2
https://flavio.tordini.org/minitube-3-1
https://flavio.tordini.org/minitube-3-0
(cherry picked from commit 6fd3fea)
    @Ma27
    Ma27 committed Sep 28, 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
    6ed7480 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/misc/kitty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.14.3";
version = "0.14.6";
format = "other";

src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b";
sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51";
};

buildInputs = [
@@ -123,6 +123,6 @@ buildPythonApplication rec {
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs ];
maintainers = with maintainers; [ tex rvolosatovs ma27 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.3.3",
"version": "1.4.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@

let
executableName = "riot-desktop";
version = "1.3.3";
version = "1.4.0";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc";
sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa";
};

in yarn2nix-moretea.mkYarnPackage rec {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.3.3";
version = "1.4.0";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9";
sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk";
};

installPhase = let
9 changes: 5 additions & 4 deletions pkgs/applications/video/minitube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake
, qtdeclarative, qttools
, qtdeclarative, qttools, qtx11extras, mpv

# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
# account. You'll need to generate (and please share :-) a new one if it breaks.
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:

stdenv.mkDerivation rec {
pname = "minitube";
version = "2.9";
version = "3.2";

src = fetchFromGitHub {
sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f";
sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c";
rev = version;
repo = "minitube";
owner = "flaviotordini";
fetchSubmodules = true;
};

buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ];
nativeBuildInputs = [ wrapQtAppsHook qmake ];

qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.09.12.1";
version = "2019.09.28";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf";
sha256 = "0nrk0bk6lksnmng8lwhcpkc57iibzjjamlqz8rxjpsw6dnzxz82h";
};

nativeBuildInputs = [ makeWrapper ];