Commit Graph

111807 Commits

Author SHA1 Message Date
Frederik Rietdijk
20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Tim Steinbach
9ea8535fa7 Merge pull request #27717 from NeQuissimus/sbt_0_13_16
sbt: 0.13.15 -> 0.13.16
2017-07-30 00:21:55 -04:00
Jörg Thalheim
23d8fd4ae6 Merge pull request #27719 from sigma/pr/java-fix
java: fix dtrace detection
2017-07-30 00:40:11 +01:00
Jörg Thalheim
0e210f142c Merge pull request #27737 from puffnfresh/bug/alacritty-ld-library-path
alacritty: use patchelf instead of LD_LIBRARY_PATH
2017-07-30 00:15:04 +01:00
Jörg Thalheim
a5e8ef5a74 Merge pull request #27739 from romildo/upd.awesome
awesome: 4.1 -> 4.2
2017-07-30 00:12:46 +01:00
Michael Weiss
bc8b634072 maim: 5.4.64 -> 5.4.65 2017-07-30 00:59:08 +02:00
Volth
faac018630 environment.etc: add user/group option
fixes #27546
2017-07-29 23:56:46 +01:00
Michael Weiss
6f2715e47d slop: 6.3.47 -> 6.3.48 2017-07-30 00:54:57 +02:00
Nikolay Amiantov
69e24c044a kbd: fix build 2017-07-30 01:33:26 +03:00
Nikolay Amiantov
373a623daa Revert "Revert "kbd: 2.0.3 -> 2.0.4""
This reverts commit 00bf3a9dca.
2017-07-30 01:21:44 +03:00
Robin Gloster
0154d1b03f
fix evaluation
cc @nyarly
2017-07-30 00:03:24 +02:00
Tim Steinbach
06a513ee05 busybox: 1.27.0 -> 1.27.1 2017-07-29 23:15:40 +02:00
Franz Pletz
d46c567756 Merge pull request #27747 from NeQuissimus/feh_2_19_1
feh: 2.19.0 -> 2.19.1
2017-07-29 22:39:57 +02:00
Jörg Thalheim
06bcac90bb alacritty: only build on linux
the darwin build fails at the moment and since we are now using patchelf
it would not build anyway.
2017-07-29 20:43:20 +01:00
volth
eaa2d27b90 nixos/tinc: remove restartTriggers
```restartTriggers``` pointed to the constant files in ```/nix/store/``` and had to effect.
2017-07-29 21:32:28 +02:00
Frederik Rietdijk
c4e26aff22 hspellDicts: broken 2017-07-29 21:29:45 +02:00
Florian Jacob
3e69c650ab nixos/systemd-networkd: allow [Link] section in .network files 2017-07-29 21:25:21 +02:00
Franz Pletz
e09bb50d76 Merge pull request #27749 from NeQuissimus/imagemagick_6_9_9_3
ImageMagick: 6.9.9-0 -> 6.9.9-3
2017-07-29 21:20:07 +02:00
Franz Pletz
7eb5271a97 Merge pull request #27750 from NeQuissimus/imagemagick_7_0_6_4
ImageMagick: 7.0.6-1 -> 7.0.6-4
2017-07-29 21:19:55 +02:00
Tuomas Tynkkynen
1d72474df7 make-ext4-fs: Fix modification timestamps in image
Use '-f' to make timestamp calls to always return the same time. Also
Nix uses the timestamp of '1' instead of epoch directly.
2017-07-29 22:03:43 +03:00
Thomas Tuegel
cdb18068cd
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.

(cherry picked from commit b21defaf51)

