Commit graph

22216 commits

Author SHA1 Message Date
Nicolas B. Pierron f043ffcea4 Move the set of aliases after 'self', such that we can later use the extend function. 2016-03-20 14:52:28 +00:00
Nicolas B. Pierron a09683ed29 Remove unused 'ncat' alias, as a package with the same name already exists. 2016-03-20 14:51:20 +00:00
Nicolas B. Pierron 0b67f7cb5d Move tweakAlias function into the aliases.nix file, and rename it. 2016-03-20 14:50:27 +00:00
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
Vladimír Čunát f9cae4f6dc fpm: init at 1.4.0
/cc #14061.
2016-03-20 11:56:07 +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
zimbatm 5a64bc44ea move all ruby modules to development/ruby-modules 2016-03-19 22:06:26 +00: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 0f3618da1e
kodiPlugins: sort collection alphabetically 2016-03-19 22:54:18 +01:00
Jude Taylor 76947878cb add xautoclick 2016-03-19 13:11:29 -07:00
Eelco Dolstra 455ec64d11 s3ql: 2.13 -> 2.17.1 2016-03-19 21:01:21 +01:00
Eelco Dolstra 497c828611 fuse: 2.9.3 -> 2.9.5 2016-03-19 21:01:20 +01:00
Pascal Wittmann 2dc1f2c934 perl-Cache-FastMmap: 1.40 -> 1.43 2016-03-19 18:59:15 +01:00
Pascal Wittmann f53df327ac perl-Plack: fix build 2016-03-19 18:59:15 +01:00
Pascal Wittmann 535c1f1f7a perl-CSS-DOM: 0.15 -> 0.16 2016-03-19 18:59:15 +01:00
Franz Pletz b887b16a2c pythonPackages.libvirt: 1.3.0 -> 1.3.2 2016-03-19 17:35:59 +01:00
Franz Pletz 3c060b93b6 lxd: 0.17 -> 2.0.0.rc4 2016-03-19 16:40:33 +01:00
Franz Pletz 87012e7321 pythonPackages.searx: 0.7.0 -> 0.8.1
The old version was broken.
2016-03-19 16:34:13 +01:00
Pascal Wittmann 15029ff44a perl-Apache-LogFormat-Compiler: 0.13 -> 0.33 2016-03-19 13:27:54 +01:00
Pascal Wittmann 135ef9cc32 perl-POSIX-strftime-Compiler: init at 0.41 2016-03-19 13:27:31 +01:00
Pascal Wittmann def056d770 perl-AppSqitch: 0.9993 -> 0.9994 2016-03-19 12:51:17 +01:00
Tim Cuthbertson b8c26d9e73 pythonPackages.piep: init at 0.8.0 2016-03-19 17:45:53 +11:00
joachifm 7e48d80b7d Merge pull request #14001 from romildo/new.catfish
catfish: init at 1.4.1
2016-03-19 00:19:31 +00:00
joachifm bd4db4e91e Merge pull request #13959 from ambrop72/power-fix
python-packages/power: Fix build due to falsely declared dependency.
2016-03-18 22:15:48 +00:00
joachifm 59caca43c1 Merge pull request #14020 from Baughn/dosage
dosage: Init at 2016.03.17
2016-03-18 22:07:01 +00:00
Svein Ove Aas f54d6fc697 dosage: Init at 2016.03.17 2016-03-18 23:03:35 +01:00
Nicolas B. Pierron 89f7dcaa21 Move all aliases into their own file. 2016-03-18 21:22:27 +00:00
Arseniy Seroka 1fb354d1ab Merge pull request #14008 from bzizou/scotch
scotch: init at 6.0.4
2016-03-18 22:50:20 +03:00
zimbatm 9c4b45fafe Merge pull request #13601 from zimbatm/ruby-dev
ruby.dev
2016-03-18 19:05:45 +00:00
José Romildo Malaquias 00b5bd3fb3 catfish: init at 1.4.1 2016-03-18 14:43:36 -03:00
José Romildo Malaquias bb6d3f0b59 distutils_extra: 2.26 -> 2.39 2016-03-18 14:43:35 -03:00