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

Commits on Nov 19, 2018

  1. makemkv: 1.12.3 -> 1.14.0 

    Changes: https://www.makemkv.com/download/history.html

Since this derivation only support Linux on x86_64, set the platform
meta data accordingly.

(cherry picked from commit f528731)
    @danieldk @nyanloutre
    danieldk authored and nyanloutre committed Nov 19, 2018
    Copy the full SHA
    3aca7b8 View commit details

  2. makemkv: 1.14.0 -> 1.14.1 

    (cherry picked from commit 30bc36c)
    @nyanloutre
    nyanloutre committed Nov 19, 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
    9071b93 View commit details

Commits on Nov 20, 2018

  1. makemkv: using two URLs for src 

    This will prevent future failures due to the first URL being broken each
time a new version is released

See #50437 (comment)
for details

(cherry picked from commit 05166dc)
    @nyanloutre
    nyanloutre committed Nov 20, 2018
    Copy the full SHA
    e24bc96 View commit details

  2. Merge pull request #50698 from nyanloutre/makemkv-update-18.09 

    [18.09] makemkv: 1.12.3 -> 1.14.1
    @c0bw3b
    c0bw3b authored Nov 20, 2018
    Copy the full SHA
    9feb8b7 View commit details
Showing with 13 additions and 5 deletions.
  1. +13 −5 pkgs/applications/video/makemkv/default.nix
18 changes: 13 additions & 5 deletions pkgs/applications/video/makemkv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,24 @@

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

# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "0rggpzp7gp4y6gxnhl4saxpdwnaivwkildpwbjjh7zvmgka3749a";
urls = [
"http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz"
];
sha256 = "1n4gjb1531gkvnjzipw63v3zdxmrq5nai9nn6m2ix3lskksjrrhp";
};

src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "1w0l2rq9gyzli5ilw82v27d8v7fmchc1wdzcq06q1bsm9wmnbx1r";
urls = [
"http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz"
];
sha256 = "0ysb0nm11vp2ni838p5q3gqan5nrqbr7rz0h24j8p62827pib3pw";
};

nativeBuildInputs = [ pkgconfig ];
@@ -36,6 +43,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.unfree;
homepage = http://makemkv.com;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.titanous ];
};
}