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: 14dd961b8d5a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 5adf2a6c1164
Choose a head ref
  • 10 commits
  • 4 files changed
  • 6 contributors

Commits on May 9, 2020

  1. freerdp: 2.0.0-rc4 -> 2.0.0 (#84885) 

    * freerdp: 2.0.0-rc4 -> 2.0.0

* freerdp: add Xtst for input in shadow server, libxslt for manpages

* freerdp: nits

(cherry picked from commit 156ee19)
    @lheckemann
    lheckemann committed May 9, 2020
    Copy the full SHA
    ff98026 View commit details
    Browse the repository at this point in the history

  2. freerdp: re-enable tests except for one failing test 

    (cherry picked from commit 8f89b0c)
    @peterhoeg @lheckemann
    peterhoeg authored and lheckemann committed May 9, 2020
    Copy the full SHA
    eb7f580 View commit details
    Browse the repository at this point in the history

  3. freerdp: 2.0.0 -> 2.1.0 

    (cherry picked from commit f29648eca5db4f34b0d9cc159184c8de2a67ca51)

Original PR: #87285
    @lheckemann
    lheckemann committed May 9, 2020
    Copy the full SHA
    7d9eac6 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Merge pull request #87392 from lheckemann/freerdp-backport 

    Freerdp backport
    @peterhoeg
    peterhoeg committed May 11, 2020
    Copy the full SHA
    9399cc7 View commit details
    Browse the repository at this point in the history

  2. nix-direnv: init at 1.0.0

    @DamienCassou @Mic92
    DamienCassou authored and Mic92 committed May 11, 2020
    Copy the full SHA
    cbc4c74 View commit details
    Browse the repository at this point in the history

  3. nix-direnv: add preInstall/postInstall hooks

    @Mic92
    Mic92 committed May 11, 2020
    Copy the full SHA
    067e7ee View commit details
    Browse the repository at this point in the history

  4. nix-direnv: add myself as maintainer

    @Mic92
    Mic92 committed May 11, 2020
    Copy the full SHA
    83e1be8 View commit details
    Browse the repository at this point in the history

  5. vimUtils.vimrcFile: fixes packpath order 

    (cherry picked from commit 5d2ea07)
    @basilgood @maralorn
    basilgood authored and maralorn committed May 11, 2020
    Copy the full SHA
    db204e7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #87584 from Mic92/nix-direnv

    @Mic92
    Mic92 committed May 11, 2020
    Copy the full SHA
    5899332 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #87543 from maralorn/fix-vim-plugin-order

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