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

Commits on May 10, 2017

  1. {lib}mediainfo{-gui}: 0.7.91 -> 0.7.95

    koral committed May 10, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6fedc9c View commit details

Commits on May 11, 2017

  1. Merge pull request #25688 from k0ral/mediainfo 

    {lib}mediainfo{-gui}: 0.7.91 -> 0.7.95
    @Mic92
    Mic92 authored May 11, 2017
    Copy the full SHA
    b22c629 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/mediainfo-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@
, desktop_file_utils, libSM, imagemagick }:

stdenv.mkDerivation rec {
version = "0.7.91";
version = "0.7.95";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/mediainfo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:

stdenv.mkDerivation rec {
version = "0.7.91";
version = "0.7.95";
name = "mediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libmediainfo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:

stdenv.mkDerivation rec {
version = "0.7.91";
version = "0.7.95";
name = "libmediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "1h39cwd85rgidr0hbwab9dwbjv25xhvjv8y2nv35p3fwrs48p098";
sha256 = "0snrcashc5c5gcwvfh7sl7z4h523d8vxbfin3gb6g81zv43d2b23";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];