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

Commits on Jul 2, 2017

  1. makemkv: 1.10.5 -> 1.10.6

    @LutzCle
    LutzCle committed Jul 2, 2017
    Copy the full SHA
    4c1ecbb View commit details

Commits on Jul 3, 2017

  1. Merge pull request #27064 from LutzCle/master 

    makemkv: 1.10.5 -> 1.10.6
    @Mic92
    Mic92 authored Jul 3, 2017
    Copy the full SHA
    64f922b View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/video/makemkv/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/video/makemkv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@

stdenv.mkDerivation rec {
name = "makemkv-${ver}";
ver = "1.10.5";
ver = "1.10.6";
builder = ./builder.sh;

src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "00jym62yga4m146lbz6dwdy6rgrwbc0kgmpcarri0prdwjsb8l6x";
sha256 = "99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3";
};

src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "0kanj0mh09sn5wlc4jl5ykbhdq1kpwjhmh1ck990dhkxb2m3rvaa";
sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235";
};

buildInputs = [openssl qt4 mesa zlib pkgconfig libav];