public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,432 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

68795 Commits

Author SHA1 Message Date
Domen Kožar 1049c9f3f2 Merge pull request #14136 from grahamc/slic3r 
slic3r: Add ModuleBuild to BuildInputs, to fix hydra build
 2016-03-23 12:54:01 +00:00
Domen Kožar b682a64e16 Merge pull request #14151 from tavyc/hhvm 
hhvm: 3.6.0 -> 3.12.1
 2016-03-23 12:50:38 +00:00
Ludovic Courtès 5dab370d77 Remove Guix. 2016-03-23 13:33:29 +01:00
Domen Kožar 4393e65a44 Merge pull request #14054 from NeQuissimus/kernel310101 
kernel: 3.10.99 -> 3.10.101
 2016-03-23 11:31:21 +00:00
Domen Kožar 2a428566e8 Merge pull request #14055 from NeQuissimus/kernel31257 
kernel: 3.12.55 -> 3.12.57
 2016-03-23 11:31:14 +00:00
Domen Kožar 4b29e2e6cb Merge pull request #14056 from NeQuissimus/kernel31465 
kernel: 3.14.63 -> 3.14.65
 2016-03-23 11:30:59 +00:00
zimbatm 40e9dff04a nix-prefetch-git: fix url_to_name heuristic 
The function wasn't checking that *all* of the characters where
[a-z0-9]. Fixes #13921
 2016-03-23 11:22:51 +00:00
zimbatm 89fd501441 Merge pull request #14147 from mcmtroffaes/feature/wolfssl-v3.9.0 
wolfssl: 3.8.0 -> 3.9.0
 2016-03-23 10:11:02 +00:00
Octavian Cerna 524310d29e hhvm: 3.6.0 -> 3.12.1 2016-03-23 11:58:15 +02:00
Matthias C. M. Troffaes 719fceba10 wolfssl: 3.8.0 -> 3.9.0 2016-03-23 09:15:21 +00:00
Michael Fellinger 6da0a54d2b zsh-navigation-tools: include znt-* functions 2016-03-23 10:05:52 +01:00
Greyson Fischer 7fe888e521 slack: init at 2.0.1 2016-03-23 11:29:18 +03:00
Arseniy Seroka f809c4a8d1 Merge pull request #14077 from peterhoeg/dropbox_cli 
dropbox-cli: minor refactoring to play nice with dropbox
 2016-03-23 11:21:03 +03:00
Sheena Artrip 7fb57383fc i3: 4.11 -> 4.12 2016-03-23 01:17:16 -04: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
Graham Christensen 29cf3ecd78 slic3r: Add ModuleBuild to BuildInputs, due to http://hydra.nixos.org/build/33298227/nixlog/1 2016-03-22 21:01:19 -05:00
Daniel Peebles 6f5a71dec8 Merge pull request #14134 from ryanartecona/gobjectIntrospection/fix-darwin 
gobjectIntrospection: fix darwin build
 2016-03-22 21:51:10 -04:00
Graham Christensen 587ae0f63f zam-plugins: sha256 changed 2016-03-22 20:50:11 -05: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
Charles Strahan 0547fd247f go-1.6: fix the build 
One of the test scripts dynamically creates and executes a bash script,
which attempts to use `/usr/bin/env bash`. This patches the file to
use the stdenv's shell instead.

Otherwise, the only way this could have worked was by building go_1_6
outside of the sandbox.
 2016-03-22 21:39:45 -04:00
Joachim Fasting 18b35bd741 cataclysm-dda: build recipe enhancements & gcc5 support 
- Remove redundant platform check; meta.platforms is sufficient
- Use postPatch rather than override patchPhase entirely
- Strip -Werror
- Move build-time only dependencies to nativeBuildInputs

