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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-24 12:02:33 +00:00 committed by GitHub
commit 9814d5da91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/hugo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.84.4"; version = "0.85.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nD2UBDSDG6OFfUvDBXCfhOCiJyFMP2pDXSlIESaEfqE="; sha256 = "sha256-IW41e4imaXKcXJKa7dAB60ulvRrk3qvF1//Lo55TLVI=";
}; };
vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM="; vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk=";
doCheck = false; doCheck = false;

8
pkgs/data/documentation/man-pages/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "man-pages"; pname = "man-pages";
version = "5.11"; version = "5.12";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; 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 = '' postInstall = ''
# conflict with shadow-utils # conflict with shadow-utils
rm $out/share/man/man5/passwd.5 \ rm $out/share/man/man5/passwd.5 \
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Linux development manual pages"; description = "Linux development manual pages";
homepage = "https://www.kernel.org/doc/man-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; license = licenses.gpl2Plus;
platforms = with platforms; unix; platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it priority = 30; # if a package comes with its own man page, prefer it