1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

31 commits

Author SHA1 Message Date
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Matthias Beyer 3e5dbb7b78 neon: Re-add version 0.29.6 2015-10-03 13:01:31 +02:00
Matthias Beyer f92d27d214 neon: Put version into own variable 2015-09-29 10:46:21 +02:00
Matthias Beyer d2c32179fe neon: 0.29.6 -> 0.30.1 2015-09-29 10:46:21 +02:00
Peter Simons 95935e65c1 neon: remove obsolete versions 0.26 and 0.28 2013-02-21 12:03:52 +01:00
Marco Maggesi 4a5f21239f Fix build of neon on darwin
svn path=/nixpkgs/trunk/; revision=34375
2012-06-06 21:47:26 +00:00
Eelco Dolstra f47cea8699 * Updated neon to 0.29.6.
svn path=/nixpkgs/trunk/; revision=29098
2011-09-07 18:08:59 +00:00
Yury G. Kudryashov b7151c4e2c Add neon-0.29.x, make it default
Also stop using "default" neon in all-packages.nix.
Minor versions are not source-compatible, so a package should state needed version explicitly.

svn path=/nixpkgs/trunk/; revision=21394
2010-04-28 08:40:19 +00:00
Yury G. Kudryashov 415f0fdc9f Also fix neon-0.26 build
svn path=/nixpkgs/trunk/; revision=21392
2010-04-27 22:05:00 +00:00
Yury G. Kudryashov 293cde6747 Fix neon build
Use pkg-config to find openssl

svn path=/nixpkgs/trunk/; revision=21391
2010-04-27 21:54:38 +00:00
Eelco Dolstra 87fcfb0df2 * davfs2 updated to 1.4.5.
* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841
2009-12-08 13:08:27 +00:00
Eelco Dolstra c274d068e4 * Fix neon.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15261
2009-04-22 23:15:00 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Peter Simons 17a9d60d01 neon-0.28: add support for a static library build (unused by default)
svn path=/nixpkgs/trunk/; revision=13082
2008-10-16 12:42:07 +00:00
Eelco Dolstra 6591cc2640 * Subversion 1.5.2, Neon 0.28.3, Apache 2.2.9.
svn path=/nixpkgs/trunk/; revision=12966
2008-10-06 12:35:05 +00:00
Eelco Dolstra 9663d4c76a * Added Subversion 1.5.0. Some features probably don't work yet
(building the Apache modules, building various language bindings).
* Neon 0.28.2.  Also kept Neon 0.26.x because Subversion 1.4.x needs
  it.

svn path=/nixpkgs/trunk/; revision=12162
2008-06-19 15:29:25 +00:00
Eelco Dolstra 05e42e5c39 * Subversion 1.4.3.
svn path=/nixpkgs/trunk/; revision=7797
2007-01-25 18:09:13 +00:00
Eelco Dolstra 3dcb2e095e * Urgh, go back to 0.25 (0.26 fails on most platforms).
svn path=/nixpkgs/trunk/; revision=6984
2006-11-08 16:39:20 +00:00
Eelco Dolstra aca43b766b * Sheesh, Subversion is picky.
svn path=/nixpkgs/trunk/; revision=6981
2006-11-08 16:11:51 +00:00
Eelco Dolstra 73448634c4 * Subversion 1.4.2.
* Neon 0.26.2.

svn path=/nixpkgs/trunk/; revision=6980
2006-11-08 13:03:55 +00:00
Eelco Dolstra ef9b025dbe * Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
2006-10-12 15:43:01 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 66947ee7af * Subversion 1.4.0. Note: Subversion 1.4 upgrades your working
copies, so it's hard to go back to 1.3.

svn path=/nixpkgs/trunk/; revision=6486
2006-09-11 09:47:58 +00:00
Armijn Hemel 40e7da7412 also build a shared libneon
svn path=/nixpkgs/trunk/; revision=5928
2006-07-24 23:00:54 +00:00
Armijn Hemel 51316f8a47 0.25.4 -> 0.25.5
svn path=/nixpkgs/trunk/; revision=5926
2006-07-24 21:52:49 +00:00
Armijn Hemel 9e7b75bdd2 neon 0.26.1
svn path=/nixpkgs/trunk/; revision=5634
2006-07-06 22:25:12 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Armijn Hemel b257d4cd1d add older version of neon which has ne_header_handler, needed by OOo2
svn path=/nixpkgs/trunk/; revision=4155
2005-10-27 11:56:10 +00:00
Armijn Hemel 9eba383a3d add a standalone version of neon
svn path=/nixpkgs/trunk/; revision=4143
2005-10-26 16:17:16 +00:00