Commit graph

79096 commits

Author SHA1 Message Date
Nicolas B. Pierron f7c86ee018 Move merge of stdenvDefault from the self attribute to the returned value of pkgsFun. 2016-03-20 14:31:27 +00:00
Nicolas B. Pierron be3531a56e Replace with statements of stdenvDefault to rely on pkgs instead of self. 2016-03-20 14:31:27 +00:00
Nicolas B. Pierron 020bb40454 Split stdenv attribute set.
Extract stdenvDefault from the set of all packages.  As this set of
attributes are inter-dependant, probably due to stdenvOverrides, we have to
keep them in a close set of inter-dependent options.

I guess I will have to investigate more ...
2016-03-20 14:31:27 +00:00
Nicolas B. Pierron 7f3a4f4287 Swap conditions of stdenvOverrides to prevent infinite loops while evaluating stdenvCross.
While evaluating the derivation of xbursttools:
  the condition `pkgs.stdenv ? overrides` causes the evaluation of
  `stdenvCross`.  This evaluation comes too early during the execution, as
  it prevents the resolution of names such as `pkgs.lib`, and
  `stdenvAdapaters.makeStdenvCross`, which we want to take from `pkgs`
  instead of `self` in following patches.

By swapping the conditions, we effectively make the resolution of `pkgs.lib`
and `stdenvAdapaters.makeStdenvCross` possible through the pkgs attribute.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron 8d355b8d85 Under pkgsFun, expand self attribute, and rename self_ to self.
Note, the aliases are now computed against the set of packages defined in
the set of all packages, and no longer apply to any overriden package.

I think this is better as this reduces the amount of surprizes.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron ffcb6682bc Under pkgsFun, move the merge of helper functions from self_ to self. 2016-03-20 14:31:26 +00:00
Nicolas B. Pierron a658645e1e Remove with helperFunction above the list of all packages.
This modification change the names bound to the `helperFunctions` attribute
set, to be bound to `self` which is constructed by merging the same
`helperFunctions` set with the set of all packages.

This patch works as expected because none of the helperFunction names is
aliased by the name of a package.
2016-03-20 14:31:26 +00:00
Nicolas B. Pierron a8374f2168 Under applyGlobalOverrides, inline mkOverrides in overrides. 2016-03-20 14:31:26 +00:00
Nicolas B. Pierron 71b2fd92b3 Move mkOverrides under applyGlobalOverrides. 2016-03-20 14:31:26 +00:00
Nicolas B. Pierron acaa99cbd2 Move applyGlobalOverrides comment to stdenvOverrides, where it fits better. 2016-03-20 14:31:26 +00:00
Nicolas B. Pierron 00963c3dfd Extract stdenvOverrides function out of mkOverrides function. 2016-03-20 14:31:25 +00:00
Nicolas B. Pierron a5188bda7b Unify the applyGlobalOverride function with the overridePackages function. 2016-03-20 14:31:25 +00:00
Nicolas B. Pierron a6e260c91f Add an extra argument to the overrider function of applyGlobalOverrides. 2016-03-20 14:31:25 +00:00
Nicolas B. Pierron f9a29887fe Move pkgsOrig outside applyGlobalOverrides and provide it as argument. 2016-03-20 14:31:25 +00:00
Nicolas B. Pierron 5f4cb91a1c Move helperfunctions and stdenvAdapters under pkgsFun.
The `helperFunctions` and `stdenvAdapters` both use the `pkgs` attribute as
input, either to inherit some properties, either to use it as argument.

The `pkgs` binding used in both expressions of the `helperFunctions` and
`stdenvAdapters` is no longer the result of the `applyGlobalOverrides`
function, but the argument of the `pkgsFun` function.

The `pkgsFun` functions is called twice under `applyGlobalOverrides`, and in
both cases, the first argument of `pkgsFun` correspond to the result of
`applyGlobalOverrides`.

Thus, this modification will change the bindings, but the evaluation of
`<nixpkgs>`.

A third call the `pkgsFun` exists under `overridePackages` in the set of all
packages. Previously, the `helperFunctions` and `stdenvAdapaters` would use
the functions defined as part of the default `<nixpkgs>` set.  With this
modification, the `helperFunctions` and the `stdenvAdapters` are now using
the fix-point of the newly evaluated package set.

This implies that this modification allow the user to use
`overridePackages`, which is already not recommended for performance
reasons, to override the inputs of the `helperFucntions` and
`stdenvAdapaters` too, where this was not possible before.
2016-03-20 14:31:25 +00:00
Nicolas B. Pierron 11a566b5bc Move 'with helperFunctions' above the set of all packages. 2016-03-20 14:31:25 +00:00
Nicolas B. Pierron a39c5ff0d8 Re-indent the top of pkgsFun. 2016-03-20 14:31:25 +00:00
Nicolas B. Pierron 9444d6e6de Split miss-indented last lines. to simplify future diffs. 2016-03-20 14:31:25 +00:00
Pascal Wittmann 097e20ccfe python-radicale: user newer sqlalchemy version 2016-03-20 15:24:08 +01:00
Nikolay Amiantov 7185aefbbe ioquake3: 2016-02-18 -> 2016-03-15 2016-03-20 17:07:31 +03:00
Vladimír Čunát b405e82edb ruby docs: improve the example
- missing cd command
- invoke bundler through nix-shell, so it doesn't need to be on $PATH
  Note: running bundix through nix-shell won't work ATM, as the shell sets
  SSL_CERT_FILE=/no-cert-file.crt which prevents fetching throug https.
