Commit graph

49150 commits

Author SHA1 Message Date
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
Gergely Risko e6bf8a09ba Fix xz to not depend on bootstrap-tools 2014-09-14 21:00:12 +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
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
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Vladimír Čunát 6a63d1e1e1 libav: replace default 10 branch by the new 11
Upstream claims the upgrade is API-compatible.
That is why I decided to drop the 10 branch completely.
2014-09-13 21:48:11 +02:00
Vladimír Čunát e90e423a26 mesa: maintenance update 2014-09-13 21:06:49 +02:00
Vladimír Čunát ead6603b60 libav: update all branches, probably with security fixes 2014-09-13 21:05:16 +02:00
Vladimír Čunát 23697f2db2 poppler: maintenance update 2014-09-13 21:05:07 +02:00
Alexander Kjeldaas aa119e1106 gcc-wrapper: make __DATE__/__TIME__ deterministic
...when NIX_ENFORCE_PURITY=1.

@vcunat corrected the date according to docs.
https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
In order to handle the spaces well, the extraAfter array had to be
quoted more properly and appended by +=.
2014-09-13 15:32:34 +02:00
Alexander Kjeldaas 7141303c99 groff, opensp: make deterministic 2014-09-13 15:06:59 +02:00
Alexander Kjeldaas e431a3e0b5 openssl: make it deterministic 2014-09-13 15:05:27 +02:00
Alexander Kjeldaas bee22ab79e libgcrypt, libgpg-error, busybox: improve determinism 2014-09-13 15:04:43 +02:00
Alexander Kjeldaas 3bf4362381 python: improve library determinism
1) Make the core python libraries deterministic.
2) Make the python libraries created by glib deterministic.

@vcunat put back the removal of share/gtk-doc in glib.
2014-09-13 15:03:12 +02:00
Alexander Kjeldaas 3196d4f7c7 perl-5.16: make it binary deterministic 2014-09-13 14:40:04 +02: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
Pascal Wittmann e377128003 Merge pull request #4038 from bobvanderlinden/volumeicon
added volumeicon
2014-09-12 23:48:04 +02:00
Thomas Tuegel 8c3f749eda Rewrite hoogleLocal expression
The old expression was broken. This began as an attempt to fix it, but
the new expression is substantially different. It takes advantage of new
features that obviate the need to patch Hoogle. It comes with several
limitations. The new expression does not build the database in parallel,
although it does not take long. The new expression also does not support
downloading databases from the Hoogle instance at haskell.org; those
databases link to Hackage for documentation, defying the meaning of local.
2014-09-12 15:29:02 -05:00
Pascal Wittmann 245f34fef7 calibre: update from 2.2.0 to 2.3.0 2014-09-12 21:37:39 +02:00
Pascal Wittmann 3c6eceb5fb Merge pull request #4008 from dbohdan/master
Add Jim Tcl interpreter
2014-09-12 21:36:58 +02:00
Danyil Bohdan 2a89610d9a jimtcl: add dbohdan as maintainer 2014-09-12 22:23:59 +03:00
William A. Kennington III 57becd586a Merge pull request #4053 from matejc/fix_vaapivdpau
fix vaapiVdpau build with patch
2014-09-12 12:14:25 -07:00
William A. Kennington III 977004408b Merge pull request #4055 from linquize/directfb
directfb: Update to 1.7.6
2014-09-12 12:13:32 -07:00
Bob van der Linden 1f9f7a5977 volumeicon: added homepage 2014-09-12 21:11:10 +02:00
Bob van der Linden 16ee2ec743 volumeicon: made description not repeat the name of package 2014-09-12 21:10:59 +02:00
cillianderoiste 56f6952f0d Merge pull request #4049 from vandenoever/musescore
Add MuseScore 1.3.
2014-09-12 18:53:14 +02:00
Linquize bb7138e9a9 directfb: Update to 1.7.6 2014-09-12 17:35:37 +02:00
Peter Simons 5b28aebc08 sbt: drop unconditionally set $SBT_OPTS variable from script
... and rename simple-build-tool to just "sbt", which is the name
everybody uses these days.
2014-09-12 17:11:38 +02:00
Jos van den Oever 8a4ce8cf34 Add MuseScore 1.3. 2014-09-12 16:52:44 +02:00
Matej Cotman 5c4a3c576c fix vaapiVdpau build with patch 2014-09-12 16:25:59 +02:00
Bjørn Forsman ec59929c9f nixos/jekins: add services.jenkins.extraGroups option
This makes it easy to give jenkins extra privileges by adding group
memberships. Use with care :-)
2014-09-12 15:25:15 +02:00
Peter Simons 6e803a684f R: update to version 3.1.1 2014-09-12 15:20:06 +02:00
Eelco Dolstra 075c1d4f15 Doh 2014-09-12 11:21:21 +02:00
Eelco Dolstra 135142780b readline: Name Nix expressions consistently 2014-09-12 11:15:13 +02:00
Eelco Dolstra d2143c73bb readline-6.3: Fix building on Darwin
The zip file contains files named CHANGELOG and ChangeLog, so the
build fails on case-insensitive systems with:

  error: creating file `/nix/store/nix-4888-0/unpacked/ChangeLog': File exists

The official tar distribution does not have this problem.
2014-09-12 11:15:13 +02:00
Peter Simons df4c114252 Merge pull request #4036 from lostdj/ltp/master/ijifix
IntelliJ IDEA: do not assume that we are using OpenJDK.
2014-09-12 10:16:55 +02:00
William A. Kennington III 56411e9457 Fix typo in meta 2014-09-11 22:19:53 -07:00
William A. Kennington III bab5efd237 nixos/ssh: Allow user to configure the package that provides ssh/sshd 2014-09-11 22:07:39 -07:00
William A. Kennington III 686a139f29 Merge pull request #4030 from AndersonTorres/small-fixups
Small style fixups
2014-09-11 21:27:54 -07:00
William A. Kennington III ebc62d4e91 Merge pull request #4046 from phunehehe/add-functor-infix
add functor-infix
2014-09-11 21:25:57 -07:00
Hoang Xuan Phu b5c219d5dc add functor-infix 2014-09-12 11:24:06 +07:00
William A. Kennington III 16225209c6 Merge pull request #4040 from jbgi/patch-1
update hpn patch version to match openssh version
2014-09-11 21:10:07 -07:00
William A. Kennington III 1e414733cd Merge pull request #4044 from nathanielbaxter/dev/python
dbus_python: Add missing isPyPy argument.
2014-09-11 21:09:00 -07:00
Nathaniel Baxter 2fec214933 dbus_python: Add missing isPyPy argument. 2014-09-12 10:24:13 +10:00
William A. Kennington III 5e43f1434d Merge pull request #4042 from wkennington/master.consul
Consul: 0.3.0 -> 0.4.0
2014-09-11 15:57:11 -07:00
William A. Kennington III 3141ce3e15 gems: Add rdoc, execjs, uglifier 2014-09-11 15:41:45 -07:00
William A. Kennington III 65f103175e consul: 0.3.0 -> 0.4.0 2014-09-11 15:40:41 -07:00