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: 41add65fb902
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 1517b764c29a
Choose a head ref
  • 7 commits
  • 4 files changed
  • 4 contributors

Commits on Jun 24, 2020

  1. mp4v2: 2.0.0 -> 4.1.3 

    Switch into maintanable fork. It is the community central fork.

Remove old patch, use new minor upstream patch to compile.

I weighted-in on the patch reasoning to be merged.

Strictify hardening.

Documentation update

M  pkgs/development/libraries/mp4v2/default.nix

(cherry picked from commit c281c84)
    @Anton-Latukha @danieldk
    Anton-Latukha authored and danieldk committed Jun 24, 2020
    Copy the full SHA
    78e2687 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Merge pull request #91402 from danieldk/mp4v2 

    [20.03] mp4v2: 2.0.0 -> 4.1.3
    Christian Kauhaus committed Jun 25, 2020
    Copy the full SHA
    3dbed61 View commit details
    Browse the repository at this point in the history

  2. php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7 

    Security and bugfix updates for PHP.

Fixes #88380, #88379, #90939, #90921, #90924, #88382

See #91495 for PR against master.
    Christian Kauhaus committed Jun 25, 2020
    Copy the full SHA
    6da23f1 View commit details
    Browse the repository at this point in the history

  3. linux: 5.4.48 -> 5.4.49 

    (cherry picked from commit 5d807cc)
    @NeQuissimus
    NeQuissimus committed Jun 25, 2020
    Copy the full SHA
    b879e5a View commit details
    Browse the repository at this point in the history

  4. linux: 5.7.4 -> 5.7.5 

    (cherry picked from commit c4a784b)
    @NeQuissimus
    NeQuissimus committed Jun 25, 2020
    Copy the full SHA
    c1f9fb3 View commit details
    Browse the repository at this point in the history

  5. linux: 5.7.5 -> 5.7.6 

    (cherry picked from commit 06f0a0f)
    @NeQuissimus
    NeQuissimus committed Jun 25, 2020
    Copy the full SHA
    46c4fbd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #91496 from ckauhaus/secfix-php-20.03 

    [20.03] php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
    @Ma27
    Ma27 committed Jun 25, 2020
    Copy the full SHA
    1517b76 View commit details
    Browse the repository at this point in the history