diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
| commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
| tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/data/documentation | |
| parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
| parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
| download | nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixlib-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip | |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/data/documentation')
| -rw-r--r-- | pkgs/data/documentation/man-pages/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f339be3954b8..5c93ecc94690 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl }: +let version = "3.83"; in stdenv.mkDerivation rec { - name = "man-pages-3.78"; + name = "man-pages-${version}"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "0zm3sc0zbfng440jjqha8qnzivvg5nqpwgi7zv9h8qxwgyhrfa65"; + sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j"; }; - preBuild = - '' - makeFlagsArray=(MANDIR=$out/share/man) - ''; + makeFlags = "MANDIR=$(out)/share/man"; - meta = { + meta = with stdenv.lib; { + inherit version; description = "Linux development manual pages"; homepage = http://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index adcb4fa42e96..c2bec7707c29 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { app), available for Linux and Windows. ''; homepage = "http://zealdocs.org/"; - licenses = with stdenv.lib.licenses; [ gpl3 ]; + license = with stdenv.lib.licenses; [ gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; |