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

Commits on Apr 17, 2020

  1. vapoursynth: R48 -> R49

    @rnhmjoj
    rnhmjoj committed Apr 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    peterromfeldhk Peter Romfeld
    GPG key ID: D10E6F3F15306D73
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c339130 View commit details

  2. Merge pull request #85431 from rnhmjoj/vapoursynth 

    vapoursynth: R48 -> R49
    @rnhmjoj
    rnhmjoj authored Apr 17, 2020
    Copy the full SHA
    8afc0da View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/libraries/vapoursynth/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/libraries/vapoursynth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper
, zimg, libass, python3, libiconv
, ApplicationServices, nasm
, ApplicationServices
, ocrSupport ? false, tesseract ? null
, imwriSupport? true, imagemagick7 ? null
}:
@@ -12,16 +12,16 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "R48";
version = "R49";

src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
sha256 = "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih";
sha256 = "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl";
};

nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ];
nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ];
buildInputs = [
zimg libass
(python3.withPackages (ps: with ps; [ sphinx cython ]))