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
base: 388ed4e09f3b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 16fd4233de22
Choose a head ref
  • 16 commits
  • 24 files changed
  • 8 contributors

Commits on Dec 16, 2020

  1. Copy the full SHA
    4ec0946 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2020

  1. asciidoctor: add revealjs support

    This allows creating HTML presentations with
    `asciidoctor-revealjs presentation.adoc`.
    
    NOTE: The generated HTML file implicitly depend on reveal.js (and I see
    no good way to bundle it with Nix). Either provide reveal.js in a local
    path next to the generated HTML file[1], or override the revealjsdir
    attribute, for example by pointing to an URL (can also be a path):
    
      asciidoctor-revealjs -a revealjsdir=https://cdn.jsdelivr.net/npm/reveal.js@3.9.2 presentation.adoc
    
    Implementation details:
    1. Added "gem 'asciidoctor-revealjs'" to the Gemfile.
    2. Ran "nix-shell -p bundler --run 'bundle lock --update'"
       from pkgs/tools/typesetting/asciidoctor/.
    3. Hand edited Gemfile.lock to remove all but the asciidoctor-revealjs
       changes. (Rationale: allow backporting to release-20.09.)
    4. Finish off with "nix-shell -p bundix --run 'bundix'".
    
    [1] Of course Nix can help with _that_, but that's external to the
    asciidoctor-revealjs program.
    
    (cherry picked from commit 8f13d3c)
    bjornfor committed Dec 21, 2020
    Copy the full SHA
    79c739c View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2020

  1. qt-5: 5.15.0 -> 5.15.2

    This is a maintenance release of the Qt 5.15 release series. It focuses on
    bug and security fixes. The feature that made me update this package was
    the broken u2f support in QtWebEngine when used together with
    Qutebrowser. It previously (on older Qt versions) used to work but
    stopped working with the switch to 5.15.
    
    As the changelog is rather extensive the reader is advised to inspect
    [0] to checkout the changes to each of the components of their
    interest.
    
    This also fixes a security issue with QtWebEngine based browsers that
    could be crashed by visiting a website that invokes certain WebRTC
    features [1].
    
    [0] https://wiki.qt.io/Qt_5.15.2_Change_Files
    [1] https://bugreports.qt.io/browse/QTBUG-86752
    
    (cherry picked from commit dd6446e)
    andir authored and ttuegel committed Dec 27, 2020
    Copy the full SHA
    175634d View commit details
    Browse the repository at this point in the history
  2. kdeFrameworks.kpurpose: add patch required with Qt5 5.15.2

    Qt 5.15 carried a change that renamed a getter for the socket error. In
    a later relase that change was reverted (to be less ambiguous) thus now
     those that had picked up the change in API had to change their code.
     This has now been reverted [0] and thus the consumers also have to
     revert their changes…
    
    [0] https://codereview.qt-project.org/c/qt/qtbase/+/289693
    
    (cherry picked from commit 5af26a1)
    andir authored and ttuegel committed Dec 27, 2020
    Copy the full SHA
    6bea8bc View commit details
    Browse the repository at this point in the history
  3. pyqt: 5.15.1 -> 5.15.2

    This keeps the PyQt5 version in sync with the Qt release. While it is
    apparently not strictly required it is probably not the worst idea to do
    this.
    
    (cherry picked from commit a15b4c6)
    andir authored and ttuegel committed Dec 27, 2020
    Copy the full SHA
    7d2fdb4 View commit details
    Browse the repository at this point in the history
  4. qt515: fix on darwin after bump to 5.15.2

    (cherry picked from commit 2a46e71)
    veprbl authored and ttuegel committed Dec 27, 2020
    Copy the full SHA
    1d0c87b View commit details
    Browse the repository at this point in the history
  5. freecad: patch for Qt 5.15

    ttuegel committed Dec 27, 2020
    Copy the full SHA
    31e4005 View commit details
    Browse the repository at this point in the history
  6. kaddressbook: patch for Qt 5.15.2

    (cherry picked from commit 3ade461)
    ttuegel committed Dec 27, 2020
    Copy the full SHA
    019af76 View commit details
    Browse the repository at this point in the history
  7. calendarsupport: patch for Qt 5.15.2

    (cherry picked from commit 672e363)
    ttuegel committed Dec 27, 2020
    Copy the full SHA
    2624a17 View commit details
    Browse the repository at this point in the history
  8. kompare: fix build with patch

    Obsolete methods were still in use when 20.08 was released.
    This patch ports away from them.
    
    (cherry picked from commit cd8b364)
    FRidh authored and ttuegel committed Dec 27, 2020
    Copy the full SHA
    b926fa4 View commit details
    Browse the repository at this point in the history
  9. Revert "freecad: patch for Qt 5.15"

    This reverts commit 8652352.
    ttuegel committed Dec 27, 2020
    Copy the full SHA
    64ebb54 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #106981 from lsix/fix-gdb-crash

    [20.09] gdb: Fix crash when exiting TUI with gdb -tui
    lsix committed Dec 27, 2020
    Copy the full SHA
    5bcf142 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #107713 from ttuegel/staging-20.09--qt-5.15.2

    [20.09] Qt 5.15.2
    ttuegel committed Dec 27, 2020
    Copy the full SHA
    4cd4cfc View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2021

  1. nss_latest: 3.59 -> 3.60

    (cherry-picked from 22cd16f, basically)
    Firefox 84.0.1 will require >= 3.59.1
    vcunat committed Jan 1, 2021
    Copy the full SHA
    c5524d6 View commit details
    Browse the repository at this point in the history
  2. Merge #107603: firefox*: 84.0 -> 84.0.1

    (cherry picked from commit 85c8f75)
    vcunat committed Jan 1, 2021
    Copy the full SHA
    dfc86e4 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    16fd423 View commit details
    Browse the repository at this point in the history