Skip to content
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
base: 0da7b54a2a1a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a459734c2536
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 12, 2019

  1. 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. 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

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

    octoprint: fix held back jinja2 dependency

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