129738 Commits

Author SHA1 Message Date
Timo Kaufmann
5643128ff2 syncthing,qsyncthingtray: remove syncthing-inotify
syncthing-inotify is replaced by the new syncthing "fswatcher" feature.
2018-02-24 01:08:44 +01:00
Tuomas Tynkkynen
ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
xeji
2ad6f04da7 bwm-ng: fix build error with gcc7
patch some gcc7 issues with inline functions
2018-02-24 00:56:02 +01:00
Jörg Thalheim
7d37688d66
Merge pull request #35422 from ryantm/mattermost-fix
mattermost: add build number
2018-02-23 23:47:19 +00:00
Jörg Thalheim
eb05f92c08
Merge pull request #35401 from makefu/pkgs/cups-zj-58/init
cups-zj-58: init at 2018-02-22
2018-02-23 22:42:52 +00:00
zimbatm
835d8e5c21 direnv: 2.14.0 -> 2.15.0 2018-02-23 22:42:20 +00:00
Aristid Breitkreuz
e349ccc77f nixos/alsa: Do not make sound.enable conditional on stateVersion.
Eelco Dolstra wrote:

Hm, this is not really the intended use of stateVersion. From the description:

        Every once in a while, a new NixOS release may change
        configuration defaults in a way incompatible with stateful
        data. For instance, if the default version of PostgreSQL
        changes, the new version will probably be unable to read your
        existing databases. To prevent such breakage, you can set the
        value of this option to the NixOS release with which you want
        to be compatible. The effect is that NixOS will option
        defaults corresponding to the specified release (such as using
        an older version of PostgreSQL).

So this is only intended for options that have some corresponding on-disk state. AFAICT this is not the case for sound. In any case stateVersion is a necessary evil that only exists because we can't just upgrade Postgres databases or change SSH host keys. It's not necessary for things like whether sound is enabled. (If the user discovers that sound is suddenly disabled, they can just enable it.)

