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: b986078593af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd798d13bd02
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 14, 2018

  1. svtplay-dl: 1.9.6 -> 1.9.7

    @rycee
    rycee committed Jan 14, 2018

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    fb5f636 View commit details

  2. eclipse-plugin-checkstyle: 8.5.1 -> 8.7.0

    @rycee
    rycee committed Jan 14, 2018
    Copy the full SHA
    dd798d1 View commit details
Showing with 11 additions and 6 deletions.
  1. +3 −3 pkgs/applications/editors/eclipse/plugins.nix
  2. +8 −3 pkgs/tools/misc/svtplay-dl/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/editors/eclipse/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -192,12 +192,12 @@ rec {

checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
version = "8.5.1.201712211522";
version = "8.7.0.201801131309";

src = fetchzip {
stripRoot = false;
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip";
sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab";
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.7.0/net.sf.eclipsecs-updatesite_${version}.zip";
sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60";
};

meta = with stdenv.lib; {
11 changes: 8 additions & 3 deletions pkgs/tools/misc/svtplay-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ let
inherit (pythonPackages) python nose pycrypto requests mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
version = "1.9.6";
version = "1.9.7";

src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "11xw4whh60k61i8akd7avb254mmffaig72kb7w6prk1kjq05js2s";
sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r";
};

pythonPaths = [ pycrypto requests ];
@@ -34,7 +34,12 @@ in stdenv.mkDerivation rec {
'';

doCheck = true;
checkPhase = "sh scripts/run-tests.sh -2";
checkPhase = ''
sed -i "/def test_parse_m3u8/i\\
@unittest.skip('requires internet')" lib/svtplay_dl/tests/hls.py
sh scripts/run-tests.sh -2
'';

meta = with stdenv.lib; {
homepage = https://github.com/spaam/svtplay-dl;