JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,496 Commits 2 Branches 0 Tags 13 GiB
5e694aa3b3
Commit Graph

13437 Commits

Author SHA1 Message Date
Charles Strahan
ec1c8071b1 macvim: fix build 2016-05-06 22:32:23 -04:00
Nathaniel Baxter
24ffbfde1d teamspeak_client: 3.0.18.2 -> 3.0.19.1 2016-05-07 09:52:49 +10:00
Tobias Geerinckx-Rice
237168d452
neovim: unmaintain 
*reinstalls emacs*
 2016-05-06 19:17:07 +02:00
Robert Helgesson
1a5b5593d6 eclipse-plugin-scala: 4.4.0 -> 4.4.1 2016-05-06 13:59:01 +02:00
Bart Brouns
f43265657d faustCompressors: init at 0.1.1, update other magnetophon-dsp to use lv2 gui 2016-05-06 13:56:40 +02:00
Andrey Pavlov
f5668437ab hub: 2.2.2 -> 2.2.3 2016-05-06 10:39:29 +03:00
Joachim Fasting
aa478b5021
bittorrentSync: factor out common parts 2016-05-06 01:03:04 +02:00
Joachim Fasting
e4bd66c8f0
bittorrentSync20: 2.3.6 -> 2.3.7 2016-05-06 00:42:31 +02:00
Joachim Fasting
29ddb150c8 Merge pull request #15247 from uralbash/flamerobin 
flamerobin: init at 0.9.3.1
 2016-05-05 23:56:54 +02:00
Svintsov Dmitry
8658f9fe5c flamerobin: init at 0.9.3.1 2016-05-06 01:45:43 +05:00
zimbatm
3ade1e7d3e Merge branch 'pr/14911' 2016-05-05 21:28:27 +01:00
Joaquim Pedro França Simão
133dc10e5a open-vm-tools: fixes host VMware errors 2016-05-05 21:27:54 +01:00
Joaquim Pedro França Simão
0ecef73966 open-vm-tools: updates to 10.0.7 and fixes compilation erros 2016-05-05 21:27:54 +01:00
zimbatm
982ad14515 Merge pull request #15104 from magnetophon/faust2lv2gui-master 
faust2lv2gui: newest faust can create gui for lv2
 2016-05-05 21:08:17 +01:00
Joachim Fasting
2d158dc388 Merge pull request #15245 from bobvanderlinden/popcorntime-removed 
popcorntime: removed package as discussed in #15120
 2016-05-05 21:18:26 +02:00
Bob van der Linden
1b2fb84d75 popcorntime: removed package as discussed in #15120 2016-05-05 21:02:31 +02:00
Joachim Fasting
debc317066 Merge pull request #15242 from kragniz/weechat-1.5 
weechat: 1.4 -> 1.5
 2016-05-05 20:59:04 +02:00
Michael Raskin
9dc5dcf6db mercurial: 3.7.3 -> 3.8.1 2016-05-05 20:30:59 +02:00
zimbatm
c7c08ced11 Merge pull request #15238 from binarin/keepass-gtk-warning 
keepass: fix warning about missing GTK
 2016-05-05 19:14:05 +01:00
Louis Taylor
393bde55f9 weechat: 1.4 -> 1.5 2016-05-05 18:52:35 +01:00
Bart Brouns
ebba6571fe
i-score: init at 1.0.0-a67 
Closes #15137
 2016-05-05 18:45:49 +02:00
Joachim Fasting
6d2625a940
bittorrentSync14: 1.4.110 -> 1.4.111 2016-05-05 18:35:20 +02:00
Joachim Fasting
1b6ba3989b Merge pull request #15237 from steveeJ/bump-rkt 
rkt: 1.4.0 -> 1.5.1
 2016-05-05 18:10:13 +02:00
