3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

120 commits

Author SHA1 Message Date
Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Vladimír Čunát a283bec71c glibc: fix CVE-2014-5119 by Debian patch 2014-08-30 09:44:07 +02:00
Vladimír Čunát a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Michael Raskin d87b867a24 Merge pull request #3225 from hrdinka/move-glibc-multi
glibc_multi: move glibc_multi script out of all-packages.nix
2014-08-29 01:08:04 +04:00
Vladimír Čunát 3ec413cece WIP 2014-08-25 15:30:46 +02:00
Vladimír Čunát c96f4d7949 gcc, glibc: merge changes from original multiple-output
Can't be done automatically because of file copies/moves.
2014-08-25 10:29:54 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Vladimír Čunát 9253a95f6b glibc: fix CVE-2014-0475 by upstream patches
https://sourceware.org/bugzilla/show_bug.cgi?id=17137
2014-08-04 16:49:57 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Christoph Hrdinka d82c95cf17 glibc_multi: move glibc_multi script out of all-packages.nix 2014-07-10 09:55:50 +02:00
Vladimír Čunát cbe7e0b5f0 glibc: fix a math problem by upstream patch 2014-03-08 10:23:38 +01:00
Ian-Woo Kim 05068ac554 glibc: do not use system ld.so.preload (close #1788)
Modified according to the PR comment.
2014-02-28 16:39:12 +01:00
Eelco Dolstra a5ea0a3f50 glibc: Update to 2.19 2014-02-14 16:01:47 +01:00
Eelco Dolstra de605827f8 glibc: Rename 2.18 -> 2.19 2014-02-14 15:49:50 +01:00
Vladimír Čunát c6b92053c9 glibc: pull a bug work-around from Arch
This should work around some of our build problems,
e.g. http://hydra.nixos.org/build/7575893/nixlog/1/tail-reload

Cf. #1446
2014-01-02 23:40:44 +01:00
Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Eelco Dolstra 53567db1d5 glibc: Apply upstream patch for scanf regression
https://sourceware.org/bugzilla/show_bug.cgi?id=15917

This broke Atlas.

http://hydra.nixos.org/build/7072399
http://sourceforge.net/p/math-atlas/discussion/75123/thread/dc45bb67/
2013-12-16 17:12:19 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Eelco Dolstra da607b2110 Indent sensibly 2013-12-03 09:22:58 -05:00
Eelco Dolstra 929b7bdc4b Merge remote-tracking branch 'origin/master' into glibc-2.18
Conflicts:
	pkgs/development/libraries/glibc/2.17/locales.nix
2013-12-03 09:22:24 -05:00
Eelco Dolstra 101f62ad33 glibc: Various CVE fixes
CVE-2012-4412, CVE-2012-4424, CVE-2013-4237, CVE-2013-4332,
CVE-2013-4458, CVE-2013-4788.
2013-12-02 11:47:06 -05:00
Vladimír Čunát 8c1a49bf7a glibcLocales: refactoring fe32d12 according to comments 2013-11-27 21:34:14 +01:00
Eelco Dolstra ab377d2a3d glibc: Don't install sln
It's a 835 KiB utility to create symlinks that (AFAIK) is not used
anywhere.  It also has no use case in NixOS.
2013-11-26 11:17:39 +01:00
Eelco Dolstra a652895cc9 Remove tabs 2013-11-26 11:01:53 +01:00
Ian-Woo Kim fe32d12ef7 glibc-locales: don't depend on /nix/store location
previously, $TMPDIR/nix/store is hard-coded so that only building and installing is correct with /nix/store
See #1273.
2013-11-25 08:31:48 +01:00
Eelco Dolstra 0c69649a55 glibc: Remove unused version 2.13 2013-11-15 13:26:35 +01:00
Eelco Dolstra 35713f531e glibc: Update to 2.18
Note: the glibc-elf-localscope.patch no longer applies.  It's not
clear if we still need it, but openSUSE (where it came from) no longer
applies it.
2013-11-15 12:35:49 +01:00
Eelco Dolstra 5b22285b53 glibc: Move 2.17 -> 2.18 2013-11-15 12:26:37 +01:00
Peter Simons 9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Lluís Batlle i Rossell 2fbbe2c1a9 Adding a glibc variant with the memusage program 2013-08-20 10:15:40 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Vladimír Čunát c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Peter Simons aa2044099d glibc: add "/run/current-system/sw/bin" to the default search path returned by "getconf CS_PATH" 2013-06-03 22:16:05 +02:00
Petr Rockai 2a0479fc48 glibc: Enable kernels down to 2.6.32 (required for RHEL 6). 2013-06-01 17:57:49 +02:00
Eelco Dolstra c2a16ec012 glibc: Security fixes.
CVE-2013-0242, CVE-2013-1914.
2013-05-09 13:57:59 +02:00
Eelco Dolstra 0f53a2e9f3 glibc: Require Linux 2.6.32 instead of 2.6.35
By popular demand.  For instance, many widely used RHEL systems are
still on 2.6.32.
2013-05-09 13:52:05 +02:00
Eelco Dolstra cc17e70374 glibc: Remove 2.13
It's not used and has security bugs.
2013-05-09 13:50:51 +02:00
Ludovic Courtès 8ad8eb6ee0 glibc: hurd: apply none of the patches 2013-04-03 11:27:12 +02:00
Ludovic Courtès 4d8cd0aa24 glibc: hurd: Use the old `rpcgen-path.patch'. 2013-03-29 22:04:25 +01:00
Ludovic Courtès c8ff101724 glibc 2.17: Make the `fetchgit' argument optional. 2013-03-21 13:25:51 +01:00
Ludovic Courtès d69e680035 glibc 2.17: Reinstate support for cross-GNU builds. 2013-03-21 13:08:38 +01:00
Lluís Batlle i Rossell 4684a47989 glibcInfo: fixing build
The manual is built into 'build', not sourceRoot.
2013-03-12 11:46:09 +01:00
Lluís Batlle i Rossell 7868a3e6b2 Revert "Fixing tarball build (failure evaluating glibcInfo in powerpc-linux)"
This reverts commit c94595f13b.

This was fixed by shlevy in 1c86181857, and I
didn't notice it.
2013-03-11 14:02:16 +01:00
Lluís Batlle i Rossell c94595f13b Fixing tarball build (failure evaluating glibcInfo in powerpc-linux) 2013-03-11 09:41:55 +01:00
Shea Levy 1c86181857 glibc-2.17: Don't link to stdenv.lib.gcc if it's null.
This fixes the tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-10 19:47:59 -04:00
Eelco Dolstra 4623d3ff01 glibc: Fix an assertion failure in getaddrinfo.c
For instance, when connected to a VPN, Emacs would randomly crash
at startup:

emacs: ../sysdeps/posix/getaddrinfo.c:1467: rfc3484_sort: Assertion `src->results[i].native == -1 || src->results[i].native == a2_native' failed.
2013-03-06 14:10:54 +01:00
Eelco Dolstra daa53f5200 glibc: Support Blowfish passwords 2013-01-22 23:43:34 +01:00