nixpkgs/pkgs
Orivej Desh 59bcd86640 Merge branch 'master' into staging
* master: (53 commits)
  hashcat: 4.0.0 -> 4.0.1
  vault: add nixos test
  emem: 0.2.48 -> 0.2.50
  nixos/nat: add dmzHost option (#32257)
  vulnix: 1.3.4 -> 1.4.0
  linux-4.13: mark as insecure (+required generic changes)
  vault: 0.8.3 -> 0.9.0
  gox: 20140904 -> 0.4.0
  guitarix: 0.35.6 -> 0.36.1
  geolite-legacy: 2017-10-25 -> 2017-12-02
  premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12
  otfcc: build with ninja
  python/hetzner: 0.7.5 -> 0.8.0
  linux-testing: 4.15-rc1 -> 4.15-rc2
  Revert "linux_4_13: Remove, no longer supported."
  jenkins: 2.92 -> 2.93
  psc-package: 0.2.4 -> 0.2.5
  dino: 2017-09-26 -> 2017-12-03
  gnome3.gpaste: fix keybindings path
  plasma: 5.11.3 -> 5.11.4
  ...
2017-12-04 15:25:34 +00:00
..
applications Merge branch 'master' into staging 2017-12-04 15:25:34 +00:00
build-support Merge pull request #28448 from obsidiansystems/cc-wrapper-setup-var 2017-11-28 16:11:36 -05:00
common-updater
data Merge branch 'master' into staging 2017-12-04 15:25:34 +00:00
desktops Merge pull request #32288 from bkchr/plasma_5_11_4 2017-12-04 15:08:57 +08:00
development Merge branch 'master' into staging 2017-12-04 15:25:34 +00:00
games dwarf-fortress-packages.stoneSense: remove vestigial package 2017-12-03 12:22:13 +01:00
misc libretro.mame: fix parallel building 2017-11-29 11:18:14 +00:00
os-specific Merge branch 'master' into staging 2017-12-04 15:25:34 +00:00
servers Merge pull request #32276 from WilliButz/packageUpdates 2017-12-04 22:10:29 +08:00
shells zsh-prezto: updating "4f19700" -> "0crrj2n" 2017-12-03 14:51:36 +01:00
stdenv Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files 2017-11-22 15:23:37 -05:00
test
tools hashcat: 4.0.0 -> 4.0.1 2017-12-04 14:48:46 +00:00
top-level Merge pull request #32112 from nc6/hask-split-out 2017-12-04 12:36:45 +01:00