mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
treewide: fix some comments (#330407)
Signed-off-by: zhoufanjin <shuangcui@live.cn>
This commit is contained in:
parent
e6af6f4792
commit
99da330f23
@ -116,7 +116,7 @@ let
|
|||||||
|
|
||||||
# We need to replace the ssh-askpass-sublime executable because the default one
|
# We need to replace the ssh-askpass-sublime executable because the default one
|
||||||
# will not function properly, in order to work it needs to pass an argv[0] to
|
# will not function properly, in order to work it needs to pass an argv[0] to
|
||||||
# the sublime_merge binary, and the built-in version will will try to call the
|
# the sublime_merge binary, and the built-in version will try to call the
|
||||||
# sublime_merge wrapper script which cannot pass through the original argv[0] to
|
# sublime_merge wrapper script which cannot pass through the original argv[0] to
|
||||||
# the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is
|
# the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is
|
||||||
# very simple and can be replaced with a simple wrapper script.
|
# very simple and can be replaced with a simple wrapper script.
|
||||||
|
@ -7,7 +7,7 @@ let
|
|||||||
# sandboxed builds, we manually download them and save them so these files
|
# sandboxed builds, we manually download them and save them so these files
|
||||||
# are fetched ahead-of-time instead of during the CMake build. To update
|
# are fetched ahead-of-time instead of during the CMake build. To update
|
||||||
# plex-media-player use the update.sh script, so the versions and hashes
|
# plex-media-player use the update.sh script, so the versions and hashes
|
||||||
# for these files are are also updated!
|
# for these files are also updated!
|
||||||
depSrcs = import ./deps.nix { inherit fetchurl; };
|
depSrcs = import ./deps.nix { inherit fetchurl; };
|
||||||
in mkDerivation rec {
|
in mkDerivation rec {
|
||||||
pname = "plex-media-player";
|
pname = "plex-media-player";
|
||||||
|
@ -49,7 +49,7 @@ let
|
|||||||
helpersBin = symlinkJoin {
|
helpersBin = symlinkJoin {
|
||||||
name = "podman-helper-binary-wrapper";
|
name = "podman-helper-binary-wrapper";
|
||||||
|
|
||||||
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
# this only works for some binaries, others may need to be added to `binPath` or in the modules
|
||||||
paths = [
|
paths = [
|
||||||
gvproxy
|
gvproxy
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
|
@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication {
|
|||||||
computer readable data, it is also often used as a format for hierarchical
|
computer readable data, it is also often used as a format for hierarchical
|
||||||
data that can be rendered into human readable formats. A traditional diff
|
data that can be rendered into human readable formats. A traditional diff
|
||||||
on such a format would tell you line by line the differences, but this
|
on such a format would tell you line by line the differences, but this
|
||||||
would not be be readable by a human. xmldiff provides tools to make human
|
would not be readable by a human. xmldiff provides tools to make human
|
||||||
readable diffs in those situations.
|
readable diffs in those situations.
|
||||||
'';
|
'';
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||||||
"TestFind"
|
"TestFind"
|
||||||
"gdcmscu-echo-dicomserver"
|
"gdcmscu-echo-dicomserver"
|
||||||
"gdcmscu-find-dicomserver"
|
"gdcmscu-find-dicomserver"
|
||||||
# seemingly ought to be be disabled when the test data submodule is not present:
|
# seemingly ought to be disabled when the test data submodule is not present:
|
||||||
"TestvtkGDCMImageReader2_3"
|
"TestvtkGDCMImageReader2_3"
|
||||||
"TestSCUValidation"
|
"TestSCUValidation"
|
||||||
# errors because 3 classes not wrapped:
|
# errors because 3 classes not wrapped:
|
||||||
|
@ -32,7 +32,7 @@ let
|
|||||||
helpersBin = symlinkJoin {
|
helpersBin = symlinkJoin {
|
||||||
name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
|
name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
|
||||||
|
|
||||||
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
# this only works for some binaries, others may need to be added to `binPath` or in the modules
|
||||||
paths = [
|
paths = [
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
aardvark-dns
|
aardvark-dns
|
||||||
|
@ -29,7 +29,7 @@ buildGoModule rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
# With v8 the config tests are are blocking
|
# With v8 the config tests are blocking
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||||
|
Loading…
Reference in New Issue
Block a user