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

Commits on Mar 26, 2019

  1. libebml: 1.3.6 -> 1.3.7

    @dtzWill
    dtzWill committed Mar 26, 2019
    Copy the full SHA
    7dfd5f4 View commit details

  2. libmatroska: 1.4.9 -> 1.5.0

    @dtzWill
    dtzWill committed Mar 26, 2019
    Copy the full SHA
    7871e7c View commit details

  3. mkvtoolnix: 31.0.0 -> 32.0.0 

    https://gitlab.com/mbunkus/mkvtoolnix/blob/release-32.0.0/NEWS.md
    @dtzWill
    dtzWill committed Mar 26, 2019
    Copy the full SHA
    74b76c1 View commit details

Commits on Mar 27, 2019

  1. Merge pull request #58371 from dtzWill/update/mkv-32 

    mkvtoolnix,libmatroska,libebml: updates
    @dtzWill
    dtzWill authored Mar 27, 2019
    Copy the full SHA
    7bdbdd2 View commit details
Showing with 9 additions and 9 deletions.
  1. +3 −3 pkgs/applications/video/mkvtoolnix/default.nix
  2. +3 −3 pkgs/development/libraries/libebml/default.nix
  3. +3 −3 pkgs/development/libraries/libmatroska/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/video/mkvtoolnix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,14 +11,14 @@ assert withGUI -> qtbase != null && qtmultimedia != null;
with stdenv.lib;

stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
version = "31.0.0";
pname = "mkvtoolnix";
version = "32.0.0";

src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh";
sha256 = "022mmgm0a6qxybjrygisg731sg9m9d8svd0mxr77wfknwa7m09c9";
};

nativeBuildInputs = [
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libebml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:

stdenv.mkDerivation rec {
name = "libebml-${version}";
version = "1.3.6";
pname = "libebml";
version = "1.3.7";

src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libebml";
rev = "release-${version}";
sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs";
sha256 = "0pdfl83nbbdddbxajx34srg4mcfcz8ca21qyvlnpw81hfnrhmjkv";
};

nativeBuildInputs = [ cmake pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libmatroska/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, libebml }:

stdenv.mkDerivation rec {
name = "libmatroska-${version}";
version = "1.4.9";
pname = "libmatroska";
version = "1.5.0";

src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libmatroska";
rev = "release-${version}";
sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86";
sha256 = "01kp48ih9pqkm518ylbxicjmknqvb3njb71il2h2wa37whsaals8";
};

nativeBuildInputs = [ cmake pkgconfig ];