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

Commits on Nov 18, 2018

  1. pythonPackages.requests: disable multiple outputs 

    The `dev` output is empty anyway.

The problem is that it interacts badly with other parts of python and
stdenv infrastructure. In particular, before this patch it installs
code into `out` output (with only generated `nix-support` in `dev`),
but `makePythonPath` then uses `propagatedBuildInputs` to generate
`PYTHONPATH` while stdenv selects `dev` outputs for
`propagatedBuiltInputs`. This results in `makePythonPath` linking to
the empty `dev` output in `PYTHONPATH`.

This reverts a piece of commit 28299f6.
    @oxij @FRidh
    oxij authored and FRidh committed Nov 18, 2018

    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
    60ba7d2 View commit details

  2. kodiPlugins.simpleplugin: init at 2.3.2

    @oxij @FRidh
    oxij authored and FRidh committed Nov 18, 2018
    Copy the full SHA
    607c6e7 View commit details

  3. kodiPlugins.yatp: init at 3.3.2

    @oxij @FRidh
    oxij authored and FRidh committed Nov 18, 2018
    Copy the full SHA
    e220331 View commit details

  4. kodiPlugins.exodus: remove 

    No loner exists, I couldn't find an official replacement repo, should be
removed according to
#46196 (comment)
    @oxij @FRidh
    oxij authored and FRidh committed Nov 18, 2018
    Copy the full SHA
    f78835e View commit details
69 changes: 48 additions & 21 deletions pkgs/applications/video/kodi/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
, cmake, kodiPlain, libcec_platform, tinyxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
, python2Packages }:

with stdenv.lib;

@@ -180,26 +181,6 @@ let self = rec {
// (mkController "ps")
// (mkController "snes");

exodus = mkKodiPlugin rec {

plugin = "exodus";
namespace = "plugin.video.exodus";
version = "3.1.13";

src = fetchurl {
url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
};

buildInputs = [ unzip ];

meta = {
description = "A streaming plugin for Kodi";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
};
};

hyper-launcher = let
pname = "hyper-launcher";
version = "1.5.2";
@@ -251,6 +232,25 @@ let self = rec {

};

simpleplugin = mkKodiPlugin rec {
plugin = "simpleplugin";
namespace = "script.module.simpleplugin";
version = "2.3.2";

src = fetchFromGitHub {
owner = "romanvm";
repo = namespace;
rev = "v.${version}";
sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
};

meta = {
homepage = src.meta.homepage;
description = "Simpleplugin API";
license = licenses.gpl3;
};
};

svtplay = mkKodiPlugin rec {

plugin = "svtplay";
@@ -443,4 +443,31 @@ let self = rec {
};
};

yatp = python2Packages.toPythonModule (mkKodiPlugin rec {
plugin = "yatp";
namespace = "plugin.video.yatp";
version = "3.3.2";

src = fetchFromGitHub {
owner = "romanvm";
repo = "kodi.yatp";
rev = "v.${version}";
sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
};

patches = [ ./yatp/dont-monkey.patch ];

propagatedBuildInputs = [
simpleplugin
python2Packages.requests
python2Packages.libtorrentRasterbar
];

meta = {
homepage = src.meta.homepage;
description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
license = licenses.gpl3;
};
});

}; in self
29 changes: 29 additions & 0 deletions pkgs/applications/video/kodi/yatp/dont-monkey.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
index 1adcbb5..488b72c 100644
--- a/plugin.video.yatp/server.py
+++ b/plugin.video.yatp/server.py
@@ -20,24 +20,8 @@ addon = Addon()
_ = addon.initialize_gettext()
addon.log_notice('Starting Torrent Server...')

-# A monkey-patch to set the necessary librorrent version
-librorrent_addon = Addon('script.module.libtorrent')
-orig_custom_version = librorrent_addon.get_setting('custom_version', False)
-orig_set_version = librorrent_addon.get_setting('set_version', False)
-librorrent_addon.set_setting('custom_version', 'true')
-if addon.libtorrent_version == '1.0.9':
- librorrent_addon.set_setting('set_version', '4')
-elif addon.libtorrent_version == '1.1.0':
- librorrent_addon.set_setting('set_version', '5')
-elif addon.libtorrent_version == '1.1.1':
- librorrent_addon.set_setting('set_version', '6')
-else:
- librorrent_addon.set_setting('set_version', '0')
-
from libs.server import wsgi_app

-librorrent_addon.set_setting('custom_version', orig_custom_version)
-librorrent_addon.set_setting('set_version', orig_set_version)
# ======

if addon.enable_limits:
2 changes: 0 additions & 2 deletions pkgs/development/python-modules/requests/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,6 @@ buildPythonPackage rec {
sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
};

outputs = [ "out" "dev" ];

nativeBuildInputs = [ pytest ];
propagatedBuildInputs = [ urllib3 idna chardet certifi ];
# sadly, tests require networking
2 changes: 1 addition & 1 deletion pkgs/development/tools/glslviewer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
libXi libX11
] ++ (with python2Packages; [ python setuptools wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
pythonPath = with python2Packages; [ requests.dev ];
pythonPath = with python2Packages; [ requests ];

# Makefile has /usr/local/bin hard-coded for 'make install'
preConfigure = ''