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

Commits on May 10, 2019

  1. nixos/binfmt: handle emulatedSystems 

    Fixes #61248
    @matthewbauer
    matthewbauer committed May 10, 2019
    Copy the full SHA
    153598e View commit details
    Browse the repository at this point in the history

Commits on May 11, 2019

  1. binfmt: add more magics and masks 

    New ones taken from this script:

https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh
    @matthewbauer
    matthewbauer committed May 11, 2019
    Copy the full SHA
    60381b7 View commit details
    Browse the repository at this point in the history

  2. nixos/binfmt: fixup

    @matthewbauer
    matthewbauer committed May 11, 2019
    Copy the full SHA
    93a522c View commit details
    Browse the repository at this point in the history

Commits on May 12, 2019

  1. lombok: 1.18.4 -> 1.18.8

    @rycee
    rycee committed May 12, 2019
    Copy the full SHA
    d8cac92 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61257 from matthewbauer/add-binfmt-emulated-systems 

    nixos/binfmt: handle emulatedSystems
    @Ericson2314
    Ericson2314 committed May 12, 2019
    Copy the full SHA
    395bcc0 View commit details
    Browse the repository at this point in the history

  3. octoprint: fix held back jinja2 dependency 

    Octoprint holds back python jinja2 package due to breaking changes.
nixpkgs' jinja2 recently changed to running tests, but the octoprint
version fails building due to having an older pytest configuration,
and this versions pypi release doesn't have the tests dir distributed in
the tarball anyways.
    @mvnetbiz
    mvnetbiz committed May 12, 2019
    Copy the full SHA
    2a96ed5 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. python37Packages.av: 6.1.2 -> 6.2.0 

    PyAV stopped using nosetest PyAV-Org/PyAV#514

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-av/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed May 13, 2019
    Copy the full SHA
    1d11a3d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61361 from r-ryantm/auto-update/python3.7-av 

    python37Packages.av: 6.1.2 -> 6.2.0
    @marsam
    marsam committed May 13, 2019
    Copy the full SHA
    0da7b54 View commit details
    Browse the repository at this point in the history

  3. octoprint: fix darwin build

    @marsam
    marsam committed May 13, 2019
    Copy the full SHA
    395a9de View commit details
    Browse the repository at this point in the history

  4. Merge pull request #61407 from mvnetbiz/octoprint-jinja2 

    octoprint: fix held back jinja2 dependency

Fixes NixOS/nixpkgs#61183
    @marsam
    marsam committed May 13, 2019
    Copy the full SHA
    a459734 View commit details
    Browse the repository at this point in the history