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: ae2bdf2c1bd4
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: dcb64ea42e64
Choose a head ref
  • 15 commits
  • 19 files changed
  • 10 contributors

Commits on Jun 4, 2020

  1. Bump minver.nix to 2.2 

    Note: NixOS 19.03 had Nix 2.2 and 19.09 had 2.3.
    @edolstra
    edolstra committed Jun 4, 2020
    Copy the full SHA
    8f9e4be View commit details
    Browse the repository at this point in the history

  2. Don't enable nix-bash-completions when using Nix 2.4 

    2.4 has its own completion script which collides with
nix-bash-completions.
    @edolstra
    edolstra committed Jun 4, 2020
    Copy the full SHA
    bbfc473 View commit details
    Browse the repository at this point in the history

  3. nixos/buildbot-master: fix typo in services.buildbot-master.bpPort 

    It's pbPort, and it's also a connection string, meaning
listen-on-localhost is also possible. Provide an alias for the old
option name, so old configs still work.
    @flokli
    flokli committed Jun 4, 2020
    Copy the full SHA
    1fd972b View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. ocamlPackages.custom_printf: remove at 112.24.00 

    This is a legacy package for OCaml 4.02

custom_printf is deprecated, use ppx_custom_printf instead
    @vbgl
    vbgl committed Jun 5, 2020
    Copy the full SHA
    c9057b3 View commit details
    Browse the repository at this point in the history

  2. cgmanager: remove 

    fixes #30023
    @Mic92
    Mic92 committed Jun 5, 2020
    Copy the full SHA
    073d2fc View commit details
    Browse the repository at this point in the history

  3. buildRustPackage: add documentation on how to create cargo.lock patches

    @Mic92
    Mic92 committed Jun 5, 2020
    Copy the full SHA
    f039657 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #89510 from flokli/buildbot-pbPort 

    nixos/buildbot-master: fix typo in services.buildbot-master.bpPort
    @flokli
    flokli committed Jun 5, 2020
    Copy the full SHA
    c055fc0 View commit details
    Browse the repository at this point in the history

  5. pythonmagick -> python2.pkgs.pythonmagick 

    Python bindings should be in python-packages.nix.
    @FRidh
    FRidh committed Jun 5, 2020
    Copy the full SHA
    a4ed97d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #89523 from Mic92/rust-docs 

    buildRustPackage: add documentation on how to create cargo.lock patches
    @Mic92
    Mic92 committed Jun 5, 2020
    Copy the full SHA
    685f06c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #89525 from Mic92/cgmanager

    @Mic92
    Mic92 committed Jun 5, 2020
    Copy the full SHA
    abb2f60 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #89476 from edolstra/bump-minver 

    Bump minver.nix to 2.2
    @edolstra
    edolstra committed Jun 5, 2020
    Copy the full SHA
    9679531 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #89479 from edolstra/nix-2.4-completion 

    Don't enable nix-bash-completions when using Nix 2.4
    @edolstra
    edolstra committed Jun 5, 2020
    Copy the full SHA
    b00463d View commit details
    Browse the repository at this point in the history

  10. atlassian-confluence: 7.5.0 -> 7.5.1

    @WilliButz
    WilliButz committed Jun 5, 2020
    Copy the full SHA
    0f2d9bb View commit details
    Browse the repository at this point in the history

  11. xdg-desktop-portal-wlr: init at 0.1.0 (#83485) 

    * xdg-desktop-portal-wlr: init at 2020-03-13

* xdg-desktop-portal-wlr: 2020-03-13 -> 0.1.0

Co-authored-by: zimbatm <zimbatm@zimbatm.com>
    @minijackson @zimbatm
    minijackson and zimbatm committed Jun 5, 2020
    Copy the full SHA
    f16f0c2 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #89537 from WilliButz/update/atlassian-confluence/… 

    …7.5.1

atlassian-confluence: 7.5.0 -> 7.5.1
    @lheckemann
    lheckemann committed Jun 5, 2020
    Copy the full SHA
    dcb64ea View commit details
    Browse the repository at this point in the history