3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

22323 commits

Author SHA1 Message Date
Domen Kožar f66a369421 Merge pull request #14123 from LnL7/python-bootstrapped-pip
expose bootstrapped-pip in pythonPackages
2016-03-22 20:16:20 +00:00
Nikolay Amiantov ad1f158111 Merge pull request #14088 from jgillich/rust-head
Rust updates
2016-03-23 00:10:07 +04:00
Daiderd Jordan 50ee78afa8 expose bootstrapped-pip in pythonPackages 2016-03-22 20:37:03 +01:00
joachifm f881bb06b1 Merge pull request #14098 from mbakke/go-version-vs-date
goPackages: rename "date" to "version"
2016-03-22 17:01:03 +00:00
Jakob Gillich f215a71c6c rustPackages: 2016-03-10 -> 2016-03-22 2016-03-22 13:16:57 +01:00
joachifm 4f29a8c03e Merge pull request #14023 from Adjective-Object/add/ansifilter
ansifilter: add @ 1.15
2016-03-22 00:44:49 +00:00
Franz Pletz b2f92582fb uhd: 3.7.0 -> 3.9.3 2016-03-22 01:18:01 +01:00
Mitch Tishmack db6dff75bd htop: fix build on darwin 2016-03-21 14:05:01 -05:00
zimbatm 81af597030 Merge pull request #14016 from johbo/mysql55
mysql55: Allow to build on darwin
2016-03-21 17:39:45 +00:00
joachifm d55248f4b4 Merge pull request #14087 from grahamc/squid
Update Squid, Remove Old Versions for CVE-2016-2571
2016-03-21 17:30:31 +00:00
Tobias Geerinckx-Rice 9ba1afb94b libav: drop unused version 9. 2016-03-21 18:28:08 +01:00
joachifm ada62bea57 Merge pull request #14104 from romildo/new.grepmail
grepmail: init at 5.3104 and some dependencies
2016-03-21 17:25:01 +00:00
Edward Tjörnhammar bd37facd1e
python33Packages.acd_cli: don't use sqlalchemy7 2016-03-21 18:07:51 +01:00
Tobias Geerinckx-Rice e2cbf68786 docker: keep using btrfs-progs 4.4.1
Fixes https://hydra.nixos.org/build/33510211.
2016-03-21 16:18:33 +01:00
José Romildo Malaquias a95583e7fd grepm: init at 0.6 2016-03-21 12:08:04 -03:00
José Romildo Malaquias c0c321cf48 grepmail: init at 5.3104 2016-03-21 12:04:25 -03:00
José Romildo Malaquias 66399d464b Mail-Mbox-MessageParser: init at 1.5105 2016-03-21 11:59:37 -03:00
José Romildo Malaquias d1d922b6b9 FileHandle-Unget: init at 0.1628 2016-03-21 11:58:31 -03:00
Graham Christensen 133af7750e squids: Remove unsupported versions of squid. 2016-03-21 09:55:44 -05:00
Maxwell 5c740539a8 ansifilter: init at 1.15 2016-03-21 09:42:32 -04:00
Marius Bakke fb215f25d4 goPackages: rename date to version 2016-03-21 01:36:52 +00:00
Franz Pletz 12225d83be Merge pull request #14085 from mbakke/oh-20160302
goPackages.oh: 2016-02-23 -> 2016-03-02
2016-03-20 23:13:40 +01:00
Robert Helgesson 658141fddb perl-Log-Log4perl: 1.46 -> 1.47
Also rename the package attribute to match naming scheme, the old
attribute now refers to the renamed one.
2016-03-20 20:53:03 +01:00
Robert Helgesson e0ec11e204 perl-CGI: 4.27 -> 4.28 2016-03-20 20:53:03 +01:00
Robert Helgesson 9fb01da113 perl-Sub-Name: 0.14 -> 0.15 2016-03-20 20:53:03 +01:00
Nicolas B. Pierron aa7f0fc214 Move stdenvOverrides under pkgsWithOverrides. 2016-03-20 19:26:57 +00:00
Nicolas B. Pierron 5ae7356d42 Replace the merge operators by the fix' and extends functions. 2016-03-20 19:23:08 +00:00
Nicolas B. Pierron 1bcefcdf5c Under pkgsWithOverrides, replace the last uses of pkgs by the corresponding argument. 2016-03-20 19:18:33 +00:00
Nicolas B. Pierron 800766fb0b Change the customOverrides to use the stdenvOverrides instead of the original package set. 2016-03-20 19:10:48 +00:00
Nicolas B. Pierron 21b8007bcf Move the customOverrides after the stdenvOverrides.
This change is not backward compatible, in the sense that this allow you to
override the packages which used to be overriden by the last stage of
stdenv.  Note, this does not mean that these packages would be used by
stdenv.
2016-03-20 19:04:15 +00:00
Nicolas B. Pierron 9e8c5208a1 Add bootStdenv condition around the overrider.
This condition used to be implicit in the sense that the stdenvOverrides
uses pkgs_6, instead of pkgs_7 as its super set, and also that each stage of
the compiler is build again the bootstrap packages of the previous stage,
thus overriden by the stdenv.override function.
2016-03-20 19:03:37 +00:00
Arseniy Seroka 84ba149e79 Merge pull request #14065 from zimbatm/htop-crossplatform
htop: merge both implementations
2016-03-20 21:55:00 +03:00
Marius Bakke fdf8c73f15 goPackages.oh: 2016-02-23 -> 2016-03-02 2016-03-20 18:32:21 +00:00
Nicolas B. Pierron 598ed874df Add extra argument to better identity with the extend function later. 2016-03-20 18:23:29 +00:00
Nicolas B. Pierron a190baa479 In top-level/default.nix, rename self to allPackages. 2016-03-20 18:18:39 +00:00
Nicolas B. Pierron 5783f66bc8 Internalize the recursion over the set of all packages. 2016-03-20 18:17:35 +00:00
Nicolas B. Pierron f8dedbb101 Build aliases based on the previous set including all-packages, instead of only using all-packages. 2016-03-20 18:02:28 +00:00
Nicolas B. Pierron 01693ac154 Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level. 2016-03-20 17:50:06 +00:00
Nicolas B. Pierron ff72cf185e Split helperFunctions to simplify the identification with the extend function. 2016-03-20 17:37:40 +00:00
Nicolas B. Pierron 5cdaa7b907 Remove all-packages.nix helperFunctions dependency. 2016-03-20 16:41:20 +00:00
Nicolas B. Pierron ae0471b737 Split consecutive merge operators to simplify the identification of extend functions. 2016-03-20 16:40:36 +00:00
Nicolas B. Pierron 335a969d45 Inline pkgsFun in pkgsWithOverrides. 2016-03-20 16:33:46 +00:00
Nicolas B. Pierron ad31783405 Extract the top-level logic out of all-packages.nix into pkgs/top-level/default.nix 2016-03-20 16:28:18 +00:00
Nicolas B. Pierron a543a57ab5 Reformat pkgsWithOverrides to later facilitate the identitication with the extend functions. 2016-03-20 16:11:52 +00:00
Nicolas B. Pierron 07e549ee5b Rename applyGlobalOverrides to pkgsWithOverrides 2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 32e96bbb8b Within applyGlobalOverrides, alias pkgsFun calls. 2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 5e3ce6334c Remove applyGlobalOverrides's pkgsOrig argument.
This patch change the behaviour or overridePackages:

 - Before, overridePackages was based on top of the set of packages
   overriden by `~/.nixpkgs/config.nix` file.

 - After, overridePackages should when given a function f, behave almost¹
   the same as-if the packageOverrides attribute of `~/.nixpkgs/config.nix`
   file attribute was set to f, assuming that we ignore the extra `self`
   argument.

¹ It is not yet exactly the same because we have many paths which are
re-entering nixpkgs while taking the default attributes, such as the
bootstrap phase of stdenv.  Thus if the nixpkgs configuration overrides any
of the dependencies need for the bootstrap, then we might get different sha.
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 007500f2ec Move the merge of the overrides from pkgsFun to applyGlobalOverrides. 2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 054327729c Move stdenvDefault into its own file. 2016-03-20 16:11:51 +00:00
Tuomas Tynkkynen ffae496db6 Merge pull request #14070 from ericsagnes/fix/im-engines
im-engines: use recurseIntoAttrs
2016-03-20 18:08:08 +02:00
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
Eric Sagnes b27593276c im-engines: use recurseIntoAttrs 2016-03-20 14:53:32 +09: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 a6c1481c66 foreman: init at 0.78.0 2016-03-19 22:47:52 +00:00
zimbatm d9e60e4d43 htop: merge both implementations
htop 2.0+ is now cross-platform
2016-03-19 22:20:20 +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