Commit Graph

129334 Commits

Author SHA1 Message Date
Vladimír Čunát
de9382f132
Merge #35324: wayland-protocols: 1.11 -> 1.13 2018-02-24 22:30:09 +01:00
adisbladis
6f13032b6e
Merge pull request #35421 from flokli/CVE-zziplib-0.13.67
zziplib: 0.13.67 -> 0.13.68
2018-02-24 22:49:24 +08:00
Jörg Thalheim
bd72d71be2
Merge pull request #35424 from volth/protobuf-3.5
protobuf: 3.4.0 -> {3.4.1, 3.5.1.1}
2018-02-24 14:26:46 +00:00
John Ericson
9a5171bd22 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:39:51 -05:00
John Ericson
30f171d3e2
Merge pull request #35441 from obsidiansystems/android-clean
android sdk, libibert, libbfd: Clean ups
2018-02-24 02:29:24 -05:00
adisbladis
333d0f8859
Merge pull request #35449 from aaronschif/fix/homesick-update
homesick: 1.1.3 -> 1.1.6
2018-02-24 15:19:35 +08:00
adisbladis
ecdf3b3c89
Merge pull request #35448 from etu/testssl-update
testssl: 2.9.5-1 -> 2.9.5-2
2018-02-24 15:07:05 +08:00
Elis Hirwing
36725805be
testssl: 2.9.5-1 -> 2.9.5-2 2018-02-24 07:45:03 +01:00
Aaron Schif
da44efd014 homesick: 1.1.3 -> 1.1.6 2018-02-24 00:43:52 -06:00
John Ericson
7748972763 androidenv: Better platform conditionals 2018-02-24 01:43:10 -05:00
John Ericson
fe5ae8b550 androidenv: Clean up whitespace 2018-02-24 01:43:10 -05:00
John Ericson
1c00a8afd7 libiberty, libbfd: Make hash less fickle
These shouldn't respond to targetPlatform, but previously did. The
reason is somewhat complex: they would rely on the sources of gcc and
binutils, respectively, which *do* depend on the target platform.
Obviously the source is the same in all cases, but when those packages
are no longer preserved from bootstrapping stages their `src` attributes
use a different fetchurl resulting in a changed hash.
2018-02-24 01:43:09 -05:00
Jan Tojnar
c8b1b34123
Merge pull request #33459 from hamishmack/glib-networking-macos
glib-networking: Fix glib-networking for macOS
2018-02-24 06:29:05 +01:00
volth
ccbd01f9d4
protobuf: protobuf3_5 -> protobuf3_4 2018-02-24 02:10:32 +00:00
Jörg Thalheim
e9fdcc9662
Merge pull request #35425 from xeji/kubernetes-go-version
kubernetes: patch broken go version check
2018-02-24 01:38:57 +00:00
Jörg Thalheim
465d8b0fa9 kubernetes: use fetchpatch instead 2018-02-24 01:18:46 +00:00
Tuomas Tynkkynen
cb6172c3b1 fio: 3.4 -> 3.5 2018-02-24 02:59:25 +02:00
Tuomas Tynkkynen
ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02: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