Commit Graph

14554 Commits

Author SHA1 Message Date
Eelco Dolstra
13a1c7b8c1 useOldCXXAbi: Change into a setup hook
Stdenv adapters considered weird.
2016-04-01 13:36:59 +02:00
Eric Litak
0de2d2fbcd mfi: init at 2.1.11
This package has some outdated dependencies, so old versions of mongodb
and v8 had to be re-added as well.
2016-04-01 02:45:11 -07:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
joachifm
0660ff5625 Merge pull request #14334 from ne0phyte/kicad-4.0.2
kicad: 2013 stable -> 4.0.2
2016-03-31 21:01:22 +00:00
joachifm
3f31284e9b Merge pull request #14310 from andrewrk/qgifer
qgifer: init at 0.2.1
2016-03-31 20:57:49 +00:00
Frederik Rietdijk
4bd01c5cbd openblas_2_14: remove
because we don't need it for numpy anymore.
2016-03-31 21:51:45 +02:00
Nikolay Amiantov
9b7edbeb2f primus: propagate stdenv to primusLibs 2016-03-31 19:52:33 +03:00
Arseniy Seroka
ca30594c87 Merge pull request #14095 from guaraqe/grive-2
grive2: init at 0.5.0
2016-03-31 16:48:50 +03:00
guaraqe
1d09c97ac4 grive2: init at 0.5.0
grive2: update 0.5.0

grive2: various cosmetic changes
2016-03-31 15:42:45 +02:00
ne0phyte
cce37d2164 kicad: 2013 stable -> 4.0.2 2016-03-31 15:29:39 +02:00
Michael Raskin
cdb2bc77c4 davfs2: 1.4.7 -> 1.5.2; fixes the build 2016-03-31 14:14:40 +02:00
Nikolay Amiantov
594cd3bf5e Merge pull request #14337 from dguibert/fix/skype
skype: build qt4 with the 32bits clangStdenv
2016-03-31 13:49:58 +04:00
David Guibert
7f69d5ed8c skype: build qt4 with the 32bits clangStdenv
This allows to build skype without errors like this:
clang++ -Wl,-O1 -o libmng libmng.o     -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/72nklasrjg774iwxxnpyxwkzxz2j37v5-libmng-2.0.2/lib/libmng.so when searching for -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: cannot find -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.so when searching for -lm
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.a when searching for -lm
clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation)
2016-03-31 10:37:02 +02:00
Franz Pletz
e5334ceca2 Merge pull request #14305 from benwbooth/xe-guest-utilities-6.2.0
xe-guest-utilities: init at 6.2.0
2016-03-31 10:12:42 +02:00
Nikolay Amiantov
1d24a7b6f8 tdesktop: init at 0.9.33 2016-03-30 22:22:51 +03:00
Nikolay Amiantov
a8f5991db7 libunity: init at 6.12.0 2016-03-30 22:22:51 +03:00
Nikolay Amiantov
e0ee6dc8fc breakpad: init at 2016-03-28 2016-03-30 22:22:51 +03:00
Nikolay Amiantov
01e2511668 dee: init at 1.2.7 2016-03-30 22:22:51 +03:00
Nikolay Amiantov
c419e3c6d6 libgee_0_6: init at 0.6.8 2016-03-30 22:22:51 +03:00
Nikolay Amiantov
c091e61a09 pcre: add 16- and 32-bit character size versions 2016-03-30 22:22:51 +03:00
Domen Kožar
a1cfdb9c88 remove erlangR14: outdated and doesn't build 2016-03-30 18:54:58 +01:00
Ben Booth
449d908b88 xe-guest-utilities: init at 6.2.0
use mkEnableOption

use sha256

add xe-guest-utilities to module-list.nix
2016-03-30 09:27:40 -07:00
Luca Bruno
088231fe9f libiberty: add static variant 2016-03-30 17:51:19 +02:00
joachifm
532beaa2a3 Merge pull request #13913 from grwlf/torch
torch: add expression for Torch7 the machine-learning framework
2016-03-30 14:29:32 +00:00
Domen Kožar
96be420e44 move growpart out of nixos into cloud-init package 2016-03-30 14:40:24 +01:00
Andrew Kelley
09fe0e3c81 qgifer: init at 0.2.1 2016-03-30 04:54:13 -07:00
Franz Pletz
ef31c0ecd2 Merge pull request #14308 from juliendehos/fswebcam
fswebcam: init 20140113
2016-03-30 11:15:39 +02:00
Julien Dehos
70af93f0ca fswebcam: init 20140113 2016-03-30 09:48:11 +02:00
Franz Pletz
e498a645c1 ncat: Remove old package, available in nmap 2016-03-30 08:53:22 +02:00
Lluís Batlle i Rossell
f6a44bea9e Updating wings and dependencies to match erlang
I updated the erlang esdl lib, added the erlang cl lib,
added opencl-headers and ocl-icd to make wings build and run.

