Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mbedtls: fix build for Darwin #20940

Merged
merged 3 commits into from Dec 10, 2016
Merged

mbedtls: fix build for Darwin #20940

merged 3 commits into from Dec 10, 2016

Conversation

boronine
Copy link
Contributor

@boronine boronine commented Dec 6, 2016 •
edited

Motivation for this change

mbedtls was not building on Darwin despite platforms.all. Now it does. This is one of the failing packages listed in #18067.

cc @wkennington @fpletz

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@boronine, thanks for your PR! By analyzing the history of the files in this pull request, we identified @wkennington and @fpletz to be potential reviewers.

@boronine boronine changed the title Fix mbedtls build on Darwin mbedtls: fix build for Darwin Dec 6, 2016
@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Dec 7, 2016
LnL7
LnL7 approved these changes Dec 8, 2016
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tried rewriting the paths with install_name_tool -change $lib $out/lib instead? It's not necessary but I usually prefer it if it's not to much work.

@boronine
Copy link
Contributor Author

boronine commented Dec 9, 2016

@LnL7 thanks for the review! I fixed it in latest commit, and re-tested.

LnL7
LnL7 approved these changes Dec 9, 2016
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great 👍

matthewbauer
matthewbauer approved these changes Dec 10, 2016
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds on x86_64-darwin for me.

@LnL7 LnL7 merged commit 9243703 into NixOS:master Dec 10, 2016
@boronine boronine deleted the fix-mbedtls-darwin branch December 11, 2016 07:05
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/fonts' into experimental/fonts
fce64b4 
* commit 'refs/top-bases/experimental/fonts': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/nginx' into experimental/nginx
f9591d4 
* commit 'refs/top-bases/experimental/nginx': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/vim-plugins-us…
d51d547 
…ed-by-marc-weber

* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/vim-plugins-used-by-marc-we…
f785b0f 
…ber' into experimental/vim-plugins-used-by-marc-weber

* commit 'refs/top-bases/experimental/vim-plugins-used-by-marc-weber': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/postfix' into marc-nixos/postfix
f6efa96 
* commit 'refs/top-bases/marc-nixos/postfix': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-fi…
c9192ae 
…le' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/blender
e4897b1 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/blender' into experimental/…
e4accba 
…blender

* commit 'refs/top-bases/experimental/blender': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/opencascade' into experimen…
e4735db 
…tal/opencascade

* commit 'refs/top-bases/experimental/opencascade': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/nix' into experimental/nix
c514b60 
* commit 'refs/top-bases/experimental/nix': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental…
bcd7d2f 
…/gimp-git

* commit 'refs/top-bases/experimental/gimp-git': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/virtualbox-server' into marc-…
ae6fd61 
…nixos/virtualbox-server

* commit 'refs/top-bases/marc-nixos/virtualbox-server': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/php
d80875c 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/php' into experimental/php
a777087 
* commit 'refs/top-bases/experimental/php': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/plover' into experimental/p…
a46d79a 
…lover

* commit 'refs/top-bases/experimental/plover': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/apache-httpd' into experime…
9b51479 
…ntal/apache-httpd

* commit 'refs/top-bases/experimental/apache-httpd': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/parallel-building' into exp…
767e11b 
…erimental/parallel-building

* commit 'refs/top-bases/experimental/parallel-building': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/eclipse
55d23f7 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/eclipse' into experimental/…
8bf6459 
…eclipse

* commit 'refs/top-bases/experimental/eclipse': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/overlays' into experimental…
754a8a4 
…/overlays

* commit 'refs/top-bases/experimental/overlays': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
8c385b1 
…/updates

* experimental/overlays: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'experimental/overlays' into refs/top-bases/experimental…
317ab87 
…/hack-nix

* experimental/overlays: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/hack-nix' into experimental…
52e97dc 
…/hack-nix

* commit 'refs/top-bases/experimental/hack-nix': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/updates' into experimental/…
b340b93 
…updates

* commit 'refs/top-bases/experimental/updates': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/multiple-mysql…
e6edeaa 
…d-instances

* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/multiple-mysqld-instances' …
7ab862e 
…into experimental/multiple-mysqld-instances

* commit 'refs/top-bases/experimental/multiple-mysqld-instances': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/gutenprint
80de5eb 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/gutenprint' into experiment…
76a27d1 
…al/gutenprint

* commit 'refs/top-bases/experimental/gutenprint': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'experimental/gutenprint' into refs/top-bases/experiment…
a2f2593 
…al/cups-1.6-and-1.7

* experimental/gutenprint: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/cups-1.6-and-1.7' into expe…
6c5ad14 
…rimental/cups-1.6-and-1.7

* commit 'refs/top-bases/experimental/cups-1.6-and-1.7': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'experimental/updates' into refs/top-bases/experimental/…
602a24e 
…marc

* experimental/updates: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/haxe
4c57709 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/haxe' into experimental/haxe
0c71914 
* commit 'refs/top-bases/experimental/haxe': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/ruby
0e672fe 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/ruby' into experimental/ruby
3310352 
* commit 'refs/top-bases/experimental/ruby': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge branch 'master' into refs/top-bases/experimental/imap-sync-update
4cefc79 
* master: (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/imap-sync-update' into expe…
28b7f58 
…rimental/imap-sync-update

* commit 'refs/top-bases/experimental/imap-sync-update': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/mercurial' into experimenta…
0f07eba 
…l/mercurial

* commit 'refs/top-bases/experimental/mercurial': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/inkscape' into experimental…
629f975 
…/inkscape

* commit 'refs/top-bases/experimental/inkscape': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/vsftpd' into experimental/v…
48fef43 
…sftpd

* commit 'refs/top-bases/experimental/vsftpd': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/multi-shell-support' into mar…
534291b 
…c-nixos/multi-shell-support

* commit 'refs/top-bases/marc-nixos/multi-shell-support': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/marc-nixos/minimal-install-archive' into…
586c5b4 
… marc-nixos/minimal-install-archive

* commit 'refs/top-bases/marc-nixos/minimal-install-archive': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/wmii-old' into experimental…
5be02ec 
…/wmii-old

* commit 'refs/top-bases/experimental/wmii-old': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
MarcWeber added a commit to MarcWeber/nixpkgs that referenced this pull request Dec 12, 2016
@MarcWeber
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc
400ad97 
* commit 'refs/top-bases/experimental/marc': (2173 commits)
  gsl: 2.2 -> 2.3 (NixOS#21058)
  nextcloud: 10.0.1 -> 10.0.2
  endless sky: init at 0.9.4
  mbedtls: 2.3.0 -> 2.4.0
  afl: 2.23b -> 2.35b
  linux: 4.4.37 -> 4.4.38
  linux: 4.8.13 -> 4.8.14
  psd service: assert that at least one user must be configured
  openfire service: more informative assertion failure message
  dante service: fix config option type
  syslogd service: assert conflict with rsyslogd
  couchdb service: fix test in preStart
  kernel: Use built-in dtbs_install target instead of rolling our own
  direnv: 2.9.0 -> 2.10.0
  rubygems: 2.6.6 -> 2.6.8 (NixOS#21028)
  steam: added documentation to nixpkgs manual
  mbedtls: fix build for Darwin (NixOS#20940)
  linux: add patch to fix CVE-2016-8655
  dstat: fix bad interpreter: No such file
  btrbk: 0.22.2 -> 0.24.0
  ...
@mnacamura mnacamura mentioned this pull request Jun 19, 2018
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@boronine @mention-bot @matthewbauer @LnL7