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: edd58cf4a7b3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: a68f099e182c
Choose a head ref
  • 3 commits
  • 4 files changed
  • 3 contributors

Commits on Apr 16, 2020

  1. [20.03] flashplayer: 32.0.0.330 -> 32.0.0.363

    (cherry picked from commit ac374d41c816f7365a3945e657d2beba3962587d)
    
    Backported 32.0.0.363 to release 20.03 for important bug fixes.
    
    Also needed because old upstream release is no longer available.
    taku0 authored and tollb committed Apr 16, 2020
    Copy the full SHA
    23f3371 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. st: copy config file in 'prePatch' instead of 'preBuild'

    The patch phase runs after the build phase. Which means than when
    using an override to override both 'conf' and 'patches' to provide
    a custom config file and apply some patches, it doesn't work:
    - first the patches applied (optionally changing config.def.h)
    - then preBuild is run which overrides config.def.h with the user
    supplied one (effectively cancelling previously applied patches)
    
    By copying the config file in the prePatch phase instead, changes
    are kept and applied in order.
    
    (cherry picked from commit b584941)
    nschoe authored and Mic92 committed Apr 17, 2020
    Copy the full SHA
    a96fbaa View commit details
    Browse the repository at this point in the history
  2. Merge pull request #85395 from tollb/flashplayer-32.0.0.363-release-2…

    …0.03
    
    [20.03] flashplayer: 32.0.0.330 -> 32.0.0.363
    worldofpeace committed Apr 17, 2020
    Copy the full SHA
    a68f099 View commit details
    Browse the repository at this point in the history