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: 8750b47f0e49
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 17fb44e2e308
Choose a head ref
  • 9 commits
  • 10 files changed
  • 8 contributors

Commits on Apr 12, 2018

  1. commandergenius: 1822release -> 2.2.0 

    The `1822-release` build breaks on Hydra, some days ago the stable
`2.2.0` release has been tagged on upstream.

It required some new build inputs (zlib, curl, SDL2_mixer, python3) and
some minor changes in the cmakeFlags and makeFlags for the build.

See https://hydra.nixos.org/build/71818713/log
See ticket #36453 and #31747

(cherry picked from commit d7894d0)
    @Ma27 @xeji
    Ma27 authored and xeji committed Apr 12, 2018
    Copy the full SHA
    0397525 View commit details
    Browse the repository at this point in the history

  2. opendylan: 2013.1 -> 2016.1pre 

    (cherry picked from commit 00823f0)
    @coreyoconnor @xeji
    coreyoconnor authored and xeji committed Apr 12, 2018
    Copy the full SHA
    6c29a6c View commit details
    Browse the repository at this point in the history

  3. openshift: 3.6.0 -> 3.9.0 

    (cherry picked from commit fbf29e5)
    @jensbin @xeji
    jensbin authored and xeji committed Apr 12, 2018
    Copy the full SHA
    afee871 View commit details
    Browse the repository at this point in the history

  4. hpx: 1.0.0 -> 1.1.0 

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/hpx/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py -h` got 0 exit code
- ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py --help` got 0 exit code
- found 1.1.0 with grep in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0
- found 1.1.0 in filename of file in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0
- directory tree listing: https://gist.github.com/377d8c673231332bb40acb55fed39e53

(cherry picked from commit e28170c)
    @ryantm @xeji
    ryantm authored and xeji committed Apr 12, 2018
    Copy the full SHA
    8f5b4e4 View commit details
    Browse the repository at this point in the history

  5. graph-tool: 2.16 -> 2.26 

    - add ncurses: configure links against ncurses and fails otherwise
    configure: error: Could not link test program to Python.
    https://travis-ci.org/NixOS/nixpkgs/builds/48759067
    The given hint (Maybe the main Python library has been installed
    in some non-standard library path) is misleading.
    The config.log reveals that the failure is due to missing ncurses link option
- with-boost-libdir is need to find Boost::IOStreams/regex/etc.
- expat/cgal are detected in /usr/lib when not specified explicitly
- boost > boost159 is needed to have -lboost_python3 (and -lboost_python)

- set pythonModule = Python;
  => inorder to be used in python.buildEnv { extraLibs = [..]; }

tested on MacOSX and in a linux Docker container with:
> nix-shell -I nixpkgs=. -p python2.pkgs.graph-tool
> nix-shell -I nixpkgs=. -p python3.pkgs.graph-tool

(cherry picked from commit a842f0e)
    @ciderale @xeji
    ciderale authored and xeji committed Apr 12, 2018
    Copy the full SHA
    a34a2d0 View commit details
    Browse the repository at this point in the history

  6. graph-tool: use buildPythonPackage with format = "other"; 

    (cherry picked from commit 83dc28c)
    @ciderale @xeji
    ciderale authored and xeji committed Apr 12, 2018
    Copy the full SHA
    97aa2f3 View commit details
    Browse the repository at this point in the history

  7. Renpy and pygame_sdl2 update - 6.99.14 (#33943) 

    * pygame_sdl2: 6.99.10.1227 -> 2.1.0-6.99.14

* renpy: 6.99.12.4 -> 6.99.14

(cherry picked from commit f83cbf2)
    @rardiol @xeji
    rardiol authored and xeji committed Apr 12, 2018
    Copy the full SHA
    a74311f View commit details
    Browse the repository at this point in the history

  8. pythonPackages.pyechonest: Move to own file 

    Also disable on Py3k due to syntax errors.

(cherry picked from commit 85e3b5b)
    @etu @xeji
    etu authored and xeji committed Apr 12, 2018
    Copy the full SHA
    2a9fdf9 View commit details
    Browse the repository at this point in the history

  9. Merge #38823: various build fixes from master

    @vcunat
    vcunat committed Apr 12, 2018
    Copy the full SHA
    17fb44e View commit details
    Browse the repository at this point in the history