3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

18 commits

Author SHA1 Message Date
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Domen Kožar 419f15b060 Remove http_proxy/ftp_proxy overrides used in setup hooks.
Partially reverts eaa4db148d. Used
together with nix-shell it results into unresolvable domains. For
example: `nix-shell -p libxml2` spawns a shell with non-working DNS.

chroot should remove such unpurities.
2014-10-28 23:20:59 +01:00
Eelco Dolstra 6843fc41c9 Fix evaluation 2014-09-30 00:51:00 +02:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Alexander Kjeldaas 7141303c99 groff, opensp: make deterministic 2014-09-13 15:06:59 +02:00
Joel Taylor 7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Eelco Dolstra a9baea48df openjade: Use default perl 2014-08-21 16:54:28 +02:00
Eelco Dolstra e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra 86afcccecb sp-compat: Fix build
You can't run fixupPhase before installPhase.

http://hydra.nixos.org/build/8149119
2014-01-17 12:13:20 +01:00
Lluís Batlle i Rossell d711dcc070 Adding setup-hook for opensp, to set the sgml catalog files
This sets the SGML_CATALOG_FILES, similar to how libxml2 does the same with
XML_CATALOG_FILES.

I based the hook on the libxml2 one, and I followed the instructions about this
variable here:
http://docbook.sourceforge.net/release/dsssl/1.79/doc/install.html
2013-03-18 15:07:20 +01:00
Eelco Dolstra 6930efd1e5 openjade: Use default gcc 2013-01-28 18:31:17 +01:00
Yury G. Kudryashov 0d730b4362 Add sp compatibility wrapper
This wrapper is required by some old programs (e.g., po4a which I'm trying to package)

svn path=/nixpkgs/trunk/; revision=25320
2010-12-29 18:04:11 +00:00
Russell O'Connor 41f2c2ed1f use sourceforge mirror for openjade.
svn path=/nixpkgs/trunk/; revision=24010
2010-10-01 02:29:45 +00:00
Lluís Batlle i Rossell 62c315a723 Adding libofx and updating opensp (to get libofx built).
(I may have broken openjade... I will check later).


svn path=/nixpkgs/trunk/; revision=19697
2010-01-26 22:04:54 +00:00
Marc Weber 0d76da3b6f new: openjade, opensp - by Russell O'Connor
svn path=/nixpkgs/trunk/; revision=17926
2009-10-22 15:41:39 +00:00