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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-22 06:17:08 +00:00
committed by GitHub
parent 921cf0fc78 227aa2c9b0
commit ed07c63105
31 changed files with 282 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/mysqltuner/default.nix
+6 -9
View File
@@ -5,16 +5,15 @@ stdenv.mkDerivation rec {
version = "1.7.21";
src = fetchFromGitHub {
owner = "major";
repo = "MySQLTuner-perl";
rev = version;
owner = "major";
repo = "MySQLTuner-perl";
rev = version;
sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0=";
};
postPatch = ''
substituteInPlace mysqltuner.pl \
--replace '$basic_password_files = "/usr/share/mysqltuner/basic_passwords.txt"' "\$basic_password_files = \"$out/share/basic_passwords.txt\"" \
--replace '$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"' "\$opt{cvefile} = \"$out/share/vulnerabilities.csv\""
--replace '/usr/share' "$out/share"
'';
buildInputs = [ perl ];
@@ -22,10 +21,8 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p "$out/bin"
install -Dm 0755 mysqltuner.pl "$out/bin/mysqltuner"
install -Dm 0644 basic_passwords.txt "$out/share/basic_passwords.txt"
install -Dm 0644 vulnerabilities.csv "$out/share/vulnerabilities.csv"
install -Dm0555 mysqltuner.pl $out/bin/mysqltuner
install -Dm0444 -t $out/share/mysqltuner basic_passwords.txt vulnerabilities.csv
runHook postInstall
'';
pkgs/tools/misc/powerline-go/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "powerline-go";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "justjanne";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8=";
sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE=";
};
vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg=";