Commit Graph

72 Commits

Author SHA1 Message Date
Vladimír Čunát
99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Tadas Barzdzius
148dcf4d1c Vagrant: 1.7.3 -> 1.7.4 (ZHF) 2015-07-21 19:08:15 +03:00
Tadas Barzdzius
4338031c59 vagrant: 1.7.2 -> 1.7.3 2015-07-12 14:27:17 +03:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Robin Gloster
b88fc6c90e update vagrant to 1.7.2 2015-04-29 13:15:17 +02:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Rob Vermaas
8495c101dc Fixes #6374. Now for real, dohhh. 2015-02-17 13:10:13 +00:00
Rob Vermaas
1a0e6f0039 Fixes #6374. 2015-02-17 13:07:54 +00:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Charles Strahan
145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Charles Strahan
bc9934147f fix vagrant 2014-11-18 04:24:07 +00:00
Charles Strahan
cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Vladimír Čunát
5b00625aa4 vagrant: use bin/iconv from glibc on Linux
This fixes build after #4419.
2014-11-03 12:58:54 +01:00
Domen Kožar
17a64ccf24 vagrant: fix hash 2014-09-23 00:24:52 +02:00
Rob Vermaas
e94e997786 vagrant: update from 1.6.4 to 1.6.5 2014-09-11 13:32:00 +02:00
Domen Kožar
f9ba413b55 fix eval 2014-09-05 00:06:11 +02:00
Michael Fellinger
f21cccb2b6 vagrant: 1.6.3 -> 1.6.4 2014-09-04 20:24:21 +02:00
Attila Sztupak
84939f1d14 vagrant: upgrade to 1.6.3 2014-07-15 01:53:07 +01:00
Dario Bertini
4247a34463
Updated vagrant to 1.4.3 2014-02-18 15:23:16 +01:00
Jason "Don" O'Conal
2b65900e75 vagrant: update to 1.4.0 2013-12-16 04:50:22 +00:00
Jason "Don" O'Conal
c5bc23a259 vagrant: add expression 2013-11-27 23:05:14 +00:00