Commit graph

17 commits

Author SHA1 Message Date
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Rickard Nilsson 43c9c791e0 file: Add extra source URL 2012-11-06 11:23:48 +01:00
Eelco Dolstra 76431dad65 * Make file 5.11 the default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34114
2012-05-15 16:34:07 +00:00
Rob Vermaas 97cac0a58c Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas)
svn path=/nixpkgs/trunk/; revision=33952
2012-04-30 14:34:57 +00:00
Rob Vermaas 0823167b43 Revert my previous 2 commits.
svn path=/nixpkgs/trunk/; revision=33951
2012-04-30 14:28:08 +00:00
Rob Vermaas 0362f55a22 add missing files from previous commit
svn path=/nixpkgs/trunk/; revision=33950
2012-04-30 13:45:50 +00:00
Eelco Dolstra a1e444b3b0 * file updated to 5.04.
svn path=/nixpkgs/trunk/; revision=25324
2010-12-30 18:31:27 +00:00
Eelco Dolstra b7c7550c43 * Replace the Python "magic" module with the (apparently) more
common one from the "file" package.

svn path=/nixpkgs/trunk/; revision=25322
2010-12-29 19:19:56 +00:00
Rob Vermaas 93f767d897 * bumped version for file
svn path=/nixpkgs/trunk/; revision=16018
2009-06-22 11:41:14 +00:00
Wouter den Breejen 033c61867b Version bump
svn path=/nixpkgs/trunk/; revision=12280
2008-07-06 17:47:10 +00:00
Eelco Dolstra 7f91ba32ec * file 4.23.
svn path=/nixpkgs/trunk/; revision=10002
2007-12-31 17:56:13 +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 1477b909f9 upgrade from 4.13 -> 4.17
svn path=/nixpkgs/trunk/; revision=5622
2006-07-06 18:15:07 +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 b701827950 * Added the `file' utility (required by the MonoDevelop build process).
svn path=/nixpkgs/trunk/; revision=2355
2005-03-09 17:48:46 +00:00