This also fixes gcc5 build, which fails due to a deprecated-declarations
warning (see https://hydra.nixos.org/build/33117020/nixlog/2/raw).
 2016-03-23 01:44:02 +01:00
Domen Kožar b81400e960 Merge pull request #14130 from dgonyeo/master 
rkt: v1.1.0 -> v1.2.0
 2016-03-22 23:34:51 +00:00
zimbatm a37f634866 Merge pull request #14068 from zimbatm/xdg-utils-1.1.1 
Xdg utils 1.1.1
 2016-03-22 23:34:04 +00: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
Rickard Nilsson 3b718bd5a0 rt: 4.2.12 -> 4.4.0 2016-03-23 00:17:50 +01:00
joachifm 0e04a391a0 Merge pull request #14131 from NeQuissimus/ohmyzsh20160319 
oh-my-zsh: 2016-03-11 -> 2016-03-19
 2016-03-22 23:03:24 +00:00
Shea Levy 49e53e6701 nix-exec: bump for new nix 2016-03-22 18:20:16 -04:00
Tim Steinbach 00db6a67f1 oh-my-zsh: 2016-03-11 -> 2016-03-19 2016-03-22 22:04:39 +00:00
Derek Gonyeo 587fbb5b15 rkt: v1.1.0 -> v1.2.0 2016-03-22 14:59:55 -07: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
Domen Kožar b7f50b493c flow: 0.18.1 -> 0.22.1 
(cherry picked from commit 15761b0520383a816d250b4301982e9d088be14b)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-22 21:22:15 +00:00
Marius Bakke 662bca47c1 s3gof3r: init at 0.5.0 2016-03-22 21:05:45 +00:00
zimbatm b6c5879549 Merge pull request #14102 from manveru/capybara-webkit 
capybara-webkit: gem needs qt5Full
 2016-03-22 20:42:47 +00:00
Eelco Dolstra 4f47fe2f9c blender: 2.76b -> 2.77 2016-03-22 21:33:54 +01:00
Eelco Dolstra 5759b447dc opensubdiv: 3.0.3 -> 3.0.4 2016-03-22 21:33:54 +01:00
zimbatm 6c3f9869cc Merge pull request #14111 from ryantrinkle/nix-prefetch-git-submodules-json 
nix-prefetch-scripts: make nix-prefetch-git report fetchSubmodules in its JSON output
 2016-03-22 20:28:23 +00: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
Domen Kožar 0aee790c21 Merge pull request #14122 from frewsxcv/patch-1 
Fetch setuptools from PyPi via HTTPS.
 2016-03-22 20:15:39 +00:00
Nikolay Amiantov ad1f158111 Merge pull request #14088 from jgillich/rust-head 
Rust updates
 2016-03-23 00:10:07 +04:00
Jakob Gillich 74ef06dab6 exa: 2016-02-15 -> 2016-03-22 2016-03-22 15:54:23 -04:00
Daiderd Jordan 50ee78afa8 expose bootstrapped-pip in pythonPackages 2016-03-22 20:37:03 +01:00
Luca Bruno b6aa08878d Merge pull request #14121 from romildo/fix.gnome 
Use wrapGAppsHook to wrap environment variables in some gnome3 applications
 2016-03-22 20:15:17 +01:00
Corey Farwell beabbc228c Fetch setuptools from PyPi via HTTPS. 2016-03-22 15:10:08 -04:00
José Romildo Malaquias 5b642fb8db epiphany: refactor wrapping variables in binaries 2016-03-22 14:28:34 -03:00
José Romildo Malaquias c326507dbe gedit: refactor wrapping variables in binaries 2016-03-22 14:27:19 -03:00
José Romildo Malaquias 5fe5a777e4 file-roller: refactor wrapping variables in binaries 2016-03-22 14:26:17 -03:00
José Romildo Malaquias 4fc7fa9d1d nautilus: refactor wrapping variables in binaries 2016-03-22 14:26:11 -03:00
José Romildo Malaquias 877a08b7d5 gnome-calculator: refactor wrapping variables in binaries 2016-03-22 14:23:27 -03:00
José Romildo Malaquias e4d8d4d234 evince: refactor wrapping variables in binaries 2016-03-22 14:22:12 -03:00
José Romildo Malaquias 768b9d852d eog: refactor wrapping variables in binaries 2016-03-22 14:20:31 -03: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 02b20eecc2 rustfmt: 2016-02-15 -> 2016-03-22 2016-03-22 17:33:06 +01:00
José Romildo Malaquias 416f10528a dconf-editor: refactor wrapping variables in binaries 2016-03-22 13:31:41 -03:00
Thomas Tuegel 8e3a1a8d3e Merge pull request #14118 from zimbatm/quassel-for-real 
quassel: fix sources
 2016-03-22 09:03:47 -05:00
joachifm 4f0324f766 Merge pull request #14116 from otwieracz/utox 
utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319
 2016-03-22 13:01:43 +00:00
Luca Bruno 3cc7e65729 Merge pull request #14117 from romildo/fix.gnome-terminal 
gnome-terminal: refactor wrapping variables in binaries
 2016-03-22 13:33:39 +01:00
Jakob Gillich f215a71c6c rustPackages: 2016-03-10 -> 2016-03-22 2016-03-22 13:16:57 +01:00
Jakob Gillich a9326f6f34 cargoMaster: 2016-02-25 -> 2016-03-22 2016-03-22 13:16:56 +01:00
Jakob Gillich 3e2495be57 rustcMaster: 2016-02-25 -> 2016-03-22 2016-03-22 13:16:56 +01:00
zimbatm 23b9d037de quassel: fix sources 
Fixes changes after #14080 where the updated hash was missing.

Put the source in a common file so there is only one place to update.
 2016-03-22 12:10:22 +00:00
José Romildo Malaquias fdc0edff3e gnome-terminal: refactor wrapping variables in binaries 2016-03-22 08:41:10 -03:00
vbgl 9bb2dd5e10 Merge pull request #14109 from zimbatm/scribus-1.4.6 
scribus: 1.4.5 -> 1.4.6
 2016-03-22 12:32:03 +01:00
Slawomir Gonet eddb7a55f8 utox: 0.5.0 -> 0.7.0, libtoxcore: 20160131 -> 20160319 2016-03-22 08:42:07 +01:00
Cole Mickens ead287939b plex: plexpass: 0.9.16.2.1827 -> 0.9.16.3.1840 2016-03-21 20:47:42 -07:00
Ryan Trinkle be30ba8e0e nix-prefetch-scripts: make nix-prefetch-git report fetchSubmodules in its JSON output 
Previously, nix-prefetch-git would report the same JSON whether submodules were being fetched or not; with this change, the --fetch-submodules option will cause the JSON output to include "fetchSubmodules": true, so that fetchgit (builtins.fromJSON (builtins.readFile ./path/to/output.json)) will work.
 2016-03-21 23:26:18 -04:00
Franz Pletz f03993366e fail2ban: 0.9.3 -> 0.9.4 2016-03-22 02:12:43 +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 29275f9740 gqrx: 2.3.2 -> 2.5.3 2016-03-22 01:18:01 +01:00
Franz Pletz 441f8a84c0 gnuradio: 3.7.8.1 -> 3.7.9.1 2016-03-22 01:18:01 +01:00
Franz Pletz b2f92582fb uhd: 3.7.0 -> 3.9.3 2016-03-22 01:18:01 +01:00
Tobias Geerinckx-Rice c0a35241f0 mcelog: 133 -> 134 
trigger: Avoid warning from earlier merge
 2016-03-22 00:59:15 +01:00
Franz Pletz bf9f211ae3 whois: 5.2.10 -> 5.2.11 2016-03-22 00:52:40 +01:00
zimbatm b40a25b922 scribus: 1.4.5 -> 1.4.6 2016-03-21 22:17:31 +00:00
Franz Pletz fbdcbaf25c horst: 2015-07-22 -> 2016-03-15 2016-03-21 22:07:25 +01:00
Thomas Tuegel 6c05554b85 emacsPackagesNg: remove compatibility cl-lib 
ELPA has the compatibility library cl-lib-0.5 which interferes with the
builtin cl-lib-1.0.
 2016-03-21 15:36:39 -05:00
Pascal Wittmann 806f71370c amuleGui: fix build 
See #13559
 2016-03-21 21:29:39 +01:00
Franz Pletz 1a9b272c09 nss: 3.22.2 -> 3.23 (security) 
Fixes CVE-2016-1950.

See: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.23_release_notes
 2016-03-21 21:27:59 +01:00
Arseniy Seroka 1bb80801eb Merge pull request #14044 from kamilchm/youcompleteme 
vimPlugins: youcompleteme FIX #14006 No rule to make target 'ycm_support_libs'
 2016-03-21 23:19:59 +03:00
zimbatm d47fbff0e9 Merge pull request #14106 from zimbatm/rspamd-1.2.0 
Rspamd 1.2.0
 2016-03-21 19:41:41 +00:00
Mitch Tishmack db6dff75bd htop: fix build on darwin 2016-03-21 14:05:01 -05:00
Michael Raskin 74f04dc83c stumpwm: Pass through the sbcl and lispPackages used 2016-03-21 19:55:25 +01: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
zimbatm 883f73f39d rspamd: 1.1.3 -> 1.2.0 2016-03-21 16:25:59 +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
aszlig 4d305102e0
google-chrome: Fix fetching upstream binary 
Commit aa097946d2 only fixed evaluation.

Ssince 37dbd62 however, the fetchurl call is already implied so just
changing the path will still result in fetchurl (fetchurl ...), so let's
drop the outer fetchurl.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @msteen, @benley
 2016-03-21 16:15:18 +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
Graham Christensen 75c90fff39 squid: 3.5.1 -> 3.5.15 for CVE-2016-2571 2016-03-21 09:06:47 -05:00
Maxwell 5c740539a8 ansifilter: init at 1.15 2016-03-21 09:42:32 -04:00
Peter Simons 9405b1f497 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: cc6b62965c
  - Hackage: 8103415143
  - LTS Haskell: 6bcb171af7
  - Stackage Nightly: 26f7d11e37
 2016-03-21 13:18:57 +01:00
Peter Simons ca34db0409 configuration-hackage2nix.yaml: update list of broken packages 2016-03-21 13:18:56 +01:00
Peter Simons bd2bc77f8c haskell-transformers-compat: fix build with GHC 8.0.x 2016-03-21 13:17:54 +01:00
Tim Steinbach 6476075ccf kernel: 3.18.28 -> 3.18.29 (close #14057) 2016-03-21 12:39:29 +01:00
Tim Steinbach 379709b404 kernel: 4.1.17 -> 4.1.20 (close #14058) 2016-03-21 12:15:25 +01:00
Vladimír Čunát aa097946d2 chrome: fix evaluation after 6041cfe2af 2016-03-21 12:04:33 +01:00
Michael Fellinger 4873838f75 capybara-webkit: gem needs qt5Full 2016-03-21 12:01:37 +01:00
Evgeny Egorochkin 5db2d9366b subversion: fix hash 2016-03-21 12:47:54 +02:00
Vladimír Čunát 1d11940aac Merge #14005: libav improvements 
It includes more than the PR itself.
 2016-03-21 09:59:18 +01:00
Vladimír Čunát 07a3d42023 libav: minor updates 11.4 -> 11.6 
The older branches seem unmaintained and better not used -
/cc maintainer of keyfinder @nckx.
 2016-03-21 09:57:09 +01:00
Vladimír Čunát 02b13f7bdb libav: fixup sandboxed builds after parent commit 2016-03-21 09:56:25 +01:00
Kamil Chmielewski 6386d68e9d vimPlugins: youcompleteme FIX #14006 No rule to make target 
'ycm_support_libs'
599de71575 (diff-6725b893dfc969abac4f4ee39a3a317f)
 2016-03-21 09:45:57 +01:00
Ryan Artecona 1662881740 libav: support Darwin & install docs/manpages 
Close #14005.
 2016-03-21 09:44:42 +01:00
joachifm 6757b91489 Merge pull request #14086 from mbakke/yubikey-updates 
Yubikey updates
 2016-03-21 06:51:55 +00:00
aszlig 96a9c23f49
Merge branch 'chromium-source-refactor' 
Fixes #12794 by reverting the source tree splitup (c92dbff) to use the
source tarball directly into the main Chromium derivation and making the
whole source/ subdirectory obsolete. The reasons for this are explained
in 4f981b4f84.

This also now renames the "sources.nix" file to "upstream-info.nix",
which is a more proper name for the file, because it not only contains
"source code" but also the Chrome binaries needed for the proprietary
plugins (of course "source" could also mean "where to get it", but I
wanted to avoid this ambiguity entirely).

I have successfully built and tested this using the VM tests.

All results can be found here:

https://headcounter.org/hydra/eval/313435
 2016-03-21 04:10:06 +01:00
Franz Pletz 404a699a20 bind: 9.10.3 -> 9.10.3-P4 (security) 
Fixes:

  * CVE-2016-1285: https://kb.isc.org/article/AA-01352/
  * CVE-2016-1286: https://kb.isc.org/article/AA-01353/
 2016-03-21 03:53:21 +01:00
Franz Pletz b33453bd98 lxc: Add patch to fix bash completion 
Fixes #9616.
 2016-03-21 03:06:19 +01:00
Franz Pletz 4d0d1124ae lxc: 1.1.4 -> 1.1.5 2016-03-21 03:05:59 +01:00
Marius Bakke fb215f25d4 goPackages: rename date to version 2016-03-21 01:36:52 +00:00
Tobias Geerinckx-Rice 9d629f52c8 btrfs-progs: 4.4.1 -> 4.5 
Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
 2016-03-21 01:56:17 +01:00
Tobias Geerinckx-Rice e45c1aad66 simple-scan: 3.19.92 -> 3.20.0 2016-03-20 23:56:15 +01:00
Tobias Geerinckx-Rice a685456213 dropbear: 2016.72 -> 2016.73 
Changes: https://matt.ucc.asn.au/dropbear/CHANGES.
 2016-03-20 23:20:56 +01:00
Tobias Geerinckx-Rice d7a0a99f7f zpaq: 706 -> 707 
Fixes v7.06 bug in creating multipart encrypted archives with
incorrectly salted index.
 2016-03-20 23:20:56 +01: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
aszlig 5ebd629c6f
chromium: Fix comment of upstream-info.nix 
As of 6041cfe, the upstream-info.nix (back then it was called
sources.nix) is no longer in the source/ subdirectory, so we need to fix
that comment to say that the file is autogenerated from update.sh in the
*same* directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-03-20 23:10:13 +01:00
Ryan Artecona f3f8da4a5f libav: support Darwin & install docs/manpages 2016-03-20 17:42:34 -04:00
Aneesh Agrawal 16ed322928 htop: fix platforms attribute 
See comments at
57dd725e85.

These values are already lists and need to be concatenated together
instead of placed in another list.
 2016-03-20 17:27:34 -04:00
Rommel M. Martinez ae81e1f528 emem: 0.2.14 -> 0.2.15 2016-03-21 04:53:16 +08:00
Pascal Wittmann e5343cd9e6 bitlbee: write pid file to /var/lib/bitlbee/bitlbee.pid 
Previously it was written to /var/lib/bitlbee.pid but on
NixOS the user bitlbee has no write access to /var/lib/.
 2016-03-20 21:23:53 +01:00
Domen Kožar 1536834ee0 Merge pull request #14066 from jerith666/crashplan-46 
crashplan: 3.6.4 -> 4.6.0
 2016-03-20 20:10:28 +00:00
aszlig fb65a0048a
chromium: Revert working around --sysroot filter 
This reverts commit 5979946c41.

I have tested this by building against the stable version of Chromium
and it seems to compile just fine, so it doesn't seem to be needed
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-03-20 21:05:49 +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
zimbatm 3f909d8f64 Revert "quassel: 0.12.2 -> 0.12.3" 
This reverts commit f2e051b29e.
 2016-03-20 19:38:05 +00:00
zimbatm 57dd725e85 htop: fix supported platforms list 2016-03-20 19:35:59 +00:00
zimbatm f2e051b29e quassel: 0.12.2 -> 0.12.3 2016-03-20 19:33:53 +00:00
Nicolas B. Pierron aa7f0fc214 Move stdenvOverrides under pkgsWithOverrides. 2016-03-20 19:26:57 +00:00
Thomas Tuegel f8ab300767 Merge pull request #14080 from zimbatm/quassel-0.12.3 
quassel: 0.12.2 -> 0.12.3
 2016-03-20 14:23:31 -05: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
Arseniy Seroka 2d1893899b Merge pull request #14081 from simonvandel/patch-1 
kodiPlusings.pvr-hts: fix loading of plugin
 2016-03-20 21:53:30 +03:00
Marius Bakke 23befca742 yubikey-personalization-gui: 3.1.21 -> 3.1.24 2016-03-20 18:49:05 +00:00
Marius Bakke 451a7ec4a9 yubikey-personalization: 1.17.2 -> 1.17.3 2016-03-20 18:48:49 +00:00
Marius Bakke 1489af2153 yubico-piv-tool: 1.0.2 -> 1.3.0 2016-03-20 18:42:23 +00:00
Marius Bakke 54f6695928 libykneomgr: 0.1.7 -> 0.1.8 2016-03-20 18:39:30 +00:00
Marius Bakke fdf8c73f15 goPackages.oh: 2016-02-23 -> 2016-03-02 2016-03-20 18:32:21 +00:00