Commit Graph
54482 Commits
Author SHA1 Message Date
Gergely Risko c5df246ba9 Cleanup perl logic in stdenvLinux
Make thread disabling explicit.  This changes the semantics of the perl
derivation, so on other platforms it may require setting

  enableThreading = false

This commit doesn't change the derivation or out hash of stdenvLinux.
2014-09-14 21:36:14 +02:00
Gergely Risko fca5d864b6 pkgs/stdenv/linux: stageFun refactoring
The stage3.extraAttrs.glibc argument was required for this whole build
procedure to correctly work and it was very-very hard to see why (the
comment said something about gcc47, but we're using gcc48 now).

This stage3.extraAttrs.glibc goes into stage3.stdenv.glibc after some
arg passing, and in pkgs/development/compiler/gcc an (stdenv ? glibc)
boolean expression decides to override /usr/include during the GCC
build.

All of our stages are built with glibc, so this refactoring moves this
repeating specification of glibc (once for gcc wrapper and once here for
extraAttrs) to stageFun, by getting rid of wrapGCC, as we were using
that in all of the stages anyways.

Incidentally it turned out, that this stdenv.glibc inconsistency caused
some random other stuff to behave differently:
  - stage1.pkgs.perl has threading disabled,
  - stage4.pkgs.coreutils (the production coreutils) has testing disabled.

Leave this historical accidents as they are in this commit, so the scope
of this commit can stay as a refactoring only, these issues will be
fixed in separate commits.

This commit doesn't change the derivation or the output hash of
stdenvLinux.
2014-09-14 21:35:54 +02:00
wyvie 490dc64347 Fixed file name with new version 2014-09-14 21:19:38 +02:00
Gergely Risko efcb00d002 Do allowed requisites check in stdenv/linux
Use the new allowedRequisites feature in stdenvLinux.

This way we properly check that the end-result stdenv of the quite
complicated multi-stage stdenvLinux building procedure is sane, and only
depends on the stuff that we know about.

Alternative would be to just disallowRequisites bootstrapTools, which is
the most common offender, but we have had other offenders in the past.

For these checks to actually fire, you currently have to use nixUnstable,
as the necessary feature will be released in Nix 1.8.
2014-09-14 21:14:41 +02:00
wyvie 57f62dd2b4 Bumped version of sublime3 2014-09-14 21:13:54 +02:00
Gergely Risko e6bf8a09ba Fix xz to not depend on bootstrap-tools 2014-09-14 21:00:12 +02:00
Pascal Wittmann 6b75431f2d Merge pull request #4051 from wyvie/master
Added quazip-0.7
2014-09-14 19:56:02 +02:00
Gergely Risko 0a3d811e42 Fix zlib handling in stdenvLinux
Previously stdenv depended on two different zlibs and there was a third
one in the top-level package set for other purposes.  This commit merges
all this zlibs to one.

Actually this have been committed once as 1f2b636, but then got lost
while resolving merge conflicts.  Hopefully it survives this time.
2014-09-14 19:37:51 +02:00
Gergely Risko 4ac4af08f2 Cosmetic renaming: extraPath -> extraBuildInputs 2014-09-14 19:37:32 +02:00
Gergely Risko 034b07e6ff Remove gcc and zlib dependency on bootstrap-tools
The 82797f98f2 merge caused this
issue while trying to merge the staging refactorings with
the modular-stdenv feature branch.
2014-09-14 19:32:58 +02:00
Domen Kožar 5198f9bc29 mailpile: dev -> 0.4.0 (beta release) 2014-09-14 18:28:23 +02:00
wyvie 8818e63dcd Fixed quazip default.nix 2014-09-14 17:53:37 +02:00
Vladimír Čunát 2e139a9eff merge fixup: connect the parent of the previous commit
The previous "merge" commit was missing the master parent by accident.
Thanks to @errge for noticing.
2014-09-14 17:32:49 +02:00
Pascal Wittmann a47ef22751 Merge pull request #4080 from nathanielbaxter/dev/keepass
keepass: Bump version to 2.27
2014-09-14 16:16:13 +02:00
Pascal Wittmann d7d879e6cb Merge pull request #4077 from DamienCassou/weboob
Weboob
2014-09-14 15:21:55 +02:00
Nathaniel Baxter 958be357a5 keepass: Bump version to 2.27 2014-09-14 22:05:15 +10:00
ambrop7@gmail.com 2f79a85767 VirtualBox: Fix ALSA audio.
Use a sed replacement to ensure that dynamic loading of libasound works.
2014-09-14 11:28:34 +02:00
Damien Cassou bb97890cf3 Add weboob 0.j 2014-09-14 10:39:48 +02:00
Pascal Wittmann 28e1d25084 super: fixed url to source and added patch for CVE-2014-0470 2014-09-14 08:51:01 +02:00
William A. Kennington III f4e8f18c19 v8: 3.26.8 -> 3.26.31.15 2014-09-13 22:50:47 -07:00
William A. Kennington III cd83ae0ad7 gyp: 1944 -> 1977 2014-09-13 22:07:11 -07:00
William A. Kennington III 87ee3d5d5e libyaml: Add myself as a maintainer and add platforms meta 2014-09-13 22:07:11 -07:00
William A. Kennington III cfbf651294 icu: 52.1 -> 53.1 2014-09-13 22:07:11 -07:00
koral 58be5387b8 Upgraded mpc to v0.26
Closes #4072

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-14 05:37:24 +01:00
Ricardo M. Correia 7068828389 rustcMaster: Update to a more recent commit 2014-09-14 04:54:33 +02:00
William A. Kennington III 007be9f34c gperftools: 2.1 -> 2.2.1 2014-09-13 19:16:19 -07:00
William A. Kennington III dd87598615 snappy: 1.1.1 -> 1.1.2 2014-09-13 19:16:19 -07:00
koral f98eea30bf Upgraded python-psutil to v2.1.1 2014-09-14 00:58:57 +02:00
Peter Simons 70caf9d865 git-annex: broken by optparse-applicative 0.10.x
Bug has been reported upstream.
2014-09-14 00:06:45 +02:00
Peter Simons 8e4c563b14 haskell-hakyll: broken by recent updates
Hakyll requires network 2.6.x, which is newer than what we have, and
pandoc-citeproc 0.4.x, which is older than what we have.
2014-09-14 00:06:45 +02:00
Peter Simons dd3a157b3f haskell-boundingboxes: update to version 0.2.2 2014-09-14 00:06:45 +02:00
Peter Simons d1c721a8a0 haskell-http-client: update to version 0.3.8.2 2014-09-14 00:06:45 +02:00
Peter Simons 5bb4806c18 haskell-wl-pprint-terminfo: update to version 3.7.1.2 2014-09-14 00:06:45 +02:00
Peter Simons c9c0205d64 haskell-wl-pprint-extras: update to version 3.5.0.2 2014-09-14 00:06:45 +02:00
Peter Simons 9067845ebc haskell-twitter-conduit: update to version 0.0.6 2014-09-14 00:06:45 +02:00
Peter Simons c64275a2c1 haskell-tasty-rerun: update to version 1.1.3 2014-09-14 00:06:45 +02:00
Peter Simons cf1fde21ff haskell-parsers: update to version 0.12.1.1 2014-09-14 00:06:44 +02:00
Peter Simons c498f9db96 haskell-instant-generics: update to version 0.4.1 2014-09-14 00:06:44 +02:00
Peter Simons 435087d060 haskell-hsimport: update to version 0.6 2014-09-14 00:06:44 +02:00
Peter Simons be41ba167a haskell-hplayground: update to version 0.1.0.5 2014-09-14 00:06:44 +02:00
Peter Simons 90efae1dbd haskell-hledger: update to version 0.23.3 2014-09-14 00:06:44 +02:00
Peter Simons c8caffbd90 haskell-hledger-web: update to version 0.23.3 2014-09-14 00:06:44 +02:00
Peter Simons a39fef7e51 haskell-hledger-lib: update to version 0.23.3 2014-09-14 00:06:44 +02:00
Peter Simons 617da985f6 haskell-gloss: update to version 1.8.2.2 2014-09-14 00:06:44 +02:00
Peter Simons 345fa9142a haskell-dimensional: update to version 0.13.0.1 2014-09-14 00:06:44 +02:00
Peter Simons cf71096aa5 haskell-diagrams-contrib: update to version 1.1.2.2 2014-09-14 00:06:44 +02:00
Peter Simons 7e21326473 haskell-c2hs: update to version 0.18.2 2014-09-14 00:06:44 +02:00
Peter Simons 10ccc7ab1d haskell-bytes: update to version 0.14.1.1 2014-09-14 00:06:44 +02:00
Peter Simons 8b897a49aa haskell-async: update to version 2.0.1.6 2014-09-14 00:06:44 +02:00
Peter Simons 8daf8c103e haskell-html-conduit: update to version 1.1.1.1 2014-09-14 00:06:44 +02:00