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: ba7a81a0f38f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: f761c14fd2f1
Choose a head ref
  • 9 commits
  • 7 files changed
  • 8 contributors

Commits on Jun 19, 2020

  1. python3Packages.zconfig: unmark as broken

    @KamilaBorowska
    KamilaBorowska committed Jun 19, 2020
    Copy the full SHA
    e595905 View commit details
    Browse the repository at this point in the history

  2. python3Packages.zodb: unmark as broken

    @KamilaBorowska
    KamilaBorowska committed Jun 19, 2020
    Copy the full SHA
    f499b39 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. owncloud-client: add libsecret dependency 

    The libsecret dependency is required to access secrets from the gnome keychain.

(cherry picked from commit cf0552d)
    @fabianhauser @bjornfor
    fabianhauser authored and bjornfor committed Jul 2, 2020
    Copy the full SHA
    4d9dcce View commit details
    Browse the repository at this point in the history

  2. matrix-synapse: 1.15.1 -> 1.15.2 [security] 

    (cherry picked from commit e5c4f37)
    @tokudan
    tokudan committed Jul 2, 2020
    Copy the full SHA
    8365941 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #92101 from tokudan/2003-synapse-1152 

    matrix-synapse: 1.15.1 -> 1.15.2 [security]
    @Ma27
    Ma27 committed Jul 2, 2020
    Copy the full SHA
    de02ce9 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Merge pull request #91099 from xfix/vulnix-unbreak 

    [20.03] Unbreak zconfig and zodb
    Christian Kauhaus committed Jul 3, 2020
    Copy the full SHA
    d6260a3 View commit details
    Browse the repository at this point in the history

  2. postfix: 3.4.13 -> 3.4.14 (#91772)

    @dotlambda
    dotlambda committed Jul 3, 2020
    Copy the full SHA
    e497cff View commit details
    Browse the repository at this point in the history

  3. graylog: 3.3.1 -> 3.3.2 

    (cherry picked from commit dcf2033)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Jul 3, 2020
    Copy the full SHA
    c2eca91 View commit details
    Browse the repository at this point in the history

  4. nixos/test-driver: Specify /bin/sh shell when running a bourne shell … 

    …script as the user

(cherry picked from commit 751a270)

Reason: Back-porting this straight-forward fix is the best way to
allow tests affected by this user-shell problem to run in 20.03.
There isn't a great override point to apply just this fix.  Copy/pasting
testing-python.nix just to specify a new test-driver.py isn't great --
it would cut off receiving any other fixes in the testing infrastructure
until 20.09.  A 20.03 system using testing-python.nix from the unstable
branch and then passing 20.03's pkgs in to avoid getting unstable's
pkgs is quite a bit of configuration to expect from clients and seems
fragile against future changes in the unstable branch that expect pkgs
to be mostly in-sync with the test driver.  Both of these not-great
options leave a bunch of "TODO: Remove after 20.09" junk in clients'
configs & make that upgrade harder.
    @chkno
    chkno authored and Jon committed Jul 3, 2020
    Copy the full SHA
    f761c14 View commit details
    Browse the repository at this point in the history