1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 03:53:41 +00:00
Commit graph

18 commits

Author SHA1 Message Date
aszlig 6dd94d680a
Merge minor updates from jcumming.
This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020'
of git://github.com/jcumming/nixpkgs.

Octopus merge of @jcumming's minor updates, apart flrom updating the version, a
few other changes were made to these packages as well:

 * libarchive: Now depends on xz.
 * libgphoto: License changed to LGPL 2.1 plus.

And he did an overhaul of some of the meta blocks as well.

Changes during this merge:

 * Inline and reword stray comment into meta tag in
   1db34880d7 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-21 12:26:29 +02:00
Jack Cummings 1db34880d7 - gphoto2-2.4.14, libgphoto2-2.4.14 2012-10-20 21:59:25 -07:00
Yury G. Kudryashov 3b672f9b75 (lib)gphoto-2.4.11
svn path=/nixpkgs/trunk/; revision=31412
2012-01-07 19:41:59 +00:00
Armijn Hemel 733b2893a7 update to 2.4.10.1, add correct license
svn path=/nixpkgs/trunk/; revision=23506
2010-08-29 13:40:02 +00:00
Eelco Dolstra acd26a3353 * Fixed the gphoto2 build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15267
2009-04-23 11:12:25 +00:00
Eelco Dolstra 6a864c5040 * libgphoto2 updated to 2.4.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15057
2009-04-15 09:54:55 +00:00
Eelco Dolstra ba6845d03e * gphoto updated to 2.4.2.
svn path=/nixpkgs/trunk/; revision=12900
2008-09-22 17:06:31 +00:00
Yury G. Kudryashov 8294a83e5d gphoto2 upgraded to 2.4.0
svn path=/nixpkgs/trunk/; revision=9722
2007-11-16 17:28:17 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +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
Armijn Hemel 21f92a1fa4 add reminder to remove the patch when 2.2.2 is released
svn path=/nixpkgs/trunk/; revision=5632
2006-07-06 21:38:38 +00:00
Armijn Hemel 1789bf9944 update to 2.2.1. Also include a patch to fix a SNAFU by the maintainers, which are not willing to fix it (apparently)
svn path=/nixpkgs/trunk/; revision=5626
2006-07-06 21:11:59 +00:00
Eelco Dolstra 321e4da7e8 * Copy more files.
svn path=/nixpkgs/trunk/; revision=4646
2006-01-31 16:37:40 +00:00
Armijn Hemel f102909a83 update to libgphoto2 2.1.99. This adds a dependency on libusb and pkgconfig
svn path=/nixpkgs/trunk/; revision=4637
2006-01-31 14:07:25 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra f6e91bc9c9 * Merge r2396.
svn path=/nixpkgs/trunk/; revision=2397
2005-03-14 09:22:26 +00:00
Eelco Dolstra 8880818869 * Added libgphoto2.
svn path=/nixpkgs/trunk/; revision=2379
2005-03-11 11:08:38 +00:00