Commit Graph

22359 Commits

Author SHA1 Message Date
AndersonTorres
f6090d8ea3 perlPackages.DataHexDump: init at 0.02 2016-03-23 19:25:43 -03:00
Frederik Rietdijk
9289d383e2 Merge pull request #13751 from regnat/topydo
Topydo
2016-03-23 18:13:11 -04:00
Frederik Rietdijk
147d12a0a4 pythonPackages.cffi: 1.3.0 -> 1.5.2 2016-03-23 17:52:33 -04:00
Aneesh Agrawal
4fad4d49f6 icdiff: init at 1.7.3 2016-03-23 15:04:50 -04:00
joachifm
5e93b6d929 Merge pull request #14156 from ryanartecona/otool/remove
otool: remove
2016-03-23 18:42:21 +00:00
Peter Simons
511edb55bc Add LTS Haskell 5.9. 2016-03-23 18:25:26 +01:00
Arseniy Seroka
61fc93b432 telegram-purple: init at 2016-03-17 2016-03-23 19:22:58 +03:00
rnhmjoj
a4d5f49603 tweak: init at 3.20 2016-03-23 15:18:03 +01:00
Théophane Hufschmitt
ea0e09b774 pythonPackages.topydo: init at 0.9 2016-03-23 15:04:46 +01:00
Théophane Hufschmitt
7ca1e18932 pythonPackages.green: init at 2.3.0 2016-03-23 15:04:45 +01:00
Ryan Artecona
776c827842 otool: remove
The `otool` binary is provided by the `cctools` package (and `binutils`)
on darwin, which is properly packaged and compiled from source.

This old standalone `otool` was simply a symlink to `/usr/bin/otool`,
which notably depended on the user having already installed the Command
Line Tools via XCode, and would fail dependent builds if they hadn't.
2016-03-23 09:13:00 -04:00
Domen Kožar
d1c9f20db1 Merge pull request #14107 from nckx/drop-libav_9
libav: drop unused version 9.
2016-03-23 12:54:47 +00:00
Ludovic Courtès
5dab370d77 Remove Guix. 2016-03-23 13:33:29 +01:00
Greyson Fischer
7fe888e521 slack: init at 2.0.1 2016-03-23 11:29:18 +03:00
joachifm
ebd6566534 Merge pull request #14114 from sheenobu/mednaffe/newpkg
mednaffe: init at 0.8
2016-03-23 04:48:32 +00:00
Sheena Artrip
ef2f2de53a mednaffe: init at 0.8 2016-03-23 00:38:58 -04:00
Ryan Artecona
bb63c6a4c4 gobjectIntrospection: fix darwin build
Stop using obsolete `otool` package, preferring `cctools` (which
includes otool), on darwin.

Remove autoconf & automake from reqs, as they were unused.

Fixes #12670
2016-03-22 21:40:15 -04:00
zimbatm
61c3ad7d2b Merge pull request #14067 from zimbatm/foreman-0.78.0
foreman: init at 0.78.0
2016-03-22 23:26:44 +00:00
Shea Levy
49e53e6701 nix-exec: bump for new nix 2016-03-22 18:20:16 -04:00
Domen Kožar
ba78130c21 remove elrangR15 and riak 1.3.0 as they're outdated
(cherry picked from commit 4452a68425)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-22 21:40:07 +00:00
joachifm
b943350080 Merge pull request #14128 from mbakke/s3gof3r
s3gof3r: init at 0.5.0
2016-03-22 21:28:41 +00:00
Domen Kožar
59ba0fb295 nix-exec: use stable Nix 2016-03-22 21:24:23 +00:00
Marius Bakke
662bca47c1 s3gof3r: init at 0.5.0 2016-03-22 21:05:45 +00:00
Vladimír Čunát
ff60350eb9 ensureNewerSourcesHook: fix problems with symlinks
Fixes #14043. Now symlinks themselves are touched instead of their
targets.
2016-03-22 21:59:01 +01:00
Eelco Dolstra
4f47fe2f9c blender: 2.76b -> 2.77 2016-03-22 21:33:54 +01:00
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
Pascal Wittmann
891fd356d7 avarice: fix build by using gcc49
See #13559
2016-03-22 16:44:31 +01:00
Pascal Wittmann
2bb151f91b atftp: fix build by using gcc49
See #13559
2016-03-22 16:42:07 +01:00
Joachim Fasting
92261129ea archimedes: pin gcc to version 4.9
https://hydra.nixos.org/build/33241446/nixlog/1/raw
2016-03-22 15:39:40 +01:00
Joachim Fasting
aa4d438107 afterstep: pin gcc to version 4.9
See https://hydra.nixos.org/build/33238876/nixlog/1/raw
2016-03-22 15:39:40 +01: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