Commit graph

122012 commits

Author SHA1 Message Date
Vladimír Čunát
689d6303e8
Merge branch 'master' into staging
The haskell split got reverted (again).
Hydra: ?compare=1416012
2017-12-05 13:07:26 +01:00
Peter Simons
fd7953d95f
Merge pull request #32333 from NixOS/revert-32112-hask-split-out
Revert "Revive multiple outputs for Haskell packages."
2017-12-05 09:46:21 +01:00
Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Fatih Altinok
e5e32822df flow: 0.59.0 -> 0.60.1 2017-12-05 08:04:58 +01:00
Vincent Laporte
50bdf5900e ocamlPackages.ocurl: 0.7.8 -> 0.8.0 2017-12-05 07:56:28 +01:00
adisbladis
4c1cd74b5b
Merge pull request #32321 from datakurre/datakurre-zc_buildout_nix
pythonPackages.zc_buildout_nix: 2.9.5 -> 2.10.0
2017-12-05 14:15:48 +08:00
adisbladis
537f4af06c
libp11: 0.4.4 > 0.4.7 2017-12-05 11:06:12 +08:00
Tuomas Tynkkynen
5490e580f5 v8: Fix aarch64 build
https://hydra.nixos.org/build/65224506

Besides dontUpdateAutotoolsGnuConfigScripts, the 'arch' assignment was
wrong and resulted in "x64" (stdenv.isArm is not true on AArch64).
2017-12-05 03:43:07 +02:00
Orivej Desh
a9b5900360
Merge pull request #32322 from berce/staging
ed: fix docs location. Fixes #32150. Supersedes #32315.
2017-12-04 23:33:08 +00:00
Orivej Desh
bb2b4587c6 ed: enable check on darwin 2017-12-04 23:31:48 +00:00
Orivej Desh
0bb47027ab lzip: add unpackCmd hook 2017-12-04 23:31:48 +00:00
Bert Moens
a865d17b7c ed: fix docs location
by removing installFlags and configureFlags. Fixes #32159
2017-12-04 23:31:30 +00:00
Orivej Desh
2a230dd64d libunistring: fix build and enable tests on darwin 2017-12-04 23:04:34 +00:00
Joachim F
c0d7a054cb
Merge pull request #32274 from ThomasMader/dlang
Improve dlang packages
2017-12-04 23:02:11 +00:00
Joachim F
096930807f
Merge pull request #32260 from erictapen/osrm-bump
osrm-backend: 4.9.1 -> 5.14.1
2017-12-04 23:01:01 +00:00
Orivej Desh
7515cdfeb6
Merge pull request #32317 from orivej/macos-10.13.2
darwin.Libsystem: fix build on 10.13.2
2017-12-04 22:48:48 +00:00
Orivej Desh
c885b3c622 cataclysm-dda-git: disable parallel building 2017-12-04 22:43:20 +00:00
Asko Soukka
4d237df79d
pythonPackages.zc_buildout_nix: 2.9.5 -> 2.10.0 2017-12-04 22:13:16 +02:00
Frederik Rietdijk
ce269c971d
Merge pull request #32318 from FRidh/python-multiple-overrides
Python: support multiple overrides
2017-12-04 20:45:01 +01:00
Frederik Rietdijk
2766291c3f
Merge pull request #32278 from bhipple/centos-7.4-vmtools.image
Init Centos 7.4 vmTools diskImage
2017-12-04 20:22:42 +01:00
Frederik Rietdijk
78291a920f Python: support multiple overrides
Fixes https://github.com/NixOS/nixpkgs/issues/32263
2017-12-04 20:09:30 +01:00
Orivej Desh
99ed136809 darwin.Libsystem: fix build on 10.13.2 2017-12-04 18:54:39 +00:00
Tuomas Tynkkynen
e220f31908 xdaliclock: Fix aarch64 build
https://hydra.nixos.org/build/65030707
2017-12-04 19:31:02 +02:00
gnidorah
cb6065f0c9
gnome3.dconf-editor: drop gnome3.gsettings_desktop_schemas 2017-12-04 17:32:17 +01:00
gnidorah
a9746ab839
transmission_gtk: use wrapGAppsHook 2017-12-04 17:32:11 +01:00
Orivej Desh
81e5b51a2c
Merge pull request #32308 from orivej/static-resolv-conf
nixos/networking: support static resolv.conf
2017-12-04 16:07:21 +00:00
Maximilian Bosch
af75b48b51 services.statsd: add simple test 2017-12-04 16:56:16 +01:00
Maximilian Bosch
aaf1e1c4fb statsd: restore support for {influx,librato,stackdriver} backends
These packages will be placed into an environment using
`backendsToPackages`. This function explicitly maps backends to
`pkgs.nodePackages.${type}` unless it's a builtin. This ensures that only
valid backends that work on NixOS are used (if not, the build already
breaks at evaluation time).

