Joachim Fasting
6977b94e9b
Revert "xserverArgs fuckup"
...
This reverts commit c2922a9157
.
See https://github.com/NixOS/nixpkgs/issues/19930
While the above commit is designed to allow GDM to work, it appears to
break other use cases. In particular, it breaks tests involving X
usage (e.g., i3wm[1] and firefox[2]), which makes it difficult to assess
the impact of other changes and so hampers development of unrelated
features.
https://hydra.nixos.org/build/42852015
https://hydra.nixos.org/build/42851666
2016-10-28 19:30:12 +02:00
Peter Simons
0cf03e02ae
git-annex: update to latest version
...
(cherry picked from commit b6df43a2df3c1b998a3c4ce5fb1e54a1691e3f41)
2016-10-28 16:52:51 +02:00
Peter Simons
4cfc164256
haskell-titlecase: drop obsolete overrides
...
(cherry picked from commit 118efe87b99cf475e6bcf2a559f4e23f4ab3f94f)
2016-10-28 16:52:51 +02:00
Peter Simons
2a19aea54a
haskell-stack: fix evaluation
...
(cherry picked from commit 9c31962c075933b6dae6ef5374f01768fe7a892b)
2016-10-28 16:52:51 +02:00
Peter Simons
e0ef9e9714
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.0.3 from Hackage revision
bb6bb10d46
.
2016-10-28 16:52:50 +02:00
Peter Simons
00659b83a3
LTS Haskell 7.5
...
(cherry picked from commit a6445ace6f978d865eaeb1683709eb28d9d1f5c7)
2016-10-28 16:51:52 +02:00
Peter Simons
5ff93c847f
Merge pull request #19946 from joachifm/fix-wai-app-file-cgi
...
haskellPackages.wai-app-file-cgi: fix build
2016-10-28 16:47:46 +02:00
Joachim F
5d5564e42f
Merge pull request #19654 from KoviRobi/remind-fix-tkremind
...
remind: fix tkremind
2016-10-28 16:43:19 +02:00
Joachim Fasting
620b364a87
haskellPackages.wai-app-file-cgi: fix build
...
Fixes https://github.com/NixOS/nixpkgs/issues/19611
Fixes https://github.com/NixOS/nixpkgs/issues/19612
2016-10-28 16:32:27 +02:00
Joachim Fasting
a1ecc5648a
nixpkgs doc: fix build
...
Ref e4cd45a30c
2016-10-28 16:28:31 +02:00
Tim Steinbach
2c0f926f8f
Merge pull request #19879 from TravisWhitaker/lmdb
...
lmdb: 0.9.16 -> 0.9.18
2016-10-28 10:00:18 -04:00
Graham Christensen
23dbb1a23a
Merge pull request #19857 from ElessarWebb/issue-19856-spatialite
...
libspatialite: link missing mod_spatialite.dylib
2016-10-28 09:01:55 -04:00
Daniel Peebles
46d0af7fec
Merge pull request #19941 from Ericson2314/stdenv-inherit-syntax
...
top-level: Make `stdenv/default.nix` more concise with `inherit (expr…
2016-10-28 08:06:10 -04:00
Christine Koppelt
162c65fc87
nodejs-0_10: remove
...
node.js 0.10 reaches end of LTS in a few days (see https://github.com/nodejs/LTS for details). Therefore I removed it and set 3 dependant packages to broken as they don't build anymore
2016-10-28 07:43:04 -04:00
Joachim F
1da6dd3eee
Merge pull request #19875 from joachifm/cjdns-for-upstream
...
Cjdns module enhancments
2016-10-28 13:01:58 +02:00
Frederik Rietdijk
cb2de9354f
Merge pull request #19932 from igsha/passlib
...
pythonPackages.passlib: 1.6.2 -> 1.6.5
2016-10-28 12:49:07 +02:00
John Ericson
d9bc6eb7f0
top-level: Make stdenv/default.nix
more concise with inherit (expr) id;
syntax
2016-10-27 21:47:46 -07:00
Jude Taylor
3cb116f708
qt48: fix eval
2016-10-27 20:28:22 -07:00
John Wiegley
c60b3e4bfc
haskellPackages.hakyll: Fix the Darwin build (broken tests)
2016-10-27 15:10:39 -07:00
Tim Steinbach
4a70445fff
Merge pull request #19903 from carlsverre/update/sysdig
...
sysdig: 0.10.0 -> 0.12.0
2016-10-27 14:10:39 -04:00
Peter Simons
5b60ccba05
Merge pull request #19871 from PierreR/master
...
hackage2nix: add hruby x86_64-linux to hydra
2016-10-27 19:51:02 +02:00
Igor Sharonov
b846d5198e
pythonPackages.passlib: 1.6.2 -> 1.6.5
2016-10-27 19:59:28 +03:00
Frederik Rietdijk
334d8705d5
Merge pull request #19928 from igsha/fasteners
...
pythonPackages.fasteners: 0.13.0 -> 0.14.1
2016-10-27 18:56:50 +02:00
Tim Steinbach
81b0db3915
Merge pull request #19910 from NeQuissimus/busybox_1_25_1
...
busybox: 1.24.2 -> 1.25.1
2016-10-27 12:47:46 -04:00
Tim Steinbach
2c2c6498d0
Merge pull request #19927 from NeQuissimus/docker_1_12_3
...
docker: 1.12.2 -> 1.12.3
2016-10-27 12:47:21 -04:00
Tim Steinbach
282532e702
docker: 1.12.2 -> 1.12.3
2016-10-27 12:46:04 -04:00
Graham Christensen
0425f7ab22
Merge pull request #19917 from grahamc/epiphany
...
Epiphany
2016-10-27 12:09:48 -04:00
Igor Sharonov
4383a45fa5
pythonPackages.fasteners: 0.13.0 -> 0.14.1
2016-10-27 19:03:56 +03:00
Peter Simons
84268a561a
Merge pull request #19921 from reinhardt/fix/duplicity-dependencies
...
duplicity: updated dependencies
2016-10-27 16:30:59 +02:00
Tim Steinbach
a5c1985fef
busybox: 1.24.2 -> 1.25.1
2016-10-27 09:31:21 -04:00
Joachim Fasting
dfdaea1240
grsecurity: 4.7.10-201610222037 -> 201610262029
2016-10-27 15:03:27 +02:00
Michael Raskin
95c5654caa
Merge pull request #19924 from esoeylemez/pari-unstable
...
pari-unstable: 2.8.0 -> 2.8.1, "alpha" -> "unstable".
2016-10-27 12:58:15 +00:00
Ertugrul Söylemez
9c8f6fb4fb
pari-unstable: 2.8.0 -> 2.8.1, "alpha" -> "unstable".
2016-10-27 14:48:03 +02:00
Graham Christensen
2f3b62375f
Merge pull request #19891 from NeQuissimus/kernel_4_9_rc2
...
kernel: 4.9-rc1 -> 4.9-rc2
2016-10-27 08:36:23 -04:00
Graham Christensen
ad2deee7d1
Merge pull request #19894 from NeQuissimus/kernel_3_18_44
...
kernel: 3.18.42 -> 3.18.44
2016-10-27 08:36:17 -04:00
Graham Christensen
c654ec0f25
Merge pull request #19893 from NeQuissimus/kernel_3_12_66
...
kernel: 3.12.63 -> 3.12.66
2016-10-27 08:36:10 -04:00
Graham Christensen
00e2bc22db
Merge pull request #19890 from NeQuissimus/kernel_3_10_104
...
kernel: 3.10.103 -> 3.10.104
2016-10-27 08:35:54 -04:00
Joachim Fasting
8180922d23
cjdns service: refactor cjdns hosts builder
...
The old version would export two lists to a bash builder and do pairwise
processing on the bash side. In the new version we instead generate a
logic free builder on the Nix side. This is not only conceptually
simpler but reduces the amount of code and intermediate values.
2016-10-27 14:15:54 +02:00
Joachim Fasting
9654e09b5a
cjdns service: ensure that generated passwd has requested length
...
`head -cNUM ... | tr -dc SET` might generate output containing fewer
than NUM characters. Given the limited alphabet, this could result in a
fairly weak passphrase. The construction `tr </dev/urandom | head
-cNUM`, however, is sure to give us the full `NUM`.
2016-10-27 14:15:53 +02:00
Joachim Fasting
e94bd6f31d
cjdns service: protect /home and /tmp
2016-10-27 14:15:52 +02:00
Joachim Fasting
5fba586650
cjdns service: better types
...
- types.string -> str, string is deprecated
- change type of confFile option to nullOr path, makes more sense
2016-10-27 14:15:52 +02:00
Joachim Fasting
afe67f28a3
cjdns service: use cfg.enable shortcut
2016-10-27 14:15:51 +02:00
Joachim Fasting
79d216b8f4
cjdns service: whitespace cleanup
2016-10-27 14:15:51 +02:00
Tim Steinbach
b86310fccf
wpa_supplicant: 2.5 -> 2.6 ( #19913 )
2016-10-27 13:57:56 +02:00
Zero King
c9204f7206
nmap: 7.12 -> 7.31 ( #19923 )
2016-10-27 13:55:08 +02:00
Joachim F
371a595f3c
Merge pull request #19874 from joachifm/opensmtpd-refactorings
...
Opensmtpd module refactorings
2016-10-27 13:39:09 +02:00
Frederik Rietdijk
600f4dd080
Merge pull request #19907 from veprbl/distutils_fix2
...
numpy: enable numpy.distutils patch only if it's also in distutils
2016-10-27 13:38:06 +02:00
Frederik Rietdijk
045644bd17
Merge pull request #19860 from AbigailBuccaneer/python-markdown-macros
...
pythonPackages.markdown-macros: init at 0.1.2
2016-10-27 13:36:32 +02:00
AbigailBuccaneer
6d4aa25e35
pythonPackages.markdown-macros: init at 0.1.2
2016-10-27 12:11:46 +01:00
Joachim F
126cc0b222
Merge pull request #19922 from romildo/upd.jwm
...
jwm: 1548 -> 1563
2016-10-27 13:04:49 +02:00