Skip to content
Commit 4869ddf8 authored by Orivej Desh's avatar Orivej Desh
Browse files

Merge branch 'master' into staging

* master: (26 commits)
  python.pkgs.cairocffi: update tests for Cairo 1.15.12
  python.pkgs.cairocffi: 0.8.0 -> 0.8.1
  freecell-solver: fix build
  perlPackages.CPANPLUS: restore build inputs removed in #41394
  Fix GHCJS 8.4/8.2 in sandboxed builds (#41411)
  dockerTools.pullImage: expose image* attributes (#41366)
  rust: disable tests on darwin
  python.pkgs.detox: 0.11 -> 0.12
  certbot: disable check on darwin
  freeimage: fix build with glibc 2.27
  shadowsocks-libev: supports darwin (#41421)
  pythonPackages.jira: fix build (#41419)
  SDL: propagate libiconv
  schema2ldif: Init at 1.3
  nixos/exim: Add unit restart trigger (#41418)
  Add myself as maintainer for dnsdist
  Add myself as maintainer
  synapse-bt: init at 2018-06-04 (#41402)
  skim: 0.3.2 -> 0.4.0 (#41417)
  ctags: fix source url (#41382)
  ...
parents 33ed2af2 6db9f468
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment