JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,759 Commits 2 Branches 0 Tags 12 GiB
c580ab4fcf
Commit Graph

206 Commits

Author SHA1 Message Date
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Vladimír Čunát
244f985461 glibc-multi: fix with multiple outputs 2015-12-05 17:40:37 +01:00
Vladimír Čunát
fb3c062e54 glibc-info: fix #11476 build with multiple outputs 2015-12-05 08:59:30 +01:00
Eelco Dolstra
6a766f47c2 glibc: Fix assertion failure when using incompatible locale data 
Borrowed from

  http://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-locale-incompatibility.patch

https://github.com/NixOS/nix/issues/599

We may also want to apply

  http://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/patches/glibc-versioned-locpath.patch

but we'll need to ditch locale-archive first. (Apparently
locale-archive is not very useful anymore anyway.)
 2015-12-02 11:27:39 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Nikolay Amiantov
8db98ceb01 glibc_multi: fix ldd for 64-bit ELFs 2015-10-07 16:46:26 +03:00
Nikolay Amiantov
1283e3da5d glibc_multi: fix ldd for 64-bit ELFs 2015-10-07 15:44:12 +03:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Vladimír Čunát
1fbbeff0c1 glibc: apply four security fixes from upstream 
Fixes CVE-2014-8121, CVE-2015-1781 and two unnumbered problems (apparently).
All these commits should be contained in the 2.22 release,
but we don't want that yet due to unresolved locale incompatibilites.
 2015-08-18 20:58:39 +02:00
Vladimír Čunát
eb4a88d8fd glibc-locales: check that all we build is supported 
Until now, if e.g. the user passed "en_US.UTF-8" instead of "en_US.UTF-8/UTF-8",
the locales would be generated without failing but wouldn't work well.
Now we guard against such mistakes. Real life examples:
https://github.com/fish-shell/fish-shell/issues/1927
 2015-07-31 15:39:52 +02:00
Vladimír Čunát
f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Marco Schlumpp
a88c5a8037 glibc: fixed a warning caused by nix-locale-archive.patch 
If a function shouldn't accept any parameters, use "(void)" instead of "()".
Close #7843. Vcunat purged unimportant changes from this commit.
 2015-05-15 11:14:50 +02:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Lluís Batlle i Rossell
51b1297c8a glibc: fix libgcc_s.so 
It used to be a symlink, but now it is a link script. It's crucial to get
proper linking, specially on amrv5tel, where libgcc contains lot of code
related to the limited instruction set of the platform.

Without this fix, g++ shared lib linking was broken, because a "-lgcc" was
not propagated wherever "-lgcc_s" was required. The g++ spec only mentions
"-lgcc_s" and the "-lgcc" is introduced with the libgcc_s.so link script,
only available in the glibc path after this fix.

As a reminder, we put libgcc* in the glibc output to avoid having a
runtime dependency on the gcc path only because of the everywhere linked
libgcc. This problem was specially visible in platforms like armv5tel,
where most programs end up linked to libgcc. Platforms with a more rich
instruction set may rarely end up requiring a link to libgcc.
 2015-04-29 10:09:07 +02:00
Vladimír Čunát
a56da607b1 glibcLocales: fix evaluation and build with outputs 2015-04-21 09:02:41 +02:00
Vladimír Čunát
d484c392aa stdenv multiple-outputs: change propagation rules 
Now development stuff is propagated from the first output,
and userEnvPkgs from the one with binaries.

Also don't move *.la files (yet). It causes problems, and they're small.
 2015-04-18 19:30:28 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Vladimír Čunát
596bf235b6 glibc: security fix CVE-2014-8121, fixes #7207 2015-04-09 20:42:35 +02:00
Vladimír Čunát
54fc2db1b8 glibc: update 2.20 -> 2.21, including security fixes 
Fixes #6578.
https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html

- I had to disable one warning-error type.
- One of our patches needed modification - it seemed that just the context
  changed without affecting the purpose of the patch.
 2015-03-03 11:31:01 +01:00
Vladimír Čunát
3d9e9f6571 glibc: fix -lgcc_s linking 
https://github.com/NixOS/nixpkgs/commit/65221567c12eb20d12#commitcomment-9515597
 2015-02-22 20:01:03 +01:00
Ambroz Bizjak
e191e227d2 glibc: Disable copying libgcc when cross compiling. 
It seems this is only needed for native bootstrapping.
 2015-02-05 21:25:40 +01:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Michael Raskin
c163baca3b Clean up glibcLocales environment handling -- manual merge of patch by wmertens (except Haskell part) 2015-01-19 11:06:11 +03:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Shea Levy
16fe4be790 Add isGNU attribute to gccs 2015-01-14 20:26:57 -08:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Emery Hemingway
be2060f1e7 glibc_multi: fix package name (close #5284) 
"multi" should be between the "glibc" and the version
 2014-12-10 18:31:31 +01:00
Vladimír Čunát
975a822778 glibc: improve nscd version check after e316672dcb 2014-11-11 11:06:57 +01:00
Eelco Dolstra
65221567c1 glibc: Include a copy of libgcc_s.so.1 
This prevents failures like "libgcc_s.so.1 must be installed for
pthread_cancel to work" that occur because Glibc assumes libgcc_s.so.1
to be in Glibc's libdir.

This solution is pretty hacky, because the libgcc_s.so.1 from
bootstrap-tools might be too old. So if we update GCC, programs might
end up using an outdated libgcc_s.so.1. Ideally, we would build
libgcc_s.so.1 *before* Glibc, which might not be impossible...

Fixes #3548.
 2014-11-11 10:23:26 +01:00
Eelco Dolstra
dac591aae6 glibc: Update to 2.20 2014-10-29 17:54:47 +01:00
Eelco Dolstra
1b55b07eeb glibc/2.19 -> glibc 
We only have one version of Glibc so no need for a separate directory.
 2014-10-29 13:42:59 +01:00
Vladimír Čunát
e316672dcb glibc: put back the nscd check, by $out instead of date 
I don't know why they feel they need to check the compatibility by build date,
so I would keep check against $out, which is a better nix equivalent.

Also, expression refactoring (put comments out of hash-changing bash).
 2014-09-13 14:06:27 +02:00
Alexander Kjeldaas
dd673de2a7 glibc: make compilation more pure 
Remove datetime from nscd.
 2014-09-13 13:53:43 +02:00
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
Lluís Batlle i Rossell
a8dedfc1d0 Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-29 09:05:13 +00:00
Eelco Dolstra
291527a6d9 glibc: Drop nss-skip-unavail.patch 
From a quick look at the 1063-line monstrosity that is gaih_inet(), I
*think* that this patch is no longer needed.  But I could be wrong.
 2012-12-29 01:01:31 +01:00
Eelco Dolstra
d3d3cea6bd glibc: Update rpcgen-path.patch 2012-12-29 00:49:21 +01:00
Eelco Dolstra
db418fce3d glibc: Update to 2.17 
Note that glibc-ports is now part of the main glibc tarball.
 2012-12-29 00:48:14 +01:00
Lluís Batlle i Rossell
c4cc88aca2 Merge branch 'pi-stdenv-updates' of https://github.com/viric/nixpkgs into pi-stdenv-updates 2012-12-28 21:21:24 +01:00
Lluís Batlle i Rossell
4485ee5916 glibc: removing raspberrypi specific code 
I think its --with-fp or --without-fp makes nothing, for arm.
 2012-12-28 21:16:25 +01:00
Lluís Batlle i Rossell
719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
 2012-12-28 20:14:01 +00:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions 
Pet peeve...
 2012-12-28 19:54:15 +01:00
Lluís Batlle i Rossell
affca4a11c Making the raspberrypi glibc include hard float. 2012-12-28 16:53:18 +00:00
Lluís Batlle i Rossell
2717392cbf The glibc doesn't like "gnueabihf" in the triplet. 
I better set "gnueabi".
 2012-12-26 22:01:55 +00:00
Lluís Batlle i Rossell
0af1283e97 Undoing more glibc unneeded changes 2012-12-26 22:01:26 +00:00
Lluís Batlle i Rossell
68a65bcf2a Undoing glibc 2.13 work for the pi 
(previous attempt of bootstrapping from the armv5tel bootstrap tools)
 2012-12-26 22:01:22 +00:00
root
1b29d29c76 First movement to get the raspberrypi stdenv building. 2012-12-26 21:59:54 +00:00
Lluís Batlle i Rossell
636722eb93 Less intrussive fix for glibc 2.16 cross-rpcgen build 
Using LD_LIBRARY_PATH, sets overrides of libs for all binaries run.

On mips64, the libz in the bootstrap-tools is a bit incompatible with
the libz binutils are built with (ld.so outputs a warning at every program run
that uses libz). binutils need to be dynamically linked to the libz they
have been linked to.

Glibc creates 'shlib.lds' using the gas program output, and it includes the
ld.so warning in case of using LD_LIBRARY_PATH. That breaks the glibc build.

As Makefile includes BUILD_LDFLAGS for the purpose of cross-rpcgen, I
use this instead of the intrusive LD_LIBRARY_PATH.
 2012-12-24 13:06:04 +01:00