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
Gergely Risko
18592c78fc
Cosmetic fix in pkgs/stdenv/linux/default.nix
...
Keep the rule that every stage only refers to the previous stage
for clarity.
This commit doesn't change derivation or output hashes.
2014-09-11 00:39:08 +02:00
Gergely Risko
f2c5125e82
Fix testability of pkgs/stdenv/linux/default.nix
...
The point here is that it's always possible to debug this staging
logic by using `nix-repl pkgs/stdenv/linux'. The modular-stdenv
change introduced the lib dependency, which we now default to
../../../lib.
No derivation or out hashes of stdenvLinux is changed by this commit.
2014-09-11 00:24:03 +02:00
Eelco Dolstra
42ee226184
Fix unzip setup hook
2014-09-08 22:32:37 +02:00
Eelco Dolstra
88822dc23c
Merge branch 'p/orig-modular-stdenv' of github.com:vcunat/nixpkgs into staging
2014-09-08 22:32:11 +02:00
Luca Bruno
e4e39f26ba
Change default from gnome 3.10 to gnome 3.12
2014-09-08 18:35:45 +02:00
Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
152ae27aac
Merge remote-tracking branch 'origin/systemd-216' into staging
2014-09-08 13:53:33 +02:00
Eelco Dolstra
af69fcde47
Fix Nixpkgs evaluation
...
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
2014-09-08 13:10:13 +02:00
Oliver Charles
5e3eff3bbd
haskellPackages.twitterConduit: Update to 0.0.5.8 and remove 'broken' flag
2014-09-08 12:08:03 +01:00
Luca Bruno
dfa6f03ea3
Do not assert absolute path for nodev grub device. Closes #3996
2014-09-08 12:00:34 +02:00
Eelco Dolstra
585983bc95
Merge remote-tracking branch 'origin/staging'
...
Conflicts:
pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Peter Simons
ff85b53c5f
highlight: update to version 3.18 to fix build errors with Lua 5.2
2014-09-08 10:22:50 +02:00
Domen Kožar
0487521ab2
Merge pull request #4001 from aherrmann/pr_mpi
...
mpi4py: Disable for Python3 and PyPy
2014-09-07 19:56:34 +02:00
Peter Simons
073cd3cfb9
Update version of 'lua' and 'lua5' attributes to lua 5.2.
...
@vcunat kindly pointed out that earlier versions are vulnerable to
CVE-2014-5461. There remain a whole lot of packages that have hard-coded
use of version 5.1, unfortunately.
2014-09-07 19:55:30 +02:00
Nicolas B. Pierron
568f7d70b9
Merge pull request #3866 from nbp/remove-functionTo-type
...
Remove types.functionTo
2014-09-07 10:46:13 -07:00
Andreas Herrmann
970f51ac0a
mpi4py: Disable for Python3 and PyPy
...
Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.
[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
2014-09-07 19:44:08 +02:00
Nicolas Pierron
4ff1ab5a56
Remove types.functionTo.
2014-09-07 19:41:45 +02:00
Nicolas Pierron
becde6132b
Replace environment.profileVariables by environment.profileRelativeEnvVars
2014-09-07 19:41:00 +02:00
Nicolas B. Pierron
388b7baa73
Merge pull request #3856 from nbp/submodule-declarations
...
Annotate option-set options with the file in which they are declared.
2014-09-07 10:39:47 -07:00
Nicolas B. Pierron
a4e60ebacf
Merge pull request #3811 from nbp/options-json
...
Export the list of options to XML & JSON, such that external tools can use it.
2014-09-07 10:39:03 -07:00
Nicolas Pierron
b5f0cc3cda
Merge options having the submodule type.
...
Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type. If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.
In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
2014-09-07 19:03:20 +02:00
Nicolas Pierron
bb944b4dc8
Annotate option-set options with the file in which they are declared.
...
This modification improves NixOS manual by listing in which file, each
submodule option is declared. This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
2014-09-07 19:03:20 +02:00
Nicolas Pierron
79411db08b
Export options.json & options.xml for building tools for NixOS.
2014-09-07 18:39:24 +02:00
Aristid Breitkreuz
476b94a34d
Merge pull request #3998 from bobvanderlinden/libfreefare
...
added libfreefare
2014-09-07 18:08:56 +02:00
Rickard Nilsson
da9ef1ddaa
Merge pull request #3999 from ip1981/master
...
Updated Mediawiki to 1.23.3
2014-09-07 18:02:05 +02:00
Igor Pashev
5c6e4e7433
Updated Mediawiki to 1.23.3
...
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +02:00
Bob van der Linden
c839205a69
added libfreefare
...
A library on top of libnfc for MIFARE support.
2014-09-07 16:23:23 +02:00
Pascal Wittmann
4537c1ab25
Merge pull request #3935 from MP2E/eternity-engine
...
Add eternity and eternityMaster, a Doom port by James Haley
2014-09-07 15:26:11 +02:00
Domen Kožar
dce3e9261b
pypy: disable some more packages
2014-09-07 14:51:11 +02:00
Domen Kožar
130e56cd42
nixos.tests.gnome3: wait 20sec for the screenshot
2014-09-07 14:51:10 +02:00
Bjørn Forsman
af26d5e25b
jquery: new package
...
jQuery is a JavaScript library designed to simplify the client-side
scripting of HTML.
I'm adding version 1.x instead of 2.x because 1.x supports IE 6, 7, 8
browsers and both versions are API compatible.
http://jquery.com/
2014-09-07 14:39:34 +02:00
Bjørn Forsman
f8c7e340a4
jquery-ui: update to latest stable (v1.11.1)
...
The current version (v1.10.4) is now called "legacy". The new stable version
has a different directory layout; it no longer splits css/ and js/ directories.
Since the *.js files refer to the *.css files by relative paths, I'm not
splitting them. Everything now goes to "$out/js/".
Also, upstream removed version numbers from filenames, so we don't need to
create those version-less symlinks anymore.
2014-09-07 13:36:13 +02:00
Bjørn Forsman
218c28934e
jquery-ui: align attrname with pkgname (jquery_ui => jquery-ui)
2014-09-07 13:10:14 +02:00
Oliver Charles
9104888b38
haskellPackages.tastyAntXml: Update to 1.0.0.9
2014-09-07 11:40:47 +01:00
Nathaniel Baxter
5856fbc7d2
nixos-manual: Fix reference to obsolete configuration option
2014-09-07 11:58:06 +02:00
Aristid Breitkreuz
c3361f9414
perlPackages.FinanceQuote: update from 1.29 to 1.35
2014-09-07 11:34:15 +02:00