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: ea30555a03dd
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: c7dc8ec5728a
Choose a head ref
  • 9 commits
  • 3 files changed
  • 7 contributors

Commits on Oct 31, 2018

  1. youtube-dl: 2018.08.04 -> 2018.09.10 

    (cherry picked from commit 74047ea)
    @AndersonTorres @timokau
    AndersonTorres authored and timokau committed Oct 31, 2018
    Copy the full SHA
    b4fc0d9 View commit details

  2. youtube-dl: 2018.09.10 -> 2018.09.18 (#47151) 

    (cherry picked from commit 4a68689)
    @va1entin @timokau
    va1entin authored and timokau committed Oct 31, 2018
    Copy the full SHA
    ebd4599 View commit details

  3. youtube-dl: 2018.09.18 -> 2018.09.26 

    (cherry picked from commit 967baed)
    @nyanloutre @timokau
    nyanloutre authored and timokau committed Oct 31, 2018
    Copy the full SHA
    dbc3b8d View commit details

  4. youtube-dl: 2018.09.26 -> 2018.10.05 (#47940) 

    (cherry picked from commit 3a0fbe3)
    @pnelson @timokau
    pnelson authored and timokau committed Oct 31, 2018
    Copy the full SHA
    9e41ec1 View commit details

  5. youtube-dl: 2018.10.05 -> 2018.10.29 

    (cherry picked from commit 6ff1783)
    @timokau
    timokau committed Oct 31, 2018
    Copy the full SHA
    3592ebe View commit details

  6. Merge pull request #49523 from timokau/youtube-dl-backport 

    youtube-dl: backports
    @timokau
    timokau authored Oct 31, 2018
    Copy the full SHA
    47c4afa View commit details

  7. nginxMainline: 1.15.3 -> 1.15.5 (#48127) 

    (cherry picked from commit 205b3d9)
    @sengaya @fpletz
    sengaya authored and fpletz committed Oct 31, 2018
    Copy the full SHA
    85ad2d0 View commit details

  8. riot-web: 0.16.0 -> 0.16.2 (#46190) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
riot-web

(cherry picked from commit 57062f9)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Oct 31, 2018
    Copy the full SHA
    65e85c8 View commit details

  9. riot-web: 0.16.2 -> 0.16.5 

    (cherry picked from commit 34e8009)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Oct 31, 2018
    Copy the full SHA
    c7dc8ec View commit details
Showing with 13 additions and 18 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-web.nix
  2. +2 −2 pkgs/servers/http/nginx/mainline.nix
  3. +9 −14 pkgs/tools/misc/youtube-dl/default.nix
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
@@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "0.16.0";
version = "0.16.5";

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

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/mainline.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:

callPackage ./generic.nix (args // {
version = "1.15.3";
sha256 = "11dysslkz76cdzhshc6w5qivdplk10pjpb73li0d1sz2qf8zp4ck";
version = "1.15.5";
sha256 = "0vxfbnc1794al60d9mhjw1w72x5jslfwq51vvs38568liyd8hfhs";
})
23 changes: 9 additions & 14 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,29 +16,24 @@
buildPythonPackage rec {

pname = "youtube-dl";
version = "2018.09.01";
# 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 = "2018.10.29";

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

patches = [
# https://github.com/rg3/youtube-dl/pull/17464
(fetchpatch {
name = "youtube-js-player-fix.patch";
url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch";
sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg";
})
];

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ zip ] ++ lib.optional generateManPage pandoc;
propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome;

# Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
# rtmpdump is required to download files over RTMP
# atomicparsley for embedding thumbnails
# Ensure these utilities are available in $PATH:
# - ffmpeg: post-processing & transcoding support
# - rtmpdump: download files over RTMP
# - atomicparsley: embedding thumbnails
makeWrapperArgs = let
packagesToBinPath =
[ atomicparsley ]