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

Commits on Nov 7, 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.
    @danieldk
    danieldk committed Nov 7, 2018
    Copy the full SHA
    f528731 View commit details

  2. Merge pull request #49878 from danieldk/makemkv-1.14.0 

    makemkv: 1.12.3 -> 1.14.0
    @dywedir
    dywedir authored Nov 7, 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
    d570506 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/video/makemkv/default.nix
7 changes: 4 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.12.3";
ver = "1.14.0";
builder = ./builder.sh;

src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "0rggpzp7gp4y6gxnhl4saxpdwnaivwkildpwbjjh7zvmgka3749a";
sha256 = "1xm5pww6jf3m704y7d7nc2ni2a6ygxwb2c665agg2i059sppwz1f";
};

src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "1w0l2rq9gyzli5ilw82v27d8v7fmchc1wdzcq06q1bsm9wmnbx1r";
sha256 = "1ihma2nv7zgqx1psgj3bdz723h94f4vk8mbahxl1v4v2rn9kg25z";
};

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