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: b6474a3a3b92
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4b148bce243d
Choose a head ref
  • 7 commits
  • 7 files changed
  • 6 contributors

Commits on Mar 28, 2018

  1. apache-httpd: fix typo in config servedFiles 

    (cherry picked from commit 169468c)
    @erictapen @fpletz
    erictapen authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    be79855 View commit details
    Browse the repository at this point in the history

  2. telepathy-gabble: 0.18.3 -> 0.18.4 

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.18.4 with grep in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- found 0.18.4 in filename of file in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- directory tree listing: https://gist.github.com/92190024cdfe17a3e79730f988d904f6

(cherry picked from commit 14e24db)
    @ryantm @fpletz
    ryantm authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    b65794b View commit details
    Browse the repository at this point in the history

  3. openjdk10: minor cleanups 

    * with only one source bundle (per JEP-296), we can use src instead of
  srcs, and avoid the need to cd in prePatch

* fetch sources from jdk10u instead of jdk10, to make it easier to
  grab updates when they start coming.

* removed commented-out code that became irrelevant in the 8 -> 9
  transition (*.pf files, infinality font rendering)

* create jdk10, jre10, and jre10_headless attributes in
  all-packages.nix

(cherry picked from commit aabf45c)
    @jerith666 @fpletz
    jerith666 authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    b0f5bc0 View commit details
    Browse the repository at this point in the history

  4. nixos/tests/atd : remove test of batch command 

    "batch" executes jobs based on system load.
test was not deterministic.

(cherry picked from commit b08560f)
    @xeji @fpletz
    xeji authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    255f999 View commit details
    Browse the repository at this point in the history

  5. cloudfoundry-cli: fix build 

    (cherry picked from commit 760e972)
    @pbogdan @fpletz
    pbogdan authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    6d04965 View commit details
    Browse the repository at this point in the history

  6. spice-gtk: fix symlink errors, add withPolkit option 

    (cherry picked from commit e268100)
    @xeji @fpletz
    xeji authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    da3ef81 View commit details
    Browse the repository at this point in the history

  7. helmholtz: fix failing build 

    (cherry picked from commit 5bb96e7)
    @magnetophon @fpletz
    magnetophon authored and fpletz committed Mar 28, 2018
    Copy the full SHA
    4b148bc View commit details
    Browse the repository at this point in the history