3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

94724 commits

Author SHA1 Message Date
Vladimír Čunát 135a914ded
Merge #19514: cmake: improve if without glibc
and bootstrap in parallel.
2016-10-29 17:08:50 +02:00
Vladimír Čunát cd436079fc openldap: fixup build on Darwin, probably
Introduced by #19288.
2016-10-29 16:37:48 +02:00
Vladimír Čunát e9fee02ff9 Merge branch 'master' into staging 2016-10-29 15:25:59 +02:00
Domen Kožar ffc6e46dad Merge pull request #19962 from canndrew/openra-update
openra: 20160508 -> 20161019
2016-10-29 15:23:34 +02:00
Domen Kožar 8c018f6ca7 Merge pull request #19957 from acowley/tinyxml-install-name
tinyxml: fix install name on darwin
2016-10-29 15:20:06 +02:00
Gabriel Ebner 3feb910354 vdirsyncer: 0.13.1 -> 0.14.0 2016-10-29 09:01:07 -04:00
Gabriel Ebner c2169369f0 khal: 0.8.2 -> 0.8.4 2016-10-29 08:58:30 -04:00
Joachim F 7bc5578d3f Merge pull request #19969 from tk-ecotelecom/fix-grsecurity
grsecurity: fix 'isYes' and 'isNo'
2016-10-29 14:50:23 +02:00
Frederik Rietdijk 8bb63d11e6 Merge pull request #19964 from f--t/master
scikit-image: updated version and dependencies
2016-10-29 14:12:24 +02:00
Vladimír Čunát d298b5ed26
Merge #19960: fetchfile: remove
vcunat: it is unused, and it would better be implemented via a
fixed-output derivation instead of manually checking the hash
(if someone actually needed this).
2016-10-29 14:10:01 +02:00
Frederik Rietdijk 3d5600d8b8 Merge pull request #19866 from guillaumekoenig/fix/add-reno-1.8.0
reno: init at 1.8.0
2016-10-29 14:07:45 +02:00
Jörg Thalheim 5596aa9ce4 Merge pull request #19288 from DerTim1/openldap-enable-modules
openldap: enable module support
2016-10-29 14:06:37 +02:00
Joachim F e6df5614a9 Merge pull request #19959 from groxxda/tnef
tnef: remove duplicate file
2016-10-29 13:46:23 +02:00
Joachim F ffb5f5a140 Merge pull request #19937 from Ericson2314/rm-dead-guile-tests
Delete guile-2-test.nix; grep says its dead code
2016-10-29 13:44:48 +02:00
Guillaume Koenig dd04af4fcc reno: init at 1.8.0 2016-10-29 13:30:18 +02:00
Timofei Kushnir faa6f9b6b3 grsecurity: fix 'isYes' and 'isNo' 2016-10-29 14:26:06 +03:00
ft 2ad39a5670 updated version and dependencies 2016-10-29 01:17:03 -07:00
Andrew Cann de8e30c577 openra: 20160508 -> 20161019 2016-10-29 13:33:34 +08:00
Alexander Ried cc523714a6 fetchfile: remove unused file 2016-10-29 07:28:52 +02:00
Andrew Cann 40cab6182c OpenNAT: init at 2.1.0 2016-10-29 13:28:24 +08:00
Alexander Ried 03457629cf tnef: remove duplicate file 2016-10-29 07:25:49 +02:00
Hans-Christian Esperer fa4167c0a1 openmpt123: Add libsndfile and flac as dependencies (#19904) 2016-10-29 05:38:51 +02:00
José Romildo Malaquias b1d3998015 mplus-outline-fonts: 061 -> 062 (#19948) 2016-10-29 05:37:18 +02:00
Daniel Peebles ed9b30728f Merge pull request #19947 from zimbatm/awscli-1.11.10
Awscli 1.11.10
2016-10-28 22:30:50 -04:00
Graham Christensen 55909c32d1 Merge pull request #16286 from kirelagin/gpg2-osx
Enhance gnupg experience on OS X
2016-10-28 21:35:37 -04:00
Joachim Fasting 15d81fe30a
electrum: 2.7.9 -> 2.7.11 2016-10-29 03:04:12 +02:00
Joachim Fasting a79695e3e2
dnscrypt-wrapper: 0.2.1 -> 0.2.2
Upstream changed distribution terms to what they call "0-clause BSD" aka
ISC.
2016-10-29 03:04:03 +02:00
Joachim Fasting 420cf50838
dnscrypt-proxy module: minor config example tweaks
- Indentation
- unbound automatically handles local forward addresses
2016-10-29 03:04:00 +02:00
Joachim Fasting d198e474a8
dnscrypt-proxy service: remove use of mkEnableOption 2016-10-29 03:03:50 +02:00
Anthony Cowley 3a979c31d3 tinyxml: fix install name on darwin
Things linked with tinyxml would previously reference the bare "libtinyxml.dylib"
name.
2016-10-28 19:11:58 -04:00
Kirill Elagin 22f2f6e045 gnupg: Use pintenty-mac on Darwin by default 2016-10-29 00:24:56 +03:00
Kirill Elagin 213dc21443 gnupg: Variable path to pinentry
This is needed for pinentry-mac which has the pinentry binary
at an OS X-ish path.
2016-10-29 00:24:51 +03:00
Robert Helgesson 236a32069a
perl-DBIx-Class: remove myself as maintainer 2016-10-28 23:07:50 +02:00
Robert Helgesson 268568a74a
eclipses: use HTTPS download URLs 2016-10-28 23:05:09 +02:00
aszlig 3d4b6257d6
nixos/stage1: Fix local keyword outside function
Thanks to @NeQuissimus in a5c1985fef for
updating busybox, which since version 1.25 doesn't allow local variables
outside of functions anymore (which is the desired behaviour).

See the following upstream commit of busybox which is the change that
let's this problem surface:

https://git.busybox.net/busybox/commit/?id=ef2386b80abfb22ccb697ddbdd4047aacc395c50

So this has been an error I've made on my end in
67223ee205, because I originally had a
function for killing the processes but desired to inline it because it's
only used in one place.

This fixes the boot-stage1 NixOS test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-10-28 22:50:44 +02:00
Kirill Elagin 62d9edb9b9 gnupg: Rename parameter x11Support -> guiSupport
Because it is really about GUI in general, not X11 (e.g. OS X).
2016-10-28 23:18:57 +03:00
Frederik Rietdijk 9ab271a4be Merge pull request #19952 from igsha/patch
pythonPackages.patch: init at 1.16
2016-10-28 20:35:53 +02:00
Jude Taylor 872087a8a6 disable DBIxClass tests again 2016-10-28 11:29:35 -07:00
Igor Sharonov 5d83aaee96 pythonPackages.patch: init at 1.16 2016-10-28 21:21:13 +03:00
Tim Steinbach ce16bb4c0b Merge pull request #19954 from NeQuissimus/sbt_0_13_13
sbt: 0.13.12 -> 0.13.13
2016-10-28 14:08:55 -04:00
Tim Steinbach a79fdce0b8
sbt: 0.13.12 -> 0.13.13 2016-10-28 14:08:20 -04:00
Frederik Rietdijk beef906d2e Merge pull request #19882 from FRidh/hplip
hplip: use mkPythonDerivation
2016-10-28 20:00:08 +02:00
Eelco Dolstra be59f34b2c Merge pull request #19949 from yotann/nc6-remove
nc6: remove
2016-10-28 19:48:17 +02:00
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
Sean Bartell 64b1fe26a7 nc6: remove
The download sources are gone and the program is obsolete now that
the popular versions of netcat support IPv6. See:
http://www.deepspace6.net/projects/netcat6.html
2016-10-28 10:54:33 -05:00
Peter Simons 0cf03e02ae git-annex: update to latest version
(cherry picked from commit b6df43a2df)
2016-10-28 16:52:51 +02:00
Peter Simons 4cfc164256 haskell-titlecase: drop obsolete overrides
(cherry picked from commit 118efe87b9)
2016-10-28 16:52:51 +02:00
Peter Simons 2a19aea54a haskell-stack: fix evaluation
(cherry picked from commit 9c31962c07)
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 a6445ace6f)
2016-10-28 16:51:52 +02:00