Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 0f50b680bc3f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: de0f3b9366bb
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 11, 2019

  1. Merge ffmpeg-full: nvenc doesn't imply nonfree licensing

    It's a port of #55442 to master.
    
    (cherry picked from commit b1565e5)
    vcunat committed May 11, 2019
    Copy the full SHA
    8ce6566 View commit details
    Browse the repository at this point in the history
  2. ffmpeg-full: fix the build phase

    I was surprised the build is so slow, and I see it's single-threaded
    due to all work being done in install phase :-/
    Please, do *not* rewrite phases unless you're really confident it's
    a good approach; typically postFoo and preFoo is much better.
    
    I considered filing this ffmpeg-related string of changes as a PR,
    but in the end it doesn't seem likely to need review and we have too
    many PRs as it is...
    
    (cherry picked from commit 5236232)
    vcunat committed May 11, 2019
    Copy the full SHA
    2c3fe2d View commit details
    Browse the repository at this point in the history
  3. Merge #60740: ffmpeg*: 4.1.x -> 4.1.3

    (cherry picked from commit 58213cd)
    vcunat committed May 11, 2019
    Copy the full SHA
    de0f3b9 View commit details
    Browse the repository at this point in the history