Commit graph

74276 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice
c05165ba5c saneBackends: don't add epson2 to dll.conf
It's already in there by default.
2015-12-26 19:50:17 +01:00
Tobias Geerinckx-Rice
cf699caf4d saneBackends: don't add option for 1 udev rule 2015-12-26 19:50:17 +01:00
Tobias Geerinckx-Rice
f3048aed1d eid-viewer: 4.1.4 -> 4.1.9 2015-12-26 19:50:17 +01:00
Jascha Geerds
d623916494 maintainers: Change my email address 2015-12-26 14:08:56 +01:00
Peter Simons
d9ad002b2c Prefer GnuPG 2.0.x by default.
"nix-env -iA gnupg" installs the 2.0.x version of GNU Privacy Guard. This patch
ensures that "nix-env -i gnupg" chooses the same version, instead of installing
GnuPG 2.1.x, which is considered a "development version".

Closes https://github.com/NixOS/nixpkgs/issues/11899.
2015-12-26 13:42:53 +01:00
Tobias Geerinckx-Rice
840dbe7def Merge pull request #11955 from jgillich/hostapd
hostapd: rename extraCfg -> extraConfig, added asserts
2015-12-26 13:37:07 +01:00
Peter Simons
2b16c569a0 Merge pull request #11952 from mayflower/ftp-mozilla
fix ftp.mozilla.org URLs
2015-12-26 13:14:05 +01:00
Jakob Gillich
ae4a7f9351 hostapd: rename extraCfg -> extraConfig, added asserts 2015-12-26 11:37:00 +01:00
Vladimír Čunát
5a2f0541a1 nixos/xserver: fix evaluation of xkbDir
I solved it this way because it seems the current state-of-the-art 89e983786
The problem was introduced in #11930. Close #11951 (a different solution).
2015-12-26 09:09:15 +01:00
Robin Gloster
59ed410d6d fix ftp.mozilla.org URLs
The old URLs time out.
2015-12-26 02:33:50 +00:00
Arseniy Seroka
37d0947e0c Merge pull request #11841 from phunehehe/archiveopteryx
add archiveopteryx 3.2.0
2015-12-26 00:36:55 +03:00
Arseniy Seroka
7e14e28a80 Merge pull request #11870 from lancelotsix/improve_slurm_service
Improve slurm service configuration
2015-12-25 18:36:18 +03:00
Lancelot SIX
4994f0f7d0 slurm service: add tests 2015-12-25 15:55:07 +01:00
Lancelot SIX
ca4c354789 slurm service: improve config 2015-12-25 15:54:35 +01:00
Arseniy Seroka
230c468eb6 Merge pull request #11906 from Painted-Fox/maildir-deduplicate
Add the python maildir-deduplicate package.
2015-12-25 17:40:25 +03:00
Shea Levy
384a4ca4e4 Merge branch 'fix-gwwndsz' of git://github.com/tk-ecotelecom/nixpkgs
Maybe option defaultGatewayWindowSize is used very rarely, but when it is used there will be an error.
2015-12-25 09:27:36 -05:00
Arseniy Seroka
801d4298dc Merge pull request #11938 from NeQuissimus/kotlinb4hf
kotlin: 1.0.0-beta-4583 -> 1.0.0-beta-4584
2015-12-25 17:27:06 +03:00
Arseniy Seroka
93d26d7206 Merge pull request #11935 from taku0/thunderbird-bin-38.5.0
thunderbird-bin: 38.4.0 -> 38.5.0
2015-12-25 17:26:54 +03:00
Arseniy Seroka
0b6f76a1d3 Merge pull request #11934 from makefu/cvs2svn
cvs2svn: 2.0.1 -> 2.4.0
2015-12-25 17:26:43 +03:00
Arseniy Seroka
6a9c0a4010 Merge pull request #11933 from taku0/firefox-bin-43.0.2
firefox-bin: 43.0.1 -> 43.0.2
2015-12-25 17:26:17 +03:00
Arseniy Seroka
97ece3b66b Merge pull request #11932 from leenaars/patch-3
blink: 1.4.1 -> 1.4.2
2015-12-25 17:26:08 +03:00
Arseniy Seroka
4f2f99d9b6 Merge pull request #11930 from exi/xdgDir-configurable
xserver: make xkbdir configurable
2015-12-25 17:25:28 +03:00
Dan Peebles
6878b2b21d libvirt: make it build on darwin
Not sure if it works, but it no longer fails miserably at build time
2015-12-24 23:34:47 -05:00
Dan Peebles
50a00101c1 dnsmasq: get it working on darwin again 2015-12-24 23:27:31 -05:00
Timofei Kushnir
5925f9f709 Network script module fix 2015-12-25 03:43:49 +03:00
Dan Peebles
ca277c2257 python-gnupg: use gnupg1 instead of 2 2015-12-24 22:11:41 +00:00
Moritz Ulrich
c11f6c9dc7 rustc-1.5.0: Don't force bundled LLVM 2015-12-24 21:14:06 +01:00
Robin Gloster
b26aa99d9d rustc: 1.4.0 -> 1.5.0 2015-12-24 21:14:06 +01:00
Moritz Ulrich
b45161fbbe llvm: Add backported patch for Rust.
Rust runs into a bug with LLVM 3.7.0 that's fixed in the upcoming
release 3.7.1. This commit backports this fix.
2015-12-24 21:14:06 +01:00
Dan Peebles
e5e8d3e250 libvirt-python: fix broken version that I included by accident in 8c42b26fa2 2015-12-24 20:02:38 +00:00
Dan Peebles
8c42b26fa2 libvirt: switch who makes assertions about whose version
Previously, the native libvirt package was making an assertion that
the dependent Python package had a compatible version. This commit
switches that so that the Python package makes the assertion, since
it makes more sense to me to have a child package making an
assertion about its parent than vice versa.
2015-12-24 19:59:44 +00:00
Shea Levy
c26062884b Merge branch 'pr-cd-nomodeset' of git://github.com/dezgeg/nixpkgs 2015-12-24 13:50:26 -05:00
Tim Steinbach
84accab674 kotlin: 1.0.0-beta-4583 -> 1.0.0-beta-4584 2015-12-24 13:24:57 -05:00
Tuomas Tynkkynen
269f261c73 installation-cd: Add separate boot entry that has 'nomodeset'
We seem to be in an unfortunate situation: booting without 'nomodeset'
causes hangs when booting on some NVIDIA cards (6948c3ab80), but on the
other hand adding 'nomodeset' prevents X from starting on other hardware
(e.g. issue #10381 and my Thinkpad X250 with an integrated Broadwell GPU).

Attempt to remedy this situation a bit by adding a separate entry in the
ISOLINUX menu (with the non-'nomodeset' being the default).
2015-12-24 20:12:26 +02:00
Ryan Seto
ac79d3ad61 pythonPackages.maildir-deduplicate: init at 1.0.2 2015-12-24 12:06:59 -05:00
Thomas Tuegel
6e27454728 sddm: build with Qt 5.5 2015-12-24 10:08:32 -06:00
makefu
47f17939c2 cvs2nix: 2.0.1 -> 2.4.0 2015-12-24 16:58:01 +01:00
taku0
66cddef221 thunderbird-bin: 38.4.0 -> 38.5.0 2015-12-25 00:21:01 +09:00
taku0
fe287dea9b firefox-bin: 43.0.1 -> 43.0.2 2015-12-24 23:08:28 +09:00
Robert Helgesson
d491005da1 josm: init at 9060 2015-12-24 14:50:11 +01:00
Robert Helgesson
8c4bfb747e gpsprune: init at 18.2 2015-12-24 14:48:57 +01:00
leenaars
767f145a60 blink: 1.4.1 -> 1.4.2 2015-12-24 14:41:23 +01:00
Tobias Geerinckx-Rice
f6847f9dfb Merge pull request #11929 from leenaars/patch-2
sipsimple: 1.5.1 -> 1.6.0
2015-12-24 13:54:23 +01:00
Reno Reckling
92e48a4383 xserver: make xkbdir configurable 2015-12-24 13:45:27 +01:00
leenaars
a5e9422560 sipsimple: 2.5.1 -> 2.6.0
Updated SIP Simple SDK to new version, is a dependency for e.g. Blink (which needs to be updated as the old version does not build anymore because the tarball has been removed)
2015-12-24 13:29:43 +01:00
Robin Gloster
37ebb4c2ac rustfmt: 2015-12-08 -> 2015-12-23 2015-12-24 13:20:24 +01:00
Robin Gloster
021c2cad22 rustRegistry: 2015-12-10 -> 2015-12-23 2015-12-24 13:20:24 +01:00
Christian Albrecht
dad3cd7928 jzmq: fix missing shasum in fetchgit src 2015-12-24 13:20:24 +01:00
Robin Gloster
2faea53f8e cargo: 0.6.0 -> 0.7.0 2015-12-24 13:20:24 +01:00
Aristid Breitkreuz
6ef92e0d11 Merge pull request #11914 from nckx/update-darktable
darktable: 1.6.8 -> 1.6.9
2015-12-24 13:11:41 +01:00