Re-applied due to bad merge in b116fa5ff2.
2017-07-29 20:59:08 +02:00
Franz Pletz
6f0ef6bb32
ispc: build with current flex 2017-07-29 19:51:16 +02:00
Franz Pletz
5d2f5e374f
verilator: build with current flex 2017-07-29 19:51:16 +02:00
Franz Pletz
d3bfa0542c
intercal: build with current flex 2017-07-29 19:51:16 +02:00
Franz Pletz
7f69275f99
dtc: build with current flex 2017-07-29 19:51:15 +02:00
Franz Pletz
42beae0618
iptables: build with current flex 2017-07-29 19:51:15 +02:00
Franz Pletz
5e08c4a2cd
flex: 2.6.3 -> 2.6.4 2017-07-29 19:51:15 +02:00
Tim Steinbach
5e26dbe7ad
ImageMagick: 7.0.6-1 -> 7.0.6-4 2017-07-29 13:46:47 -04:00
Tim Steinbach
bde8a15019
ImageMagick: 6.9.9-0 -> 6.9.9-3 2017-07-29 13:40:13 -04:00
Tim Steinbach
07b69a5325
feh: 2.19.0 -> 2.19.1 2017-07-29 13:32:58 -04:00
volth
d50437ba3e
flex_2_5_35: fix 404 2017-07-29 19:01:07 +02:00
Franz Pletz
4d66de88ff
nixpkgs-manual: fix build, reindent
cc #25980
2017-07-29 18:40:21 +02:00
Franz Pletz
e37274eb2f
atlassian-jira: 7.3.7 -> 7.4.1 2017-07-29 18:28:30 +02:00
Franz Pletz
96a40ec635
atlassian-confluence: 6.2.2 -> 6.3.1 2017-07-29 18:28:06 +02:00
Franz Pletz
65f9631b87
linuxPackages.acpi_call: add patch for 4.12 compat 2017-07-29 18:28:00 +02:00
Franz Pletz
b449722886 Merge pull request #27730 from Infinisil/fix-artwork-url
nixos-artwork: Fix URL to gnome-dark
2017-07-29 18:27:25 +02:00
Danylo Hlynskyi
311ee164e4 pg_repack: 1.3.4 -> 1.4.0.1
highlight: adds support for Amazon RDS (pg 9.6.3) when used as client
2017-07-29 17:58:50 +02:00
Aristid Breitkreuz
9d4d963097 wireguard: 0.0.20170706 -> 0.0.20170726 2017-07-29 17:28:18 +02:00
volth
fd1b618852 xrdp: 0.9.2 -> 0.9.3 (#27742) 2017-07-29 16:16:19 +01:00
Robert Helgesson
9d4d62923a
fgallery: add support for facedetect 2017-07-29 17:01:54 +02:00
Robert Helgesson
138dd4f9f1
fgallery: 1.8 -> 1.8.2 2017-07-29 17:01:53 +02:00
Robert Helgesson
1ae9848fe1
perl-Cpanel-JSON-XS: init at 3.0237 2017-07-29 16:23:57 +02:00
Bart Brouns
72e99b6915 baudline: use jack2 instead of jack1
Otherwise it doesn't connect with the rest of the system.

[Bjørn: I think this is a symptom of jack1 packaging problem in nixpkgs.
The two libraries are _supposed_ to be interchangeable.]
2017-07-29 15:49:41 +02:00
romildo
47689bf706 awesome: 4.1 -> 4.2
- update to version 4.2
- remove 1639.patch, which has been integrated in release
2017-07-29 10:32:42 -03:00
Robert Helgesson
a444b34b52
facedetect: init at 0.1 2017-07-29 15:07:19 +02:00
Bjørn Forsman
1639429359 vim_configurable: add ".../after" plugin dirs to runtimepath
This fixes using e.g. CSApprox when installed with nix.
2017-07-29 14:34:13 +02:00
Brian McKenna
9aafecd28b alacritty: use patchelf instead of LD_LIBRARY_PATH
If we use LD_LIBRARY_PATH then anything typed into Alacritty inherits it. This
breaks a lot of applications if the versions are different. For me this breaks
everything from Git to every program which uses Gtk.
2017-07-29 22:29:07 +10:00
Bjørn Forsman
aff0725a7d nixos/lighttpd: add enableUpstreamMimeTypes option
enableUpstreamMimeTypes controls whether to include the list of mime
types bundled with lighttpd (upstream). This option is enabled by
default and gives a much more complete mime type list than we currently
have. If you disable this, no mime types will be added by NixOS and you
will have to add your own mime types in services.lighttpd.extraConfig.
2017-07-29 14:24:40 +02:00
Bjørn Forsman
a65d8d3af3 lighttpd: install configuration examples
Place them in $out/share/lighttpd/doc/config/.

Most importantly, this includes a complete set of mime types in the
$out/share/lighttpd/doc/config/conf.d/mime.conf file. The plan is to use
that file in the NixOS lighttpd module.
2017-07-29 14:24:40 +02:00
Bjørn Forsman
b339e6e13f nixos/lighttpd: update list of allowed module names
* mod_dirlisting is auto-loaded by lighttpd and should not be explicitly
  loaded in the configuration file.
* The rest comes from looking at "ls -1 $lighttpd/lib/*.so" when
  lighttpd is built with "enableMagnet" and "enableMysql".
2017-07-29 14:24:40 +02:00