Commit graph

63938 commits

Author SHA1 Message Date
William A. Kennington III 9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
William A. Kennington III 40b66f6131 Revert "libmicrohttpd: 0.9.41 -> 0.9.42"
This reverts commit 89d9a6079c.
2015-06-06 12:02:49 -07:00
William A. Kennington III d30d0c783d Revert "pam: Factor out dependencies"
This reverts commit 7141d96bde.
2015-06-06 12:02:38 -07:00
William A. Kennington III 9882cecb10 Revert "Use mit5 as kerberos since it is better supported"
This reverts commit 80648d7e24.
2015-06-06 12:02:26 -07:00
William A. Kennington III 3d92654e13 Revert "heimdal: No need to override openldap anymore"
This reverts commit 4fa5cc71f2.
2015-06-06 12:02:18 -07:00
William A. Kennington III d5ac5c00d8 Revert "heimdal: 1.5.3 -> 2015-05-26"
This reverts commit 1e14f0a055.
2015-06-06 12:02:06 -07:00
William A. Kennington III b073b56325 Revert "Use libheimdal instead of heimdal"
This reverts commit 06c9915ed1.
2015-06-06 12:01:59 -07:00
William A. Kennington III cfd831a40a Revert "samba: Use built in kerberos"
This reverts commit 6b17264e08.
2015-06-06 12:01:50 -07:00
William A. Kennington III c6175f8161 Revert "heimdal: Remove more references"
This reverts commit 7b1336d2f1.
2015-06-06 12:01:42 -07:00
Arseniy Seroka ee8825935f google-music: beta_1.0.129.6633 -> beta_1.0.182.3607 2015-06-06 20:43:09 +03:00
Vincent Laporte 142400b8d5 ocaml-merlin: update from 2.1.2 to 2.2 2015-06-06 17:42:24 +02:00
Arseniy Seroka 4cf3596fda Merge pull request #8198 from vbgl/re-1.4
ocaml-re: update from 1.3.1 to 1.4.0
2015-06-06 15:58:40 +03:00
Arseniy Seroka 5395128a36 Merge pull request #8196 from taku0/flashplayer_2.2.202.460
flashplayer: Update from 11.2.202.457 -> 11.2.202.460
2015-06-06 15:58:24 +03:00
Arseniy Seroka 90f4843f45 f2fs-tools: 1.3.0 -> 1.4.1 2015-06-06 15:22:02 +03:00
Tobias Geerinckx-Rice 8c0389ac01 python-packages: prompt_toolkit -> 0.39
Fixes:
- Fixed layout.py example.
- Fixed eventloop for Python 64bit on Windows.
- Fix in history.
- Fix in key bindings.
2015-06-06 12:28:48 +02:00
Vincent Laporte e32d6f6b52 ocaml-re: update from 1.3.1 to 1.4.0 2015-06-06 12:08:09 +02:00
taku0 6aa10201cc flashplayer: Update from 11.2.202.457 -> 11.2.202.460 2015-06-06 18:38:18 +09:00
Peter Simons 08c4a192e2 ghc-7.10.x.nix: remove obsolete re-build hacks from the package set configuration 2015-06-06 09:43:15 +02:00
Bjørn Forsman 52184b53c0 Revert "Revert "Explicitly pass -pthread flag to fix the build after some updates""
This reverts commit 6cfea50ad1.

I think the reason for the revert was because of patch dependencies. We really
need this patch to fix heimdal build.

Or else:

  $ nix-build -A heimdal
  ...
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_getspecific'
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_key_create'
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_setspecific'
  collect2: error: ld returned 1 exit status
  Makefile:509: recipe for target 'tc' failed
  make[2]: *** [tc] Error 1