Vladimír Čunát
ee2fbda77a Merge #15218: thunderbird: 38.7.1 -> 45.0 2016-05-05 17:14:06 +02:00
Joel Moberg
7eb8e98500 qjackctl: 4.0 -> 4.2, qt4 -> qt5 2016-05-05 12:05:45 +02:00
Stefan Junker
213f0f23a8 rkt: 1.4.0 -> 1.5.1 2016-05-05 12:01:58 +02:00
Alexey Lebedeff
d625c7ee3f keepass: fix warning about missing GTK 
Some part of Mono is trying to dynamically load GTK - starting `keepass`
always shows warning:

```
Gtk not found (missing LD_LIBRARY_PATH to libgtk-x11-2.0.so.0?), using built-in colorscheme
```
 2016-05-05 12:25:24 +03:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Vladimír Čunát
7a005601d4 Merge branch 'master' to resolve conflicts 2016-05-05 08:25:38 +02:00
Tobias Geerinckx-Rice
2dc8975bc4
thunderbird: 38.7.1 -> 45.0 
Changes: https://www.mozilla.org/en-US/thunderbird/45.0/releasenotes/
 2016-05-05 02:14:19 +02:00
Rok Garbas
2eac1070ad Merge pull request #15229 from DamienCassou/notmuch-0.22 
notmuch: 0.21 -> 0.22
 2016-05-05 00:16:04 +02:00
aszlig
3f7735fe65
chromium+chrome: Don't import update.nix directly 
Regression introduced by f28b71023c.

Let's now expose and use the upstream-info attribute via the main
Chromium derivation, so that other packages like the google-chrome
package doesn't need to rely on internals of the Chromium
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-05-04 23:12:33 +02:00
aszlig
f28b71023c
chromium/updater: Don't import <nixpkgs> again 
This effectively resets the attributes given at the point the main
<nixpkgs> is imported and thus for example is also reading in stuff like
~/.nixpkgs/config.nix again, which might lead to unexpected results.

We now only import <nixpkgs> now if the updater is auto-called (like in
update.sh), otherwise the required attributes are passed by callPackage
within the Chromium scope.

I remember noting about this a while ago either on IRC or on GitHub, but
I can't find it right now, so thanks to @obadz for reminding me about
this in #15225.

Tested this by running the updater and also using:

NIXPKGS_CONFIG=$(pwd)/broken.nix nix-instantiate --arg config {} -A chromium

The contents of broken.nix were:

