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

Commits on Feb 21, 2020

  1. maven: make jdk overridable 

    This makes it possible to use maven with different (newer) jdks.

Fixes #75630

(cherry picked from commit 0141cfe)
    @timokau
    timokau committed Feb 21, 2020
    Copy the full SHA
    b56f8c3 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. pythonPackages.sfepy: 2019.2 -> 2019.4 

     - Bump the version number to fix incompatibility with Numpy 1.18.1
 - Remove broken test to fix incompatibility with Numpy 1.18.1
    @wd15
    wd15 committed Feb 25, 2020
    Copy the full SHA
    f6fa019 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. nodePackages.parsoid: init at 0.11.0 

    (not-really-cherry-picked from commit 9264a0f)
    @mmilata
    mmilata committed Feb 27, 2020
    Copy the full SHA
    e83edde View commit details
    Browse the repository at this point in the history

  2. nixos/parsoid: fix package name 

    Original package was removed in 2b8cde0.

(cherry picked from commit 3b27f4d)
    @mmilata
    mmilata committed Feb 27, 2020
    Copy the full SHA
    c83c446 View commit details
    Browse the repository at this point in the history

  3. nixos/parsoid: enable systemd sandboxing 

    (cherry picked from commit 9b0a957)
    @mmilata
    mmilata committed Feb 27, 2020
    Copy the full SHA
    a65ea62 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #81022 from mmilata/parsoid-20.03 

    [20.03] nixos/parsoid: fix service by reinstating nodePackages.parsoid
    @Mic92
    Mic92 committed Feb 27, 2020
    Copy the full SHA
    287e7f9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #80735 from timokau/maven-jdk-overridable-20.09 

    [20.03] maven: make jdk overridable
    @timokau
    timokau committed Feb 27, 2020
    Copy the full SHA
    9896034 View commit details
    Browse the repository at this point in the history

  6. Merge #81155: wireshark: 3.2.1 -> 3.2.2 (security) 

    (cherry picked from commit 250daba)
https://www.wireshark.org/docs/relnotes/wireshark-3.2.2.html
I re-tested it still builds.
    @Ma27 @vcunat
    Ma27 authored and vcunat committed Feb 27, 2020
    Copy the full SHA
    abbaed1 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #81043 from wd15/sfepy-2019.4 

    [20.03] pythonPackages.sfepy: 2019.2 -> 2019.4
    @rnhmjoj
    rnhmjoj committed Feb 27, 2020
    Copy the full SHA
    a2bb258 View commit details
    Browse the repository at this point in the history