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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc1fa81489e6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4610d6c94f39
Choose a head ref
  • 14 commits
  • 13 files changed
  • 7 contributors

Commits on Mar 5, 2019

  1. python: 2.7.15 -> 2.7.16 

    (cherry picked from commit 347680d)
    @FRidh
    FRidh committed Mar 5, 2019
    Copy the full SHA
    4c98ed7 View commit details

  2. Merge release-19.03 into staging-19.03

    @FRidh
    FRidh committed Mar 5, 2019
    Copy the full SHA
    ef37abe View commit details

  3. pythonPackages.libarcus: use pkgs.protobuf as input 

    This commit makes pkgs.protobuf the input for libarcus, since the latter
searches for the native protobuf library and not for the Python module.

(cherry picked from commit 6a523a1)
    @jokogr
    jokogr authored and Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    64cf235 View commit details

  4. curaengine: add protobuf in buildInputs 

    (cherry picked from commit c14eed2)
    @jokogr
    jokogr authored and Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    9e70e00 View commit details

  5. python.pkgs.awkward: fix tests 

    pytest.importorskip() doesn't work when we don't use pytest to run tests

(cherry picked from commit 654e6ec)
    Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    589d397 View commit details

  6. python.pkgs.uproot: update checkInputs 

    (cherry picked from commit 1435d45)
    Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    75a40bb View commit details

  7. python.pkgs.supervise_api: use patch to specify path to supervise 

    (cherry picked from commit b36dc66)
    Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    6d90e6c View commit details

Commits on Mar 6, 2019

  1. buildPythonPackage: fix building with flit 

    (cherry picked from commit a2736d2)
    @FRidh
    FRidh committed Mar 6, 2019
    Copy the full SHA
    481d64f View commit details

  2. postgresql_9_4: 9.4.20 -> 9.4.21 

    See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit d1dd3a1)
    @lsix
    lsix committed Mar 6, 2019
    Copy the full SHA
    c3a2919 View commit details

  3. postgresql_9_5: 9.5.15 -> 9.5.16 

    See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit 74c715e)
    @lsix
    lsix committed Mar 6, 2019
    Copy the full SHA
    9e7d96f View commit details

  4. postgresql_9_6: 9.6.11 -> 9.6.12 

    See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit 70a31c2)
    @lsix
    lsix committed Mar 6, 2019
    Copy the full SHA
    04e87a8 View commit details

  5. postgresql_10: 10.6 -> 10.7 

    See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit a90cf49)
    @lsix
    lsix committed Mar 6, 2019
    Copy the full SHA
    4d566c3 View commit details

Commits on Mar 7, 2019

  1. pythonPackages.wrf-python: Fix build (#56989) 

    The latest changes to support better cross-compilation compatibility
have introduced a stricter handling of dependency specification in
python. Since b4acd97, gfortran should be put into nativeBuildInputs,
as it's a build-time only dependency for wrf-python. Similarly, mock is
only required when testing, so it should go to checkInputs.

(cherry picked from commit 36f5c0d)
    @knedlsepp
    knedlsepp authored and Robert Schütz committed Mar 7, 2019
    Copy the full SHA
    1a24f2c View commit details

Commits on Mar 9, 2019

  1. Merge branch 'staging-19.03' into release-19.03

    @vcunat
    vcunat committed Mar 9, 2019
    Copy the full SHA
    4610d6c View commit details
Loading