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: 5cc3e2bde1cb
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: 732684b720f8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 14, 2020

  1. youtube-dl: 2020.09.06 -> 2020.09.14 

    https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.14
(cherry picked from commit 4a11f04)
    @Luflosi @Ma27
    Luflosi authored and Ma27 committed Sep 14, 2020
    Copy the full SHA
    10ecc02 View commit details

  2. top-level: fix nix-shell eval w/nixUnstable 

    For a full description of the underlying issue please read
NixOS/nix#4003

(cherry picked from commit fa6064a)
    @Ma27
    Ma27 committed Sep 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    732684b View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
  2. +1 −1 pkgs/top-level/impure.nix
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.09.06";
version = "2020.09.14";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1827hcp9bvwq7p2f5r0wgkg6yb5fgvr4miyi3d99hkah2afw12za";
sha256 = "18wfhprbaszpxgqkac3hb050ngvdsaibbcifg88rkv5vc6bc2mq6";
};

nativeBuildInputs = [ installShellFiles makeWrapper ];
2 changes: 1 addition & 1 deletion pkgs/top-level/impure.nix
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ in
# not be passed.
assert args ? localSystem -> !(args ? system || args ? platform);

import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
import ./. (builtins.removeAttrs args [ "system" "platform" "inNixShell" ] // {
inherit config overlays crossSystem crossOverlays;
# Fallback: Assume we are building packages on the current (build, in GNU
# Autotools parlance) system.