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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-04-06 16:01:14 +02:00
parent 44e3fc61fe 413e9561f8
commit c04a14edd6
493 changed files with 4687 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/backup/automysqlbackup/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }:
{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }:
stdenv.mkDerivation rec {
pname = "automysqlbackup";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cp automysqlbackup $out/bin/
cp automysqlbackup.conf $out/etc/
wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mariadb mailutils pbzip2 pigz bzip2 gzip ]}
'';
meta = with lib; {
pkgs/tools/backup/rdedup/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium
, llvmPackages, clang, lzma
, llvmPackages, clang, xz
, Security }:
rustPlatform.buildRustPackage rec {
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
];
nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ];
buildInputs = [ openssl libsodium lzma ]
buildInputs = [ openssl libsodium xz ]
++ (lib.optional stdenv.isDarwin Security);
configurePhase = ''