EVALERR{

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #15225
 2016-05-04 22:35:24 +02:00
Damien Cassou
d122556a2f notmuch: 0.21 -> 0.22 2016-05-04 21:49:08 +02:00
Joachim Fasting
35efc53274 Merge pull request #15214 from taku0/lp_solve_isnan 
lp_solve: fixed build error due to defining isnan
 2016-05-04 20:55:51 +02:00
Arseniy Seroka
9cb8abe846 Merge pull request #15208 from taku0/firefox-bin-46.0.1 
firefox-bin: 45.0.2 -> 46.0.1
 2016-05-04 21:38:47 +03:00
Dan Peebles
1eab39cdce makeself: fix patch to find the makeself header properly 2016-05-04 16:39:24 +00:00
Eelco Dolstra
1f84e43239 Do some large, concurrency-capable builds on dedicated machines 2016-05-04 18:16:27 +02:00
Eelco Dolstra
f2d24b9840 chromium: Disable Hydra builds of -dev and -beta 
It's not the job of Nixpkgs to distribute beta versions of upstream
packages. More importantly, building these delays channel updates by
several hours, which is bad for our security fix turnaround time.
 2016-05-04 18:16:27 +02:00
Michael Raskin
942db2e9ac imagemagick: libwebp just has to be a propagated input 2016-05-04 17:55:09 +02:00
Ali Abrar
5423c48148 rxvt_unicode: 9.21 -> 9.22 2016-05-04 10:38:47 -04:00
taku0
f2bab58b3e lp_solve: change source URL to mirror 2016-05-04 22:17:56 +09:00
Joachim Fasting
0f1293a488 Merge pull request #15210 from taku0/amarok_pcre 
amarok: add pcre as a dependency to fix failing build
 2016-05-04 15:13:45 +02:00
taku0
3fa49d5ac4 lp_solve: updated description 2016-05-04 22:03:22 +09:00
taku0
725c85c720 lp_solve: fixed build error due to defining isnan 2016-05-04 19:58:05 +09:00
Robin Gloster
30ef92e0ff jbidwatcher: fixup to last commit 2016-05-04 10:37:40 +00:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
taku0
8c02de135f amarok: add pcre as a dependency to fix failing build 2016-05-04 16:06:43 +09:00
taku0
90f5be3133 firefox-bin: 45.0.2 -> 46.0.1 2016-05-04 14:50:17 +09:00
Franz Pletz
2acea21155 gitlab: 8.5.7 -> 8.5.12 2016-05-04 01:24:55 +02:00
Franz Pletz
69c14985d0 imagemagick: Disable insecure coders (ImageTragick) 
See:

  * https://imagetragick.com/
  * https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
 2016-05-04 01:22:02 +02:00
Franz Pletz
05eae0242d imagemagick: 6.9.3-8 -> 6.9.3-9 2016-05-04 01:22:02 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Arseniy Seroka
82475a9a7c Merge pull request #15175 from magnetophon/linuxband 
linuxband: init at 12.02.1
 2016-05-03 22:58:43 +03:00
Tobias Geerinckx-Rice
31253ad957
cdrtools: 3.02a03 -> 3.02a06 2016-05-03 20:41:19 +02:00
Franz Pletz
d7338bf9d7 msmtp: 1.6.2 -> 1.6.4 2016-05-03 16:15:20 +02:00
Franz Pletz
b701ea82e7 netperf: 2.6.0 -> 2.7.0 2016-05-03 16:15:20 +02:00
Joachim Fasting
b9fc31a415
popcorntime: mark as broken 
A temporary measure, short of removal, until
https://github.com/NixOS/nixpkgs/issues/15120 has been resolved.
 2016-05-03 16:09:36 +02:00
vbgl
a95df7d800 Merge pull request #15106 from vbgl/camlp5-6.16 
camlp5: 6.14 -> 6.16
 2016-05-03 12:56:16 +02:00
Nikolay Amiantov
fe0bb1efd1 imagemagick: add webp support 2016-05-03 13:19:41 +03:00
Edward Tjörnhammar
066b5cb11a
idea.idea-{community,ultimate}: 2016.1 -> 2016.1.1 2016-05-03 11:01:21 +02:00
Tobias Geerinckx-Rice
5d25d7d987
rescuetime: use makeLibraryPath for LD_PRELOAD hack 2016-05-03 03:01:46 +02:00
Tobias Geerinckx-Rice
21b667e066
rescuetime: 2.8.9.1170 -> 2.9.10.1255 2016-05-03 02:43:03 +02:00
Bart Brouns
57d9fd8f65 linuxband: init at 12.02.1 2016-05-02 23:28:32 +02:00
Bart Brouns
bdf7f03c4b MMA: init at 15.12 2016-05-02 21:04:07 +02:00
Kamil Chmielewski
43e617b487 matchbox: update source urls + libmatchbox: 1.9 -> 1.11 (#15160) 2016-05-02 12:26:32 +02:00
Jascha Geerds
cf224573d6 idea.pycharm: 5.0.3 -> 2016.1.2 2016-05-02 11:59:31 +02:00
Joachim Fasting
a7886c9189 bittorrentSync20: 2.3.3 -> 2.3.6 (#15147) 
Note that this changes the domain from getsyncapp.com (no longer valid)
to getsync.com.
 2016-05-02 11:57:17 +02:00
Robin Gloster
5a2b26cf7b Merge pull request #15056 from simonvandel/fix-qbittorent-qmake 
Fix qbittorent qmake build error
 2016-05-02 11:35:09 +02:00
Eelco Dolstra
8a854c2647 Merge pull request #15111 from rardiol/subversionPerl 
subversion: fix apr-1 linking related to #14495
 2016-05-02 10:56:28 +02:00
Bob van der Linden
69d5f27a13 popcorntime: 0.3.8 -> 0.4.0-2 (#15154) 2016-05-02 10:46:37 +02:00
Joachim Fasting
d985db9cef Merge pull request #15141 from matthiasbeyer/update-buku 
buku: 1.8 -> 1.9
 2016-05-02 04:58:55 +02:00
Joachim Fasting
889f36498f Merge pull request #15088 from cstrahan/redis-desktop-manager 
redis-desktop-manager: init at 0.8.3
 2016-05-02 03:26:19 +02:00
Arseniy Seroka
48b739cc25 Merge pull request #15094 from jraygauthier/jrg/brscan4_init_rebased 
brscan4: init at 0.4.3-3
 2016-05-01 21:48:30 +03:00
Matthias Beyer
a7c5b1d110 buku: 1.8 -> 1.9 2016-05-01 20:46:09 +02:00
Raymond Gauthier
758e8bd1a1 brscan4: init at 0.4.3-3 
A sane backend for recent brother scanners.

Depends on the presence of etc files generated by the
nixos module of the same name.

Supports network scanner specification through the
nixos module.
 2016-05-01 14:42:25 -04:00
Vincent Laporte
60a7c607d1 hol-light: fix build with camlp5-6.16 2016-05-01 16:10:09 +02:00
Simon Vandel Sillesen
05f2ebe16d qBittorrent: fix qmake not found in qbittorrent build 
Thanks to @romildo for finding the configure fix.
 2016-05-01 15:05:56 +02:00
Tobias Geerinckx-Rice
5508687ec2
Remove now useless proprietary Copy.com client and service 
<https://techlib.barracuda.com/Copy/FAQ>

SaaS.
 2016-05-01 14:38:08 +02:00
Nikolay Amiantov
3a52c5fa7d firefox: fix library path 
Fixes #15126
 2016-05-01 12:26:39 +03:00
zimbatm
6cf44fed13 Merge pull request #15113 from rardiol/gitSVN 
git: fix subversion bindings for multiple outputs
 2016-05-01 10:10:31 +01:00
Tobias Geerinckx-Rice
5fcf22f57c
workrave: 1.10.6 -> 1.10.7; fetchFromGitHub; maintain 2016-05-01 01:58:28 +02:00
Tobias Geerinckx-Rice
2b48d3dae6
workrave: minor edits for consistency 
Mainly dropping the partial use of xorg.<lib> and separating
nativeBuildInputs.
 2016-05-01 01:58:28 +02:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Bart Brouns
7da27100fe faust2lv2gui: newest faust can create gui for lv2 2016-04-30 19:12:32 +02:00
Ricardo Ardissone
e5a9d64787 git: fix subversion bindings for multiple outputs 2016-04-30 13:19:14 -03:00
Ricardo Ardissone
025ccbccd7 subversion: fix apr-1 linking 2016-04-30 12:13:26 -03:00
Tobias Geerinckx-Rice
db00d1803f
abcde: 2.7 -> 2.7.2 2016-04-30 14:15:33 +02:00
Pascal Wittmann
c03d7f2819 filezilla: 3.16.1 -> 3.17.0 2016-04-30 09:57:14 +02:00
Nikolay Amiantov
c4ab28e38e tdesktop: 0.9.33 -> 0.9.44 2016-04-30 03:12:32 +03:00
Nikolay Amiantov
8551602e9c octoprint-plugins.m3d-fio: 0.30.2 -> 0.32 2016-04-30 03:12:32 +03:00
Nikolay Amiantov
ce6f4e25b2 deadbeef: 0.7.0 -> 0.7.2 2016-04-30 03:12:32 +03:00
Nikolay Amiantov
938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
zimbatm
d2b176ace5 Merge pull request #14617 from nathan7/git-ssl-cert-file 
git: respect $SSL_CERT_FILE
 2016-04-29 23:03:52 +01:00
Charles Strahan
4f7ac84263 redis-desktop-manager: init at 0.8.3 2016-04-29 18:03:48 -04:00
Tobias Geerinckx-Rice
aa8bc97dd6
git-hub -> gitAndTools.git-hub (with alias) 2016-04-29 21:42:35 +02:00
Tobias Geerinckx-Rice
2415254a52
git-hub: 0.9.0 -> 0.10 2016-04-29 21:42:35 +02:00
Robert Helgesson
f5b3827e0e eclipse-plugin-testng: 6.9.11.201603260617 -> 6.9.11.201604020423 2016-04-29 18:47:31 +02:00
Arseniy Seroka
29ac362a42 Merge pull request #15075 from romildo/upd.eclipse-plugin-cup 
eclipse-plugins-cup: 1.0.0.201412081321 -> 1.0.0.201604221613
 2016-04-29 19:20:00 +03:00
José Romildo Malaquias
9ea3a37767 compton-git: 2015-04-20 -> 2015-09-21 2016-04-29 10:14:36 -03:00
Tuomas Tynkkynen
7996c54ae8 Merge pull request #15058 from yochai/master 
eclipse: fix build error
 2016-04-29 14:46:54 +03:00
José Romildo Malaquias
47c068c7a3 eclipse-plugins-cup: 1.0.0.201412081321 -> 1.0.0.201604221613 2016-04-29 07:49:05 -03:00
Vincent Laporte
ce7181f9a8 smtube: fix build after qmakeHook 2016-04-29 07:21:31 +00:00
Vincent Laporte
5de3cfe210 smplayer: fix build after qmakeHook 2016-04-29 07:21:31 +00:00
Tobias Geerinckx-Rice
75b01594c8
sylpheed: 3.4.1 -> 3.5.0 2016-04-29 04:38:54 +02:00
Tim Steinbach
1142b402a8 vivaldi: Clean up 2016-04-29 01:19:15 +00:00
Tim Steinbach
25290a9f15 vivaldi: 1.0 -> 1.1 2016-04-28 23:54:05 +00:00
Joachim Fasting
c6147319cb Merge pull request #15061 from ebzzry/ltwheelconf-0.2.7 
ltwheelconf: init at 0.2.7
 2016-04-29 01:08:16 +02:00
Brad Ediger
0da43bdc1d spotify: 1.0.27 -> 1.0.28 2016-04-28 17:30:43 -05:00
Joachim Fasting
a4de898066 Merge pull request #15054 from romildo/upd.albert 
albert: 0.8.7.2 -> 0.8.8
 2016-04-28 23:06:15 +02:00
Rommel M. Martinez
650e9b25bd ltwheelconf: init at 0.2.7 2016-04-29 02:47:48 +08:00
Yochai Meir
4a0cbae070 eclipse: fix build error 2016-04-28 20:31:14 +03:00
Moritz Ulrich
f503831956 herbstluftwm: 0.6.2 -> 0.7.0. 2016-04-28 18:10:17 +02:00
Simon Vandel Sillesen
63d016b335 qbittorrent: 3.3.3 -> 3.3.4 2016-04-28 18:09:55 +02:00
José Romildo Malaquias
4f4037df67 albert: 0.8.7.2 -> 0.8.8 2016-04-28 11:59:21 -03:00
Eelco Dolstra
930d243ea4 firefox: 45.0.2 -> 46.0 
Still using GTK+ 2 for now, since apparently building with GTK+ 3
still requires GTK+ 2, increasing the closure size. (#15008)
 2016-04-28 13:39:12 +02:00
Arseniy Seroka
52b64cedec Merge pull request #15016 from jagajaga/eid 
open-eid
 2016-04-28 13:56:09 +03:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output 
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
 2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Tobias Geerinckx-Rice
d200e30e57
simple-scan: 3.20.0 -> 3.21.1 2016-04-27 16:55:36 +02:00
Tuomas Tynkkynen
2f6c2ecd47 eiskaltdcpp: Use pcre-cpp (fixes build) 
http://hydra.nixos.org/build/34967606/nixlog/1/raw
 2016-04-27 13:38:27 +03:00
Arseniy Seroka
f6d7cefa7b
esteidfirefoxplugin: init at 3.12.1.1142 2016-04-27 11:38:09 +03:00
Tuomas Tynkkynen
ca0e724266 otter: Mark broken 
Build hangs an hits the hydra time limit:
http://hydra.nixos.org/build/34897110
 2016-04-27 03:24:04 +03:00
Edward Tjörnhammar
f027aa2059
jonprl: corrected sha change 2016-04-26 22:23:37 +02:00
Thomas Tuegel
a286d876ad melpaStablePackages.docker: don't call builtin dependency 2016-04-26 14:12:53 -05:00
Thomas Tuegel
d47fe2bd4a elpa-packages 2016-04-26 2016-04-26 14:07:32 -05:00
Thomas Tuegel
de33f4b48b elpa-packages: update package generation instructions 2016-04-26 14:06:42 -05:00
Thomas Tuegel
559010fa9c melpa-stable-packages 2016-04-26 2016-04-26 14:05:25 -05:00
Thomas Tuegel
f6828eb247 melpa-stable-packages: update package generation instructions 2016-04-26 14:05:00 -05:00
Thomas Tuegel
bf0ae7d45c melpa-packages: update package generation instructions 2016-04-26 14:04:13 -05:00
Thomas Tuegel
d3eea5ae35 melpa-packages 2016-04-26 2016-04-26 14:00:20 -05:00
Nikolay Amiantov
f6eb686222 Merge pull request #15002 from abbradar/symlink-join-wrappers 
Use symlinkJoin for wrappers
 2016-04-26 16:47:43 +04:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001) 
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
 2016-04-26 13:38:03 +01:00
Nikolay Amiantov
7b4fc0f5a9 avidemux: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov
1f89dbd46b pidgin-with-plugins: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov
c1e9ea6c86 rxvt_unicode-with-plugins: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov
d40e636bdc k3b: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov
d04dafd64e gimp: add version to derivation, use symlinkJoin for a wrapper 2016-04-26 15:37:42 +03:00
Nikolay Amiantov
41b6a17826 puredata-with-plugins: use symlinkJoin 2016-04-26 15:37:42 +03:00
Nikolay Amiantov
5690c6ca07 deadbeef-with-plugins: use symlinkJoin 2016-04-26 15:37:42 +03:00
Tobias Geerinckx-Rice
8bfff4282f
fmit: 1.0.8 -> 1.0.13 2016-04-25 23:43:53 +02:00
Dmitry Kalinkin
088601cb51 root: fix chrooted build, workaround 491f7f017c (cmake: set LIBDIR and INCLUDEDIR for multiple outputs) 2016-04-25 17:38:19 -04:00
Vladimír Čunát
ede605e4f1 calibre: fix #14938 build 
Thanks to a hack and qmake help from @ttuegel.
 2016-04-25 20:38:57 +02:00
Nikolay Amiantov
618c75de7b tdesktop: fix build 2016-04-25 20:47:29 +03:00
Arseniy Seroka
fd5ed06b0d Merge pull request #14977 from jerith666/crashplan-46-r3 
Crashplan: 4.6.0-r2 -> 4.6.0-r3
 2016-04-25 20:38:42 +03:00
Christoph Hrdinka
2dcf536e44 Merge pull request #14968 from hrdinka/update/qtpass 
qtpass: 1.1.0 -> 1.1.1
 2016-04-25 18:55:38 +02:00
Matt McHenry
344f1c19aa crashplan: 4.6.0-r2 -> 4.6.0-r3 2016-04-25 12:14:10 -04:00
Eric Seidel
2177bf3074 fossil: add libiconv on darwin 2016-04-25 09:12:05 -07:00
Nikolay Amiantov
5f19542581 Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:23 +03:00
Nikolay Amiantov
09f02b918e Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:10 +03:00