I had some vague recollection that we also had a configVersion option setting to control the defaults for non-state-related options, but I can't find it so maybe it was only discussed.
2018-02-23 23:14:42 +01:00
xeji
b54e5b908d kubernetes: patch broken go version check
fixes #35403
patch from https://github.com/kubernetes/kubernetes/pull/58207
already merged upstream - remove for next version
2018-02-23 22:56:36 +01:00
volth
4bbd6900f8 protobuf: 3.4.0 -> {3.4.1, 3.5.1.1} 2018-02-23 21:38:22 +00:00
Ryan Mulligan
ac782ae4e0 mattermost: add build number 2018-02-23 13:26:31 -08:00
Andreas Rammhold
a6664d8192
mupdf: apply patch for CVE-2018-6544 (part 2)
This (hopefully) completes 998b1ef.
2018-02-23 22:25:37 +01:00
Michael Weiss
49b7fc3908 android-studio-preview: 3.1.0.11 -> 3.1.0.12 2018-02-23 21:57:09 +01:00
Florian Klink
9f6a942fc7 zziplib: 0.13.67 -> 0.13.68
Bump zziplib to 0.13.68 to fix multiple CVE issues:

 - CVE-2018-6381
 (a803559fa9)
 - CVE-2018-6484
 (https://github.com/gdraheim/zziplib/issues/14#issuecomment-363198084)
 - CVE-2018-6540
 (72ec933663)
 - CVE-2018-6541
 (https://github.com/gdraheim/zziplib/issues/16#issuecomment-363197718)
 - CVE-2018-6542
 (931f962ddf)

Unfortunately, getting only those patches is hard, as they're not well
referenced to linked issues. The testsuite checking for vulns
requires network access (so we can't easily test it here).

https://github.com/gdraheim/zziplib/issues/20 might still be an issue,
so keeping this as a TODO here.
2018-02-23 21:39:48 +01:00
Florian Klink
ee16feed37 zziplib: add docbook_xml_dtd_412 2018-02-23 21:10:27 +01:00
Vladimír Čunát
296fa609ad
Merge #35404: sage: explicitly use gfortran6 2018-02-23 20:39:51 +01:00
Florian Klink
cdf19abfa5 zziplib: use postPatch instead of patchPhase 2018-02-23 20:36:21 +01:00
Joachim F
cda0f9fede
Merge pull request #35414 from flokli/CVE-2018-6544
mupdf: apply patch for CVE-2018-6544
2018-02-23 19:14:31 +00:00
Franz Pletz
a5521d1598
Merge pull request #35416 from volth/patch-106
nixos/programs.chromium: write policies for google-chrome too
2018-02-23 19:11:41 +00:00
volth
270f99f7bf
nixos/programs.chromium: write policies for google-chrome too
Policy configuration files live under /etc/chromium for Chromium, and under /etc/opt/chrome for Google Chrome.
2018-02-23 19:00:26 +00:00
Florian Klink
998b1ef13b mupdf: apply patch for CVE-2018-6544 2018-02-23 19:50:54 +01:00
Franz Pletz
844ad2ec03
Merge pull request #35406 from xeji/wireguard
wireguard: 0.0.20180202 -> 0.0.20180218
2018-02-23 18:20:54 +00:00
Franz Pletz
2b838f3d4d
Merge pull request #35405 from tomberek/tinc_chown_invitations
tinc: enable invitations
2018-02-23 18:18:52 +00:00
adisbladis
b492e2a164
dnsmasq: Patch CVE-2017-15107 2018-02-24 01:36:45 +08:00
Will Dietz
fa06cab3fd
Merge pull request #35407 from dtzWill/update/micro-1.4.0
micro: 1.3.4 -> 1.4.0
2018-02-23 11:27:14 -06:00
Will Dietz
749d0e7f3a micro: 1.3.4 -> 1.4.0 2018-02-23 11:14:27 -06:00
volth
54371a78f4 ocamlPackages.curses: works with default ncurses 2018-02-23 18:14:09 +01:00
Peter Simons
2e45e280cb haskell-doctest: the 0.14.1 test suite fails on NixOS 2018-02-23 18:08:09 +01:00
Tom Bereknyei
034d3fae3d tinc: enable invitations 2018-02-23 11:59:37 -05:00
xeji
1c3b6d509d wireguard: 0.0.20180202 -> 0.0.20180218 2018-02-23 17:59:20 +01:00
Peter Simons
51c6ca0643 hackage: update database snapshot to latest version 2018-02-23 17:59:06 +01:00
Peter Simons
fa6272678d haskell-stringbuilder: drop obsolete override for GHC 8.4.x 2018-02-23 17:58:18 +01:00
Peter Simons
81a9442fd0 haskell-language-c: drop unused version 0.7.0 2018-02-23 17:58:18 +01:00
Peter Simons
b5454a1380 haskell-doctest: update ghc 8.4.x version to 0.14.1 2018-02-23 17:58:18 +01:00
Michael Alan Dorman
f7ab190096 language-c: remove now-unnecessary overrides 2018-02-23 17:58:18 +01:00
Peter Simons
d035fc1e76 haskell-parsec: fix build with GHC 7.10.x 2018-02-23 17:58:17 +01:00
Peter Simons
d87fcc7d43 haskell-reflect: fix build with GHC 7.10.x 2018-02-23 17:58:17 +01:00
Peter Simons
a6b30cb43d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision
d165ed5500.
2018-02-23 17:57:58 +01:00
Peter Simons
d544c454bd LTS Haskell 10.6 2018-02-23 17:57:57 +01:00
Jörg Thalheim
1fbf33b78e zj-58: nitpicks 2018-02-23 16:38:26 +00:00
Will Dietz
19784ca4c9
Merge pull request #34477 from dtzWill/update/ncurses-6.1
ncurses6: 20171125 -> 6.1
2018-02-23 10:29:59 -06:00
Will Dietz
b42b1c8f22
Merge pull request #33698 from dtzWill/fix/texlive-luatex
texlive: don't remove luatex from packages that require it.
2018-02-23 10:26:02 -06:00
Jan Tojnar
3b512ca185
Merge pull request #35065 from jtojnar/fwupd-1.0.5
fwupd: 1.0.5 update & cleanups
2018-02-23 17:22:47 +01:00
Will Dietz
be6e6d2e04 ncurses 6.1: fix URL, accomodate captoinfo/infotocap along with tic 2018-02-23 10:18:05 -06:00
Will Dietz
edf201583d ncurses6: 20171125 -> 6.1
From my experience on slightly older tree,
a few *old* programs incorrectly rely on ncurses internal details
and may now require setting NCURSES_INTERNALS=1 to allow this badness.

Since this is release, we can grab it from gnu mirrors.
2018-02-23 10:17:23 -06:00
Will Dietz
22b5aebe9d
Merge pull request #34943 from dtzWill/feature/ngx_brotli-eustas
nginx/modules: use eustas' brotli module, google one is abandoned
2018-02-23 10:13:08 -06:00
Timo Kaufmann
89162cdd29 sage: explicitly use gfortran6
The recent change from gfortran=gfortran6 to gfortran=gfortran7 broke
the build.
2018-02-23 17:00:21 +01:00
Robin Gloster
36b0efc12f
python.pkgs.send2trash: fix on darwin 2018-02-23 16:52:27 +01:00
Nikolay Amiantov
9c1c424e52 cups service: fix client sockets
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
2018-02-23 18:51:39 +03:00
Nikolay Amiantov
998fdfdc94 cups: fix path to socket and run directory
We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.
2018-02-23 18:51:37 +03:00
Nikolay Amiantov
a984be41ab Merge branch 'master' into staging 2018-02-23 18:51:08 +03:00