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

Commits on Mar 24, 2019

  1. kodi: 18.0 -> 18.1 

    Also updated its bundled ffmpeg for a bugfix.

(cherry picked from commit cd0f037)
    @cpages
    cpages committed Mar 24, 2019
    Copy the full SHA
    fe9abc4 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/applications/video/kodi/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/video/kodi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,14 +44,14 @@ assert vdpauSupport -> libvdpau != null;

let
kodiReleaseDate = "20190129";
kodiVersion = "18.0";
kodiVersion = "18.1";
rel = "Leia";

kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg";
sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc";
};

kodiDependency = { name, version, rev, sha256, ... } @attrs:
@@ -70,8 +70,8 @@ let
ffmpeg = kodiDependency rec {
name = "FFmpeg";
version = "4.0.3";
rev = "${version}-${rel}-RC5";
sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx";
rev = "${version}-${rel}-18.2";
sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';