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: e985ffea2d64
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: e7752db2fb6c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 29, 2020

  1. youtube-dl: 2020.05.08 -> 2020.05.29 

    https://github.com/ytdl-org/youtube-dl/releases/tag/2020.05.29
(cherry picked from commit cd0b121)
    @Luflosi @Ma27
    Luflosi authored and Ma27 committed May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6fe8bd0 View commit details

  2. mkdocs: default to Python 3 

    (cherry picked from commit ee17a6a)
Signed-off-by: Domen Kožar <domen@dev.si>
    @jethrokuan @domenkozar
    jethrokuan authored and domenkozar committed May 29, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e7752db View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/tools/documentation/mkdocs/default.nix
  2. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/documentation/mkdocs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, python, fetchFromGitHub }:
{ stdenv, lib, python3, fetchFromGitHub }:

with python.pkgs;
with python3.pkgs;

buildPythonApplication rec {
pname = "mkdocs";
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 = "2020.05.08";
version = "2020.05.29";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6";
sha256 = "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3";
};

nativeBuildInputs = [ installShellFiles makeWrapper ];