3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/tools
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
..
admin Revert "awscli: Get rid of runtime -dev dependencies" 2019-09-24 08:10:03 +02:00
archivers treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
audio beets: 1.4.7 -> 1.4.9 2019-09-23 00:23:56 -04:00
backup Re-Revert "Merge branch 'staging-next'" 2019-09-22 09:38:09 +02:00
bluetooth tree-wide: s/GTK+/GTK/g 2019-09-06 02:54:53 +02:00
bootloaders/refind treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
cd-dvd treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
compression treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
filesystems xtreemfs: mark as broken 2019-09-24 15:59:01 +02:00
graphics Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
inputmethods fctix-engines.mozc: fix build (#68457) 2019-09-11 10:09:37 +02:00
misc Merge pull request #69312 from elohmeier/goaccess 2019-09-24 15:17:44 +01:00
networking Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
nix nixpkgs-fmt: 0.5.0 -> 0.6.0 2019-09-16 16:28:46 +02:00
package-management home-manager: 2019-09-04 -> 2019-09-20 2019-09-25 10:56:53 +02:00
security Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
system Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
text miller: 5.5.0 -> 5.6.2 2019-09-23 15:06:30 +02:00
toml2nix
typesetting xml2rfc: Use pythonPackages.xml2rfc 2019-09-25 12:03:27 +02:00
video Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
virtualization Merge pull request #67332 from uvNikita/nixos-container/run 2019-09-14 13:22:35 +00:00
X11 treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00