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: ba56744abdd9
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 19cb786b9aa9
Choose a head ref
  • 16 commits
  • 16 files changed
  • 6 contributors

Commits on Apr 22, 2019

  1. automysqlinit: init at 3.0_rc6 

    (cherry picked from commit 5f4df8e)
    @aanderse
    aanderse committed Apr 22, 2019
    Copy the full SHA
    dba66e2 View commit details
    Browse the repository at this point in the history

  2. perl: add .withPackages 

    (cherry picked from commit 03eaa48)
    @samueldr
    volth authored and samueldr committed Apr 22, 2019
    Copy the full SHA
    246f5a5 View commit details
    Browse the repository at this point in the history

  3. perl.pkgs.Encode: fix buildEnv collision with perl 

    fix NixOS/nixpkgs#59215 (comment)

(cherry picked from commit f73eb61)
    @samueldr
    volth authored and samueldr committed Apr 22, 2019
    Copy the full SHA
    a13cab4 View commit details
    Browse the repository at this point in the history

  4. perl.pkgs.Encode: fix typo 

    (cherry picked from commit d23ff47)
    @samueldr
    volth authored and samueldr committed Apr 22, 2019
    Copy the full SHA
    0b42d3c View commit details
    Browse the repository at this point in the history

  5. perl.meta.priority += 1 

    give priority to perl libraries when they meet the perl derivation in `buildEnv`.

The notable case is `buildEnv` inside `perl.withPackages`.

The `perl' derivation includes obsolete versions of some CPAN packages
which leads to collissions when there are newer versions
of the same libraries are on the right hand side
of `perl.withPackages` (perhaps indirectly).

Fixes #60025

(cherry picked from commit 0fad0b4)
    @samueldr
    volth authored and samueldr committed Apr 22, 2019
    Copy the full SHA
    32be67f View commit details
    Browse the repository at this point in the history

  6. perl: add missing 'self' reference to perldevel

    @aanderse
    aanderse committed Apr 22, 2019
    Copy the full SHA
    5dd001a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #60033 from aanderse/automysqlbackup-backport 

    automysqlinit: init at 3.0_rc6 (19.03 backport)
    @infinisil
    infinisil committed Apr 22, 2019
    Copy the full SHA
    c19fad4 View commit details
    Browse the repository at this point in the history

  8. libplist: 2018-07-25 -> 2019-01-20 

    (cherry picked from commit 7634357)
    @dtzWill @worldofpeace
    dtzWill authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    5b080ed View commit details
    Browse the repository at this point in the history

  9. libusbmuxd: 2018-07-23 -> 2019-01-18 

    (cherry picked from commit 668f759)
    @dtzWill @worldofpeace
    dtzWill authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    b4a42a9 View commit details
    Browse the repository at this point in the history

  10. libplist 2019-01-20 -> 2019-04-04 

    (cherry picked from commit 2013c91)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    9956d1c View commit details
    Browse the repository at this point in the history

  11. libusbmuxd: 2019-01-18 -> 2019-03-23 

    (cherry picked from commit dd03b21)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    ece4bde View commit details
    Browse the repository at this point in the history

  12. libimobiledevice: 2018-07-24 -> 2019-04-04 

    (cherry picked from commit 173e960)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    155513d View commit details
    Browse the repository at this point in the history

  13. usbmuxd: 2018-10-10 -> 2019-03-05 

    (cherry picked from commit 71c1b44)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    4274fae View commit details
    Browse the repository at this point in the history

  14. ifuse: 1.1.3 -> 2018-10-08 

    Switching to latest master, as there hasn't been a new release in a
while, see libimobiledevice/ifuse#34

(cherry picked from commit 8d5252b)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    e45f427 View commit details
    Browse the repository at this point in the history

  15. ideviceinstaller: 2018-06-01 -> 2018-10-01 

    (cherry picked from commit 768e9b1)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Apr 22, 2019
    Copy the full SHA
    ae8b274 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #60037 from samueldr/backport/nixpkgs-59215 

    Backport perl: add .withPackages #59215 #60028
    @samueldr
    samueldr committed Apr 22, 2019
    Copy the full SHA
    19cb786 View commit details
    Browse the repository at this point in the history