2015-06-06 09:23:33 +02:00
Peter Simons 7e04b7319c haskell: disable parallel compilation for libraries to mitigate the effects of GHC's non-deterministic library ID bug
Further details can be found at <https://github.com/peti/ghc-library-id-bug>
and <https://ghc.haskell.org/trac/ghc/ticket/4012>.
2015-06-05 23:55:01 +02:00
Thomas Tuegel fbcdb66264 kdeApps_15_04.ktp-text-ui: add missing kdbusaddons dependency 2015-06-05 16:39:50 -05:00
Thomas Tuegel 217506aca1 Update kde-applications-15.04.1 -> kde-applications-15.04.2 2015-06-05 16:39:50 -05:00
Arseniy Seroka 70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Ricardo M. Correia 9176f73cee buildRustPackage: Cosmetic improvement 2015-06-05 19:18:45 +02:00
lethalman b19cae8544 Merge pull request #8185 from desiderius/master
python-packages: updates pyinotify 0.9.3 to 0.9.5
2015-06-05 18:38:36 +02:00
lethalman 9683743e68 Merge pull request #8191 from ragnard/wrk-update
wrk: Update from 3.1.2 to 4.0.0 (master)
2015-06-05 18:31:18 +02:00
goibhniu c17aa9d3c6 Merge pull request #7875 from fkz/digikam
updated digikam to version 4.10.0
2015-06-05 17:53:55 +02:00
Ragnar Dahlén 45cad45e4d wrk: Update from 3.1.2 to 4.0.0 (master) 2015-06-05 15:15:21 +01:00
Eelco Dolstra a70d0275e2 nixUnstable: Bump
This should fix the NixOS installer tests.
2015-06-05 13:53:49 +02:00
Peter Simons 7acb77ca2b cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag 2015-06-05 12:42:34 +02:00
Peter Simons c1c4ca08de youtube-dl: clean up the expression and document the pandoc situation
This patch resolves https://github.com/NixOS/nixpkgs/pull/8184.
2015-06-05 10:38:35 +02:00
Michael Phillips 86a511a398 youtube-dl: remove unnecessary pandoc dependency 2015-06-05 10:31:59 +02:00
desiderius daf0e6500d python-packages: updates pyinotify 0.9.3 to 0.9.5 2015-06-05 09:20:46 +02:00
William A. Kennington III 6d42d6928e Merge pull request #8111 from codyopel/musescore
musescore: 2.0.0 -> 2.0.1
2015-06-05 00:13:02 -07:00
William A. Kennington III 04f0ab105c Merge pull request #8105 from codyopel/beets
Updated Beets and dependenecies
2015-06-04 23:59:14 -07:00
Rok Garbas a84e6336bd cygwin: make coreutils build on cygwin 2015-06-05 00:39:38 +02:00
Rok Garbas 9e99a66c24 cygwin: make flex building on cygwin 2015-06-05 00:39:29 +02:00
Rok Garbas 8908471ecc cygwin: add needed patches for boost 1.57.0 to build 2015-06-05 00:39:15 +02:00
Peter Simons fdc1887a6e doc: add user's guide for the Haskell infrastructure
Resolves https://github.com/NixOS/nixpkgs/issues/4941.
2015-06-05 00:14:58 +02:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tobias Geerinckx-Rice 860589227b eid-mw: don't install useless about-eid-mw.desktop 2015-06-04 20:31:05 +02:00
Eelco Dolstra 99d2e80d97 In VM builds, connect stdin to /dev/null
This prevents programs from hanging while trying to read from stdin.
2015-06-04 20:08:56 +02:00
Allen Nelson 8bf170f280 Remove lingering dependence on atlas with numpy.
Closes https://github.com/NixOS/nixpkgs/pull/8133.
2015-06-04 20:07:41 +02:00
Peter Simons f1587a2d1e Move numpy-scipy-support.nix file from the top-level to development/python-modules.
The top-level is not supposed to contain sub-directories, IMHO.
2015-06-04 19:59:46 +02:00
Eelco Dolstra 3ede0a64a2 make: Don't segfault if we can't get a tty name
This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
2015-06-04 19:47:34 +02:00
Tobias Geerinckx-Rice fcee71066b rsstail -> 1.9.1 2015-06-04 18:35:44 +02:00
Tobias Geerinckx-Rice 921249e13d keyfinder -> 1.26 2015-06-04 18:35:43 +02:00
Tobias Geerinckx-Rice 5cb1af03ef libkeyfinder -> 0.11 (final) 2015-06-04 18:35:43 +02:00
Tobias Geerinckx-Rice f5c5e4af74 perl-packages: IOSocketSSL -> 2.016
Many, many fixes. Too many to list here. See:
<https://github.com/noxxi/p5-io-socket-ssl/blob/master/Changes>
2015-06-04 18:35:43 +02:00