I have not tested its opencl part; I only added dependencies so
it builds.
2016-03-29 12:24:42 +02:00
Arseniy Seroka
63c78c34ab Merge pull request #14288 from kragniz/opencpn
opencpn: init at 4.2.0
2016-03-29 10:15:48 +03:00
Louis Taylor
b40f0ac3c7 opencpn: init at 4.2.0 2016-03-29 07:31:56 +01:00
Nikolay Amiantov
a6e0046b75 Merge pull request #14218 from abbradar/avidemux
avidemux: 2.5.6 -> 2.6.12
2016-03-29 04:48:51 +04:00
Patrick Callahan
66b5055b95 gazebo: init at 6.5.1 and 7.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan
565b7b34ed ignition.transport: init at 0.9.0 and 1.0.1 2016-03-28 11:44:37 -07:00
Patrick Callahan
3c95d6d1ea sdformat: init at 3.7.0 and 4.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan
b682906b6a ignition robotics libs: init; .math: init at 2.3.0 2016-03-28 11:44:37 -07:00
Patrick Callahan
008bcf51a4 tinyxml-2: init at 3.0.0 2016-03-28 11:44:36 -07:00
Shea Levy
57d5860bd5 Merge branch 'bower2nix' 2016-03-28 12:59:49 -04:00
joachifm
58ef31f18a Merge pull request #14263 from risicle/osrm_remove_luajit
osrm-backend: remove osrm-backend_luajit variant - it has been broken for a while
2016-03-28 15:59:01 +00:00
Frederik Rietdijk
7ab852d7b8 Merge pull request #12538 from FRidh/yakuake
kde5.yakuake: init at 3.0.2
2016-03-28 14:55:41 +02:00
Frederik Rietdijk
c39fe33998 kde5.yakuake: init at 3.0.2 2016-03-28 14:52:20 +02:00
Andrew Kelley
f5fe051c71 llvm: 3.7.1 -> 3.8.0 (close #13801)
vcunat's review:
 - let's not switch the default versions of llvm* for now
 - the only changes I see is adding python to clang's buildInputs
   and using the big so-file as discussed in #12759
   (BUILD_SHARED_LIBS -> LLVM_LINK_LLVM_DYLIB)
 - in future it will be nice to split libLLVM into a separate output
2016-03-28 13:37:31 +02:00
Robert Scott
01f96aa572 osrm-backend: remove osrm-backend_luajit variant - it has been broken for a while 2016-03-28 10:45:16 +00:00
Rodney Lorrimar
b22e94c200 Add pkgs.buildBowerComponents function 2016-03-28 08:25:44 +01:00
Rodney Lorrimar
457eddd18f bower2nix: 2.1.0 -> 3.0.1
1. Update bower2nix version and add new/updated dependencies into
   node-packages-generated.nix. This was done manually, with npm2nix
   generating the initial set of derivations. In future, it would be
   nice to have an automatic process (see #10358, #9332).

2. Add an override to nodePackages.bower2nix wrapping the commands so
   that git is on the PATH.

3. Update fetchbower to support new command-line options of bower2nix,
   and to allow github URL tag versions.
2016-03-28 08:23:06 +01:00
Vladimír Čunát
8ffe681713 qt4-clang: fix fallout from f9b5ed66d1
There's still the question of Hydra binaries etc. but this should at
least fix evaluation and running problems.
2016-03-28 09:05:12 +02:00
joachifm
4989fd85d4 Merge pull request #14210 from LatitudeEngineering/latitude/topic/genromfs
genromfs: init at 0.5.2
2016-03-28 03:41:38 +00:00
Eelco Dolstra
f9b5ed66d1 Inline qt4-clang
This prevents a potential name/version conflict in nix-env, and a
large Hydra build for a proprietary package.
2016-03-27 23:32:15 +02:00
Domen Kožar
0d73970db6 xen: use gcc49
(cherry picked from commit 0e41e8bbf0d54d4f7918b8010e9f2e77ce27cca6)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 21:45:21 +01:00
Domen Kožar
e4c33a688d Merge pull request #14246 from abbradar/skype-workaround
skype: use clang-built qt4 to fix segfault
2016-03-27 20:21:29 +01:00
Nikolay Amiantov
539f1f3659 dwarf-fortress-packages: recurse into attrs (to build free packages) 2016-03-27 19:35:32 +03:00
Christoph Hrdinka
a7e280b0f4 Merge pull request #14233 from matthiasbeyer/add-buku
buku: init at 1.8
2016-03-27 18:03:38 +02:00
Nikolay Amiantov
28af80fcc0 skype: use clang-built qt4 to fix segfault 2016-03-27 15:48:06 +03:00
Matthias Beyer
45604fc46b buku: init at 1.8 2016-03-27 14:39:39 +02:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Peter Hoeg
6911785c03 togglesg-download: init at 2016-02-08 2016-03-27 15:08:23 +08:00
Patrick Callahan
387e15764b genromfs: init at 0.5.2 2016-03-26 10:35:26 -07:00
Nikolay Amiantov
8b0076b887 avidemux: 2.5.6 -> 2.6.12 2016-03-26 17:36:41 +03:00
Nikolay Amiantov
f273dd226c swarm: init at 3.1 2016-03-26 17:04:41 +03:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr
013f808a06 netcdf-fortran: init at 4.4.3 2016-03-26 10:33:39 +01:00
zimbatm
4908973b08 Merge pull request #14186 from LatitudeEngineering/latitude/topic/qgroundcontrol
qgroundcontrol: init at 2.9.4
2016-03-25 20:45:24 +00:00
Joachim Fasting
803b21959e bigloo: pin gcc version to 4.9
https://hydra.nixos.org/build/33120353/nixlog/1/raw
2016-03-25 07:46:40 +01:00
Brad Ediger
cdca9d64b4 dvdbackup: init at 0.4.2 2016-03-24 23:16:14 -05:00
Patrick Callahan
f30e40df69 qgroundcontrol: init at 2.9.4 2016-03-24 20:06:31 -07:00
joachifm
42996e63f8 Merge pull request #14180 from ebzzry/deco-0.0.1
deco: init at 0.0.1
2016-03-24 22:45:47 +00:00
Rommel M. Martinez
90a3c8d358 deco: init at 0.0.1 2016-03-25 06:16:07 +08:00
Arseniy Seroka
2358582976 Merge pull request #14045 from otwieracz/master
znapzend: added
2016-03-24 23:10:40 +03:00
Slawomir Gonet
cb81a3fd2a znapzend: init at 0.15.3 2016-03-24 20:57:16 +01:00
Nicolas B. Pierron
5d6a4a6fa9 Merge pull request #14000 from nbp/fix-extend
Use fix and extends functions for all-packages.nix
2016-03-24 20:54:20 +01:00
Tobias Geerinckx-Rice
99c4f143d9 debian-devscripts: rename from deprecated debian_devscripts 2016-03-24 20:24:00 +01:00
Tobias Geerinckx-Rice
75326bee6a snapper: temporarily ‘fix’ build like in e2cbf68
Fixes https://hydra.nixos.org/build/33510202.
2016-03-24 20:23:58 +01:00
Svintsov Dmitry
64fe4ad82d mxu11x0: init at 1.3.11 2016-03-24 20:19:22 +05:00
Lluís Batlle i Rossell
a9d14e3452 Setting gfortran to gcc5. octave was crashing.
Otherwise, using imread() in octave threw:

/nix/store/4fvwfzwg58d7167an550xm1k6m7px443-octave-4.0.0/lib/octave/4.0.0/oct/x86_64-unknown-linux-gnu/__magick_read__.oct: failed to load: /nix/store/w7xr6frwffrl135v7vpxdwmnx8l95j5m-gfortran-4.9.3/lib/libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by /nix/store/qlxkin1arzwbcpiny6amn8747wp8ndg7-graphicsmagick-1.3.21/lib/libGraphicsMagick++.so.11)

(this is from 16.03, although I push this to staging)
2016-03-24 10:55:18 +01:00
joachifm
5e93b6d929 Merge pull request #14156 from ryanartecona/otool/remove
otool: remove
2016-03-23 18:42:21 +00: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
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 4452a68425e4eaf9db95e0fc5ac8474a2b19bc71)
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
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
Sergey Mironov
ebd7598da4 torch: remove broken luajitPackages 2016-03-22 18:04:34 +03: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
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
Sergey Mironov
5211ddb92e torch: add main application to the top-level 2016-03-21 22:10:00 +03: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
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
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
Sergey Mironov
4a36a0c504 torch: unhardcode references to luajit 2016-03-21 12:53:34 +03:00
Arseniy Seroka
84ba149e79 Merge pull request #14065 from zimbatm/htop-crossplatform
htop: merge both implementations
2016-03-20 21:55:00 +03: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
5cdaa7b907 Remove all-packages.nix helperFunctions dependency. 2016-03-20 16:41:20 +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
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
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
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