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: 365ca1112115
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: e64b2be53c85
Choose a head ref
  • 15 commits
  • 18 files changed
  • 9 contributors

Commits on Mar 26, 2020

  1. emacs-modes: build MELPA package sets without null packages

    The current algorithm creates attributes with null values for packages
    with no source in a variant of MELPA. Though will satify dependencies
    they produce no files, and though a build that transitively depends on
    one them will be successful, Emacs won't find them and any code
    depending on them won't work.
    
    The solution with minimal code change would have been filtering the
    list of results from melpaDerivation by comparing the value against
    null, but that leads to an infinite recursion.
    
    This commit also moves legacy renames from the shared to the unstable
    set, as the corresponding null value elements won't exist in the
    stable set anymore.
    
    The test used for the problem was:
    
      $ nix-build --show-trace ./default.nix -A emacs26Packages.melpaStablePackages.findr
      error: expression does not evaluate to a derivation (or a set or list of those)
    
    The expected output, obtained with this commit is:
    
      $ nix-build --show-trace ./default.nix -A emacs26Packages.melpaStablePackages.findr
      error: attribute 'findr' in selection path 'emacs26Packages.melpaStablePackages.findr' not found
    Servilio Afre Puentes committed Mar 26, 2020
    Copy the full SHA
    b2c8626 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. nixos/gitlab: Fix services.gitlab.enableStartTLSAuto

    'toString false' results in an empty string, which, in this context,
    is a syntax error. Use boolToString instead.
    
    Fixes #86160
    
    (cherry picked from commit c0a838d)
    talyz committed Apr 28, 2020
    Copy the full SHA
    5a52738 View commit details
    Browse the repository at this point in the history
  2. signal-desktop: 1.33.3 -> 1.33.4

    (cherry picked from commit 660d284)
    primeos committed Apr 28, 2020
    Copy the full SHA
    24202c0 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #86190 from talyz/release-20.03

    [20.03] nixos/gitlab: Fix services.gitlab.enableStartTLSAuto
    talyz committed Apr 28, 2020
    Copy the full SHA
    ac29e16 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #86199 from primeos/signal-desktop-backport

    [20.03] signal-desktop: 1.33.3 -> 1.33.4 (backport)
    primeos committed Apr 28, 2020
    Copy the full SHA
    fc30d6f View commit details
    Browse the repository at this point in the history
  5. gitlab: 12.8.8 -> 12.8.9

    flokli authored and Milan Pässler committed Apr 28, 2020
    Copy the full SHA
    9153c23 View commit details
    Browse the repository at this point in the history
  6. libmicrodns: 0.1.0 -> 0.1.2

    - CVE-2020-6071
    - CVE-2020-6072
    - CVE-2020-6073
    - CVE-2020-6077
    - CVE-2020-6078
    - CVE-2020-6079
    
    Buildsystem switched to Meson+Ninja.
    
    (cherry picked from commit 18f3661)
    mmilata authored and Mic92 committed Apr 28, 2020
    Copy the full SHA
    1d8a149 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #86213 from afrepues/build-melpa-stable-with-no-nu…

    …ll-pkgs
    
    emacs-modes: build MELPA package sets without null packages
    adisbladis committed Apr 28, 2020
    Copy the full SHA
    2437cd6 View commit details
    Browse the repository at this point in the history
  8. gitlab: support passing --rev to the update-all script

    While it's already possible to invoke `update-data` with the `--rev`
    argument, one still needs to run all later phases manually.
    
    Fix this, by having `update-all` also accept a `--rev` argument, and
    pass it down to `update-data`.
    
    Also, make the help text a bit more usable, by suggesting the usual
    versioning scheme used these times.
    
    (cherry picked from commit 191c2c67a409ae8cf3d3bee7811a7b10397efe81)
    flokli committed Apr 28, 2020
    Copy the full SHA
    c69934e View commit details
    Browse the repository at this point in the history
  9. gitlab-workhorse: 8.21.1 -> 8.21.2

    (cherry picked from commit f7ddd30bef15238d6d9a12f48408d38571944d85)
    flokli committed Apr 28, 2020
    Copy the full SHA
    0364b92 View commit details
    Browse the repository at this point in the history
  10. gitaly: 12.8.8 -> 12.8.9

    (cherry picked from commit c86c77be0cf45023586e7252bfb05238ae6d38db)
    flokli committed Apr 28, 2020
    Copy the full SHA
    e265095 View commit details
    Browse the repository at this point in the history
  11. gitlab: update.py: invoke bundle lock manually

    `bundix -l` doesn't work, as it treats bundler's warning about upgrading
    the lockfile version as an error, so invoke `bundle lock` manually.
    
    (cherry picked from commit c7d47ce06fba88341e2d072379013414be4ee2e1)
    manveru authored and flokli committed Apr 28, 2020
    Copy the full SHA
    e97d89f View commit details
    Browse the repository at this point in the history
  12. pantheon.switchboard-plug-pantheon-shell: 2.8.3 -> 2.8.4

    (cherry picked from commit 9d73d28)
    worldofpeace committed Apr 28, 2020
    Copy the full SHA
    657c31e View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    a5b5cb8 View commit details
    Browse the repository at this point in the history
  14. kde/{kate,konqueror,okular}: decrease text mimetype preference

    These .desktop files set InitialPreference>1 which will override other
    associations even the .desktop appears first in XDG_DATA_DIRS. This
    applies to:
    
    - org.kde.kate.desktop
    - org.kde.kwrite.desktop
    - kfmclient_html.desktop
    - okularApplication_txt.desktop
    
    Fixes #86137
    
    (cherry picked from commit b3f8126)
    matthewbauer authored and worldofpeace committed Apr 28, 2020
    Copy the full SHA
    e64b2be View commit details
    Browse the repository at this point in the history