summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-22 00:05:27 +0000
committerGitHub <noreply@github.com>2021-07-22 00:05:27 +0000
commit3ed47ddb24e8e762e034b30d2885d3bda5fee346 (patch)
treee8925474f96bbb0d3acdd967bd240cc7cf28bfe0 /pkgs/data
parent1d71ffb1099d4fc45c5ebc5bacbf2f863c526dc8 (diff)
parent902ec75d0adc6a5216879c674e5b9671cc5cbeed (diff)
downloadnixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.tar
nixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.tar.gz
nixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.tar.bz2
nixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.tar.lz
nixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.tar.xz
nixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.tar.zst
nixpkgs-3ed47ddb24e8e762e034b30d2885d3bda5fee346.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/documentation/man-pages/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index d31272c2a5f..79a48acd9f2 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "man-pages";
-  version = "5.11";
+  version = "5.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
-    sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo=";
+    sha256 = "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs";
   };
 
-  makeFlags = [ "MANDIR=$(out)/share/man" ];
+  makeFlags = [ "prefix=$(out)" ];
   postInstall = ''
     # conflict with shadow-utils
     rm $out/share/man/man5/passwd.5 \
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Linux development manual pages";
     homepage = "https://www.kernel.org/doc/man-pages/";
-    repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages";
+    repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages";
     license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     priority = 30; # if a package comes with its own man page, prefer it