diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-31 20:01:40 +0000 |
| commit | 5299c1f6fb7cc9fa5e6dad9107ccab1417179731 (patch) | |
| tree | 52d7d482e7310407aa3f48dfd757ec13a6ce413d /pkgs/data | |
| parent | 3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 (diff) | |
| parent | d789eb6a05b5eb2bd3c46798a1e7babfcffe1413 (diff) | |
| download | nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.gz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.bz2 nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.lz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.xz nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.tar.zst nixlib-5299c1f6fb7cc9fa5e6dad9107ccab1417179731.zip | |
svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/man-pages/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 2e732e1acdbc..71c41ccba612 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -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 = |