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

Commits on Oct 9, 2018

  1. kbd: Rename some keymaps.

    From upstream kbd, some keymap names are reused across very different
    keyboard layouts. This is a a problem because loadkeys just picks the
    first keymap it sees. The clashing names lead to e.g.  "loadkeys no"
    defaulting to a norwegian dvorak map instead of the much more common
    qwerty one.
    
    Used Arch Linux's list of keymaps that need renaming, with a small
    deviation: the norwegian dvorak map becomes dvorak-no instead of
    no-dvorak, to match the naming scheme for all the other dvorak maps.
    
    fixes #47878
    
    (cherry picked from commit f1987fb)
    plutotulp authored and Mic92 committed Oct 9, 2018
    Copy the full SHA
    df6d40f View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. buildRustPackage: fix regex for separating lib and bin

    E.g. exa was wrongly put into /lib, as it matches
    
      .*.a
    
    but not
    
      .*\.a
    
    (cherry picked from commit 64d0676)
    erictapen authored and timokau committed Oct 10, 2018
    Copy the full SHA
    5647e9a View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2018

  1. pythonPackages.pytest.setupHook: run in correct phase

    It was reported that the 2nd solution wasn't working as expected because
    it was ran in the wrong phase.
    
    This commit creates a new phase, in between the installCheckPhase and distPhase.
    
    (cherry picked from commit 20a4a4b)
    FRidh committed Oct 13, 2018
    Copy the full SHA
    284a128 View commit details
    Browse the repository at this point in the history
  2. pythonPackages.autobahn: run hooks

    (cherry picked from commit b75ea62)
    FRidh committed Oct 13, 2018
    Copy the full SHA
    c918e05 View commit details
    Browse the repository at this point in the history
  3. pythonPackages.autobahn: use checkInputs

    (cherry picked from commit 1c3f730)
    lopsided98 authored and FRidh committed Oct 13, 2018
    Copy the full SHA
    6306db4 View commit details
    Browse the repository at this point in the history
  4. python.pkgs.bootstrapped-pip: update pip, setuptools and wheel

    (cherry picked from commit b05a596)
    FRidh committed Oct 13, 2018
    Copy the full SHA
    de7a2df View commit details
    Browse the repository at this point in the history
  5. python.pkgs.pip: 18.0 -> 18.1

    (cherry picked from commit 474c78a)
    FRidh committed Oct 13, 2018
    Copy the full SHA
    1d61c41 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. mariadb.connector-c: 2.3.6 -> 2.3.7 (#48078)

    (cherry picked from commit 98e5a0f)
    
    contains security fix for CVE-2018-3081
    florianjacob authored and xeji committed Oct 16, 2018
    Copy the full SHA
    ab27d00 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b97e1dc View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. Merge staging into release

    FRidh committed Oct 20, 2018
    Copy the full SHA
    4a4e11f View commit details
    Browse the repository at this point in the history
  2. python36: 3.6.6 -> 3.6.7

    (cherry picked from commit 241bab3)
    FRidh committed Oct 20, 2018
    Copy the full SHA
    8a3e8bd View commit details
    Browse the repository at this point in the history
  3. python37: 3.7.0 -> 3.7.1

    (cherry picked from commit e4d8443)
    FRidh committed Oct 20, 2018
    Copy the full SHA
    50a6f21 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Copy the full SHA
    0d2483f View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. Merge pull request #49888 from timokau/numpy-high-cpu-fix

    numpy: fix high cpu count bug
    timokau committed Nov 8, 2018
    Copy the full SHA
    56090c4 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2018

  1. Copy the full SHA
    9110d40 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2018

  1. python27: add patch to fix CVE-2018-1000802

    (cherry picked from commit ae3e9b5)
    fpletz authored and FRidh committed Nov 11, 2018
    Copy the full SHA
    496a238 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    3b2944d View commit details
    Browse the repository at this point in the history
  3. Revert "Merge staging-18.09 into release-18.09"

    This reverts commit 3b2944d, reversing
    changes made to 496a238.
    
    I wasn't aware we had a Hydra job for this. Looking at it now, it seems we
    have a lot more failures, so I am reverting this merge.
    FRidh committed Nov 11, 2018
    Copy the full SHA
    3d63c05 View commit details
    Browse the repository at this point in the history
  4. gitea: 1.5.2 -> 1.5.3 (#50229)

    Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.3
    (cherry picked from commit 090bd93)
    etu authored and Robert Schütz committed Nov 11, 2018
    Copy the full SHA
    ee7b0db View commit details
    Browse the repository at this point in the history