public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
This commit is contained in:
Yury G. Kudryashov
2012-03-31 20:01:40 +00:00
parent 3f44fb8f2f d789eb6a05
commit 5299c1f6fb
40 changed files with 277 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/documentation/man-pages/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "man-pages-3.35";
name = "man-pages-3.38";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
sha256 = "186zn80k10jg1m4jp5x5x73f7cczydsjcw5zxc5d9lls5wvafp66";
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
sha256 = "10ha41yj5v3rjy73x8kpn65srbcy0iz399vv149bh12lvyv67kvy";
};
preBuild =