Commit Graph

3494 Commits

Author SHA1 Message Date
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
vbgl
a95df7d800 Merge pull request #15106 from vbgl/camlp5-6.16
camlp5: 6.14 -> 6.16
2016-05-03 12:56:16 +02:00
Tobias Geerinckx-Rice
49fd7d9d08
autoconf-archive: 2015.09.25 -> 2016.03.20 2016-05-03 04:21:44 +02:00
Tobias Geerinckx-Rice
e8c6b47ee3
yodl: 3.07.01 -> 3.08.00 2016-05-02 16:33:53 +02:00
Joachim Fasting
e1197f6896 Merge pull request #15082 from namore/init_rake
rake: init at 11.1.1
2016-05-02 03:20:51 +02:00
Joachim Fasting
0ad1c9788a Merge pull request #15133 from bobvanderlinden/fix-nwjs-popcorntime
nwjs: use correct nwEnv and rpath
2016-05-01 22:36:50 +02:00
Joachim Fasting
979de54175 Merge pull request #15122 from Ralith/rtags
rtags: 9fed420 -> 233543d
2016-05-01 22:11:43 +02:00
Bob van der Linden
3ba689ee2e nwjs: use correct nwEnv and rpath
This is related to changes in fontconfig, pango, dbus and stdc++.
2016-05-01 19:39:56 +02:00
Arseniy Seroka
41efe6535d Merge pull request #15099 from phunehehe/casperjs
Casperjs: refactor and update
2016-05-01 19:35:14 +03:00
Vincent Laporte
3a6c85da65 camlp5: 6.14 -> 6.16 2016-05-01 16:10:10 +02:00
Benjamin Saunders
0cef15181b rtags: 9fed420 -> git-2016-04-29 2016-05-01 00:03:07 -07:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Joachim Fasting
aaae243b2b
imatix_gsl: fix build
See https://hydra.nixos.org/build/35004296/log/raw

Also fix some formatting issues.
2016-04-30 20:31:43 +02:00
Hoang Xuan Phu
d950d6b786 casperjs: test needs fontconfig 2016-04-30 18:26:09 +08:00
Hoang Xuan Phu
bb7e3c6753 casperjs: update to phantomjs2 2016-04-30 18:26:08 +08:00
Hoang Xuan Phu
52ec8e2ce4 casperjs: update to 1.1.1 2016-04-30 18:26:08 +08:00
Hoang Xuan Phu
60e8d9dfab casperjs: refactor a bit 2016-04-30 18:26:08 +08:00
Pascal Wittmann
586d1f67ce yodl: 3.06.00 -> 3.07.01 2016-04-30 10:42:35 +02:00
Tobias Geerinckx-Rice
fe9c463622
lemon: 1.0 -> 1.69 2016-04-29 21:42:35 +02:00
Roman Naumann
61c8af996f rake: init at 11.1.1 2016-04-29 15:45:11 +02:00
Nathan Moos
6dac18a8be imatix_gsl: init at 4.1 2016-04-28 18:26:10 -04:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Emery Hemingway
ae59f6426a autoconf: peg version 2.64 2016-04-27 11:51:20 +02: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
Joachim Fasting
2dbfe512db Merge pull request #14858 from ericbmerritt/elixir-support
Elixir support
2016-04-25 23:04:14 +02:00
Allen Nelson
b48e1dd601 lsof: stop configure script from searching /usr paths 2016-04-25 11:14:22 -05:00
Eric Merritt
cd27abe751 rebar3: refactor
cleanup up the code quite a bit in the bootstrapper
2016-04-25 08:34:55 -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
Vladimír Čunát
1c9234fd6c foswiki, egypt, wml: fix build 2016-04-25 16:22:52 +02:00
Nikolay Amiantov
96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Peter Simons
cf4a69e2ec haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages 2016-04-24 20:13:27 +02:00
robbinch
bd9d37e675 tinc-haskell: Rename package name to avoid conflict (#14952) 2016-04-24 18:32:16 +02:00
Franz Pletz
d1d4bd9a9d avrdude: 6.1 -> 6.3 2016-04-24 17:41:08 +02:00
Eric Merritt
b26ecaf3ca hex2nix: 0.0.3 -> 0.0.5 2016-04-23 19:03:30 -07:00
Eric Merritt
658a49b81d rebar3: 3.0.0-beta.4 -> 3.1.0 2016-04-23 19:03:30 -07:00
Eric Merritt
383626b9d7 move rebar3-nix-bootstrap to rebar3
This moves rebar3-nix-bootstrap from its own repository to rebar3. Its a
single file and this vastly reduces the complexity of making changes.
2016-04-23 19:03:29 -07:00
Eric Merritt
8d3d0a1ca9 relx-exe: init at 3.18.0
This adds an executable version of the relx library to the system.
2016-04-23 19:03:29 -07:00
Eric Merritt
be5da0449e beam-support: update registry to latest '59b836d' 2016-04-23 19:03:28 -07:00
Eric Merritt
8dbcb4e35e beamPackages: Add support for Mix and Erlang.mk 2016-04-23 19:03:24 -07:00
Tadas Barzdzius
a49ffbb196 cargo: add libiconv to buildInputs to fix darwin build 2016-04-23 23:08:02 +03:00
Peter Simons
c604efecfc Merge pull request #14873 from robbinch/pkg-tinc-haskell
tinc-haskell: init at 20160419
2016-04-22 17:08:42 +02:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Nikolay Amiantov
253b84a1eb vscode, electron, atom: run fixup phases 2016-04-22 17:44:30 +03:00
Nikolay Amiantov
6185f74531 atom, electron, vscode: split dependencies to atomEnv
fixes #14890
2016-04-22 16:10:51 +02:00
Nikolay Amiantov
b2426adf1c Merge pull request #14870 from retrry/rust-updates
Rust Updates
2016-04-22 14:29:14 +04:00
Robbin C
f1492bf44c tinc-haskell: init at 20160419 2016-04-21 23:08:42 +08:00
Nikolay Amiantov
f3e8653647 valkyrie: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Thomas Tuegel
491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Tadas Barzdzius
357a251bfb rustfmt: 2016-03-22 -> 0.4.0 2016-04-20 12:43:00 +03:00