- use version from gemset to simplify updating
- don't break line in meta.description
2016-03-20 13:33:20 +01:00
Pascal Wittmann 88a62b3aea datamash: 1.0.6 -> 1.0.7 2016-03-20 13:23:31 +01:00
Pascal Wittmann 6ea546e3b9 entr: 3.2 -> 3.4 2016-03-20 13:23:31 +01:00
Vladimír Čunát f9cae4f6dc fpm: init at 1.4.0
/cc #14061.
2016-03-20 11:56:07 +01:00
Arseniy Seroka 02080ecede Merge pull request #14072 from bkase/vim-plugins-airline-themes
vim-plugins: add airline-themes
2016-03-20 13:16:00 +03:00
Brandon Kase 51eb1dce81 vim-plugins: add airline-themes 2016-03-20 02:31:24 -07:00
Pascal Wittmann f1351254ad Merge pull request #14071 from ericsagnes/fix/anthy-maintainer
anthy: add maintainer
2016-03-20 09:16:46 +01:00
Eric Sagnes 9c029c3b05 anthy: add maintainer 2016-03-20 15:03:58 +09:00
Franz Pletz e3aa3c6abb Merge pull request #14069 from greyson/master
unifi: 4.7.6 -> 4.8.14
2016-03-20 05:57:05 +01:00
Greyson e379e4aa38 unifi: 4.7.6 -> 4.8.14
Includes upstream URL relocation.
2016-03-19 23:08:58 -04:00
Tobias Geerinckx-Rice ec8484734b debian-devscripts: 2.16.1 -> 2.16.2 2016-03-20 01:22:13 +01:00
zimbatm 7850525e2c Merge pull request #14003 from cstrahan/go-ide-packages
goPackages: add ide-like packages
2016-03-20 00:16:25 +00:00
zimbatm 008f170bcb Merge pull request #14012 from peti/update-gnupg
Update default version of gnupg to 2.1.x
2016-03-20 00:05:15 +00:00
Lluís Batlle i Rossell 9b8b143c99 Missing path in prev commit 2016-03-20 00:47:12 +01:00
Peter Hoeg c6a717d212 dynamic-colors: 2013-12-28 -> 0.2.1 2016-03-19 23:45:28 +00:00
Lluís Batlle i Rossell e6e7de082d Fixing icu for ARM with a patch from openembedded.
It failed with an "internal error".
2016-03-20 00:42:12 +01:00
zimbatm 1a7a7d8ef9 Merge pull request #14027 from zimbatm/ruby-modules
Ruby modules
2016-03-19 22:07:55 +00:00
zimbatm 5a64bc44ea move all ruby modules to development/ruby-modules 2016-03-19 22:06:26 +00:00
zimbatm 3547ffa89f ruby: remove unused patches 2016-03-19 22:04:12 +00:00
zimbatm eccad06e23 remove unsed ruby-sqlite3 package 2016-03-19 22:04:12 +00:00
zimbatm 64fe2b5eb6 gitlab: remove unused parameter 2016-03-19 22:04:12 +00:00
zimbatm 06e4186f4e Merge pull request #14061 from zimbatm/bundler-env-fix
bundlerEnv: fix wrapping of programs
2016-03-19 22:03:12 +00:00
Peter Simons 2a0b0dbdf2 Merge pull request #13932 from anderspapitto/distcc
distcc: 3.1 -> 2016-02-16
2016-03-19 22:57:36 +01:00
Anders Papitto ac85f1ab4b distcc: 3.1 -> 2016-02-16
3.1 is from 2008
2016-03-19 14:55:56 -07:00
Edward Tjörnhammar dcf8c1573b
kodiPlugins.svtplay: 4.0.21 -> 4.0.23 2016-03-19 22:55:41 +01:00
Edward Tjörnhammar cf40f1f8c6
kodiPlugins.steam-launcher: 3.1.1 -> 3.1.4 2016-03-19 22:55:20 +01:00
Edward Tjörnhammar 4422731542
kodiPlugins.salts: 2.0.6 -> 2.0.19 2016-03-19 22:55:07 +01:00
Edward Tjörnhammar c871c625c0
kodiPlugins.hyper-launcher.{plugin,service}: init at 1.2.0 2016-03-19 22:54:52 +01:00
Edward Tjörnhammar 7d0b492731
kodiPlugins.pdfreader: init at 1.0.2 2016-03-19 22:54:37 +01:00
Edward Tjörnhammar 0f3618da1e
kodiPlugins: sort collection alphabetically 2016-03-19 22:54:18 +01:00