The log will be redirected to `stdout` to be able to watch the entire
output using `journalctl`.

Configuration parameters for the backends need to be set using
`services.statsd.extraConfig` as each backend has its own options and
all of them shouldn't be validated and checked explicitly and manually.
2017-12-04 16:56:16 +01:00
Orivej Desh
b0311ab861
Merge pull request #32299 from orivej/gettext-datadirs
gettext: add setup hook populating GETTEXTDATADIRS
2017-12-04 15:28:12 +00:00
Orivej Desh
a5c832f1af gettext: add setup hook populating GETTEXTDATADIRS
Fixes #32296

(cherry picked from commit f727aeb4505a9646eb7f7d67ed0fd411900b570c)
2017-12-04 15:26:52 +00:00
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
Orivej Desh
67a86f7813 hashcat: 4.0.0 -> 4.0.1
Upstream has moved 4.0.0 into https://hashcat.net/files_legacy/hashcat-4.0.0.7z
2017-12-04 14:48:46 +00:00
adisbladis
3130c112da
Merge pull request #32276 from WilliButz/packageUpdates
pgtap: 0.97.0 -> 0.98.0
highlight: 3.40 -> 3.41
2017-12-04 22:10:29 +08:00
Orivej Desh
d5facd5df3 nixos/networking: support static resolv.conf 2017-12-04 13:58:54 +00:00
adisbladis
bd6ba753d3
Merge pull request #32303 from ebzzry/emem-0.2.50
emem: 0.2.48 -> 0.2.50
2017-12-04 21:49:26 +08:00
Orivej Desh
6b42b5a0ef
Merge pull request #32307 from lsix/update_libunistring
libunistring: 0.9.7 -> 0.9.8
2017-12-04 13:42:55 +00:00
Jörg Thalheim
bce5a8d567
Merge pull request #32291 from andir/dino-git
dino: 2017-09-26 -> 2017-12-03
2017-12-04 13:42:15 +00:00
Lancelot SIX
f2b690ae2b
Merge pull request #32294 from earldouglas/jenkins-2.93
jenkins: 2.92 -> 2.93
2017-12-04 14:36:41 +01:00
Lancelot SIX
4c9f27c9ab
libunistring: 0.9.7 -> 0.9.8
See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00001.html
for release information
2017-12-04 14:03:44 +01:00
Daiderd Jordan
97af9310d5
Merge pull request #32300 from adisbladis/vault-0_9_0
vault: 0.8.3 -> 0.9.0
2017-12-04 13:12:05 +01:00
zimbatm
3807408c38
Merge pull request #32212 from ryantrinkle/nat-port-forwarding-ranges
Nat port forwarding ranges
2017-12-04 12:05:05 +00:00
Daiderd Jordan
852fe55822
Merge pull request #32304 from LnL7/vault-test
vault: add nixos test
2017-12-04 13:04:13 +01:00
Daiderd Jordan
6a20b88cec
vault: add nixos test 2017-12-04 12:59:52 +01:00
Peter Simons
7993e8790f
Merge pull request #32112 from nc6/hask-split-out
Revive multiple outputs for Haskell packages.
2017-12-04 12:36:45 +01:00
Orivej Desh
f1e16171bd
Merge pull request #32301 from ckauhaus/submit/vulnix-1.4.0
vulnix: 1.3.4 -> 1.4.0
2017-12-04 10:09:20 +00:00
Rommel Martinez
3746506602 emem: 0.2.48 -> 0.2.50 2017-12-04 17:22:36 +08:00
Ryan Trinkle
4f8a65a163 nixos/nat: add dmzHost option (#32257) 2017-12-04 09:21:58 +00:00
Christian Kauhaus
10c2dcef82 vulnix: 1.3.4 -> 1.4.0
The new vulnix release contains auto-detection of CVE patches.
2017-12-04 09:41:05 +01:00
Vladimír Čunát
13797ff522
linux-4.13: mark as insecure (+required generic changes)
extraMeta was being fed as passthru without being processed by stdenv,
so without those changes, adding the security attribute would be useless.
2017-12-04 09:33:39 +01:00
adisbladis
f019707548
vault: 0.8.3 -> 0.9.0 2017-12-04 16:13:07 +08:00