nixpkgs/pkgs
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
..
applications Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
build-support Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
common-updater
data Merge pull request #69219 from rileyinman/iosevka 2019-09-24 10:16:44 -05:00
desktops Re-Revert "Merge branch 'staging-next'" 2019-09-22 09:38:09 +02:00
development Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
games Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
misc plantuml-syntax: add vim plugin 2019-09-25 20:30:35 +02:00
os-specific Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
servers Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
shells zsh-completions: 0.30.0 -> 0.31.0 2019-09-21 02:54:36 -05:00
stdenv stdenv/adapters.nix: remove static from makeStaticLibraries 2019-09-19 12:52:28 -04:00
test
tools Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
top-level Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00