Commit Graph

14366 Commits

Author SHA1 Message Date
Frederik Rietdijk
55e0f12761 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
Frederik Rietdijk
14480a9288
Merge pull request #34542 from womfoo/fix/bonfire-deps
bonfire: bump arrow dependency (fixes build)
2018-02-03 08:30:54 +00:00
Frederik Rietdijk
274d4eaa00
Merge pull request #34493 from Gricad/udocker
udocker: init at 1.1.1
2018-02-03 08:07:35 +00:00
Tuomas Tynkkynen
10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
Kranium Gikos Mendoza
d135d14214 bonfire: bump arrow dependency 2018-02-03 10:35:14 +11:00
Tuomas Tynkkynen
0bfa9a9dc2 ethtool: 4.13 -> 4.15 2018-02-02 18:15:18 +02:00
Joachim F
374d6dcf2a
Merge pull request #34509 from dotlambda/ttwatch
ttwatch: 2017-12-31 -> 2018-02-01
2018-02-02 15:40:39 +00:00
Bruno Bzeznik
b2cf8cff7d udocker: init at 1.1.1 2018-02-02 13:59:59 +01:00
Jörg Thalheim
9a5fe79d07
Merge pull request #34397 from griff/fix/awstats-tools
awstats: add tools directory
2018-02-02 12:48:07 +00:00
adisbladis
65170e9404
Merge pull request #34504 from dywedir/tlp
tlp: 1.0 -> 1.1
2018-02-02 12:28:18 +08:00
Jan Tojnar
2f98747cf7
Merge remote-tracking branch 'catern/upsup' 2018-02-02 01:12:19 +01:00
Tuomas Tynkkynen
583af89fc0 ncdu: 1.12 -> 1.13 2018-02-02 01:33:43 +02:00
dywedir
4311bebd45 tlp: 1.0 -> 1.1 2018-02-01 23:09:20 +02:00
Brian Olsen
e9559e6b09
awstats: add tools directory 2018-02-01 18:18:28 +01:00
Vladimír Čunát
ec99a3de1b
texlive: add comments, whitespace cleanup
Fixes #34490.  The FIXME has been long obsolete.
2018-02-01 15:55:52 +01:00
Robert Schütz
8377958fdd ttwatch: 2017-12-31 -> 2018-02-01 2018-02-01 10:27:50 +01:00
Vladimír Čunát
2fb4606f38
Merge branch 'master' into staging
Haskell rebuild.
Hydra: ?compare=1430378
2018-02-01 09:36:23 +01:00
Andreas Rammhold
76da69e355
Merge pull request #34478 from dotlambda/spectre-meltdown-checker
spectre-meltdown-checker: 0.33 -> 0.34
2018-02-01 01:42:49 +00:00
Herwig Hochleitner
f29b993825 i2p: 0.9.32 -> 0.9.33 2018-02-01 00:43:03 +01:00
Robert Schütz
6f3e450bdf spectre-meltdown-checker: 0.33 -> 0.34 2018-02-01 00:27:46 +01:00
John Ericson
b8e8265db0 moreutils: Fix eval
Was broken in 561b9ca8ac.
2018-01-31 17:20:09 -05:00
Eelco Dolstra
75a20284f4 nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 2018-01-31 22:24:50 +01:00
Eelco Dolstra
ef351646ba Revert "Restore "nixUnstable: rename to nix-unstable""
This reverts commit 695027f61c.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
2018-01-31 22:24:24 +01:00
Pascal Wittmann
561b9ca8ac
moreutils: 0.61 -> 0.62 2018-01-31 21:56:01 +01:00
Pascal Wittmann
505cebebd3
pdf2djvu: 0.9.7 -> 0.9.8 2018-01-31 21:43:20 +01:00
Edward Tjörnhammar
0307a1acf6
i2pd: 2.17.0 -> 2.18.0 2018-01-31 21:28:08 +01:00
Spencer Baugh
729cf93ffb supervise: 1.1.0 -> 1.2.0 2018-01-31 04:56:08 +00:00
aszlig
2e4aded366
beets-alternatives: Fix tests against beets 1.4.6
Since the bump of beets to version 1.4.6 in e5fab33efd
the tests no longer run successfully because beets 1.4.6 introduces a
breaking API change for the Item.move() method which now instead of just
passing copy=True the operation is now passed using a different
"operation" keyword argument.

Unfortunately the original repository of beets-alternatives is
unmaintained since 3 years and thus there is no upstream fix available
at the moment.

However, there is a fork maintained by @wisp3rwind, which addresses this
problem (wisp3rwind/beets-alternatives@33c6525ed4)
and a bunch of other fixes.

The reason why I'm not using the patch from @wisp3rwind is that it
simply doesn't apply against beets-alternatives 0.8.2, but my patch here
essentially does the same.

Signed-off-by: aszlig <aszlig@nix.build>
Upstream issue: geigerzaehler/beets-alternatives#13
Cc: @Profpatsch
2018-01-31 04:39:21 +01:00
Vladimír Čunát
c9171e5a4c
Merge branch 'master' into staging
Hydra: ?compare=1430035
2018-01-30 19:51:33 +01:00
Tuomas Tynkkynen
ab5357b80d eternal-terminal: init at 4.1.2 2018-01-30 13:01:58 +02:00
André-Patrick Bubel
fe0a15eaca btrbk: install to bin 2018-01-29 20:15:43 +01:00
WilliButz
62ad671a80
highlight: 3.41 -> 3.42 2018-01-29 17:43:13 +01:00
Michael Weiss
b05ad671fb signing-party: 2.6 -> 2.7 2018-01-29 16:14:44 +01:00
Franz Pletz
60331e6e90
curl: 7.57.0 -> 7.58.0 (security)
Fixes: CVE-2018-1000005, CVE-2018-1000007
2018-01-29 14:15:56 +01:00
dywedir
44ebac05fe exfat: 1.2.4 -> 1.2.7 2018-01-29 13:02:13 +02:00
adisbladis
9e830ed45b
Merge pull request #34374 from 4z3/urlwatch-2.8
urlwatch: 2.7 -> 2.8
2018-01-29 18:07:52 +08:00
Franz Pletz
eaaca14c30
p7zip: add patch to fix CVE-2017-17969 2018-01-29 10:54:45 +01:00
tv
c945f64454 urlwatch: 2.7 -> 2.8 2018-01-29 09:15:23 +01:00
Graham Christensen
e2a54266c4
openssh: Build with Kerberos by default
This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536.
which reverted f596aa0f4a
to move it to staging
2018-01-28 16:36:01 -05:00
Graham Christensen
15a4977409
Revert "openssh: Build with Kerberos by default"
This reverts commit a232dd66ee.

Moving to staging
2018-01-28 16:36:01 -05:00
Aneesh Agrawal
716d1612af
openssh: Build with Kerberos by default
This can be disabled with the `withKerberos` flag if desired.
Make the relevant assertions lazy,
so that if an overlay is used to set kerberos to null,
a later override can explicitly set `withKerberos` to false.

Don't build with GSSAPI by default;
the patchset is large and a bit hairy,
and it is reasonable to follow upstream who has not merged it
in not enabling it by default.
2018-01-28 16:36:00 -05:00
Graham Christensen
f596aa0f4a
Revert "openssh: Build with Kerberos by default"
This reverts commit a232dd66ee.

Moving to staging
2018-01-28 16:32:52 -05:00
Aneesh Agrawal
a232dd66ee
openssh: Build with Kerberos by default
This can be disabled with the `withKerberos` flag if desired.
Make the relevant assertions lazy,
so that if an overlay is used to set kerberos to null,
a later override can explicitly set `withKerberos` to false.

Don't build with GSSAPI by default;
the patchset is large and a bit hairy,
and it is reasonable to follow upstream who has not merged it
in not enabling it by default.
2018-01-28 16:30:46 -05:00
Franz Pletz
5f57b61f27
sleuthkit: 4.2.0 -> 4.5.0 2018-01-28 22:19:54 +01:00
Franz Pletz
bf9c40dc61
units: 2.14 -> 2.16 2018-01-28 19:59:43 +01:00
Franz Pletz
f7f11b81a1
sudo: 1.8.21p2 -> 1.8.22 2018-01-28 19:59:43 +01:00
Franz Pletz
332f701568
testdisk: 7.0 -> 7.1 2018-01-28 19:59:43 +01:00
Franz Pletz
4db7cac9e3
pngcrush: 1.8.1 -> 1.8.13 2018-01-28 19:59:42 +01:00
Franz Pletz
5031b5e0c8
optipng: 0.7.6 -> 0.7.7 2018-01-28 19:59:42 +01:00
Graham Christensen
f492197e56
Merge pull request #34328 from mimadrid/update/tmuxinator-0.10.1
tmuxinator: 0.10.0 -> 0.10.1
2018-01-28 13:54:01 -05:00