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: f0ad76b504dd
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: 61cc1f0dc07c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 2, 2020

  1. youtube-dl: 2020.02.16 -> 2020.03.01 

    https://github.com/ytdl-org/youtube-dl/releases/tag/2020.03.01
(cherry picked from commit 5ce2974)
    @zowoq @Ma27
    zowoq authored and Ma27 committed Mar 2, 2020

    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
    e1dd2c6 View commit details

  2. riot-web: mention incompatible config change in release notes 

    Mention the changes introduced in commit c9e5cca.

GitHub: closes #81416
(cherry picked from commit 6d4fd13)
    @pacien @rnhmjoj
    pacien authored and rnhmjoj committed Mar 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    61cc1f0 View commit details
Showing with 13 additions and 4 deletions.
  1. +10 −0 nixos/doc/manual/release-notes/rl-2003.xml
  2. +3 −4 pkgs/tools/misc/youtube-dl/default.nix
10 changes: 10 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
View file
Original file line number Diff line number Diff line change
@@ -881,6 +881,16 @@ auth required pam_succeed_if.so uid >= 1000 quiet
</citerefentry>-script now uses the python test-driver.
</para>
</listitem>
<listitem>
<para>
The <package>riot-web</package> package now accepts configuration overrides as an attribute set instead of a string.
A formerly used JSON configuration can be converted to an attribute set with <literal>builtins.fromJSON</literal>.
</para>
<para>
The new default configuration also disables automatic guest account registration and analytics to improve privacy.
The previous behavior can be restored by setting <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>.
</para>
</listitem>
</itemizedlist>
</section>

7 changes: 3 additions & 4 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 = "2020.02.16";
version = "2020.03.01";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb";
sha256 = "01hk00nbxxa81yajkbv65nv5amwyavhjs127xkyqqcrq6ws3z92w";
};

nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +54,7 @@ buildPythonPackage rec {
doCheck = false;

meta = with lib; {
homepage = https://rg3.github.io/youtube-dl/;
repositories.git = https://github.com/rg3/youtube-dl.git;
homepage = "https://rg3.github.io/youtube-dl/";
description = "Command-line tool to download videos from YouTube.com and other sites";
longDescription = ''
youtube-dl is a small, Python-based command-line program