Merge pull request #236109 from K900/no-more-dash-n

treewide: clean up usages of `cp -n`
This commit is contained in:
K900 2023-06-06 09:58:15 +03:00 committed by GitHub
commit c3ac633a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions

View file

@ -308,7 +308,9 @@ in
libvirt/nwfilter/*.xml );
do
mkdir -p /var/lib/$(dirname $i) -m 755
cp -npd ${cfg.package}/var/lib/$i /var/lib/$i
if [ ! -e /var/lib/$i ]; then
cp -pd ${cfg.package}/var/lib/$i /var/lib/$i
fi
done
# Copy generated qemu config to libvirt directory

View file

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, unstableGitUpdater
, runCommand
, cmake
, rocm-cmake
, hip
@ -88,9 +87,6 @@ let
};
});
ckProfiler = runCommand "ckProfiler" { preferLocalBuild = true; } ''
cp -a ${ck}/bin/ckProfiler $out
'';
in stdenv.mkDerivation {
inherit (ck) pname version outputs src passthru requiredSystemFeatures meta;
@ -102,8 +98,7 @@ in stdenv.mkDerivation {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -as ${ckProfiler} $out/bin/ckProfiler
mkdir -p $out
cp -an ${ck}/* $out
'' + lib.optionalString buildTests ''
cp -a ${ck.test} $test

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
-r bintray:scalacenter/releases \
-r sonatype:snapshots > deps
mkdir -p $out/share/java
cp -n $(< deps) $out/share/java/
cp $(< deps) $out/share/java/
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
cp -n easysnap* $out/bin/
cp easysnap* $out/bin/
for i in $out/bin/*; do
substituteInPlace $i \