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

Commits on Nov 5, 2020

  1. oven-media-engine: 0.10.4 -> 0.10.8

    @freezeboy
    freezeboy committed Nov 5, 2020
    Copy the full SHA
    c12f249 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #102930 from freezeboy/update-ome 

    oven-media-engine: 0.10.4 -> 0.10.8
    @SuperSandro2000
    SuperSandro2000 authored Nov 24, 2020

    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
    232f4e0 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/servers/misc/oven-media-engine/default.nix
8 changes: 4 additions & 4 deletions pkgs/servers/misc/oven-media-engine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,28 +12,28 @@
, libopus
, srtp
, jemalloc
, ... }:
}:

let
ffmpeg = ffmpeg_3_4.overrideAttrs (super: {
pname = "${super.pname}-ovenmediaengine";
src = fetchFromGitHub {
owner = "Airensoft";
repo = "FFmpeg";
rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # ome/3.4
rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # on branch ome/3.4
sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11";
};
});
in
stdenv.mkDerivation rec {
pname = "oven-media-engine";
version = "0.10.4";
version = "0.10.8";

src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
sha256 = "15lrlynsldlpa21ryzccf5skgiih6y5fc9qg0bfqh557wnnmml6w";
sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg=";
};

sourceRoot = "source/src";