Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f86f9a4eb3b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb1de24c89bc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 12, 2017

  1. streamlink: 0.5.0 -> 0.6.0

    @zraexy
    zraexy committed May 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    83edd95 View commit details

  2. Merge pull request #25727 from zraexy/zraexy-pkg-streamlink 

    streamlink: 0.5.0 -> 0.6.0
    @pSub
    pSub authored May 12, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eb1de24 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/video/streamlink/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/video/streamlink/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:

pythonPackages.buildPythonApplication rec {
version = "0.5.0";
version = "0.6.0";
name = "streamlink-${version}";

src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = "${version}";
sha256 = "08q7f1fnm3zhs1knrkl6npr4yvpblqbiwa0m9r186ny11jq2dyib";
sha256 = "0602mybh9qrxbalnpg930prjfmfkfiwdyr6iz4byfzv0qrwa08yq";
};

buildInputs = with pythonPackages; [ pytest mock ];