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

treewide: More string indentation fixes

Browse Source 
Follow-up on #350296 with the packages that cause big rebuilds and need
to go through staging.
This commit is contained in:
piegames 2024-10-23 21:52:18 +02:00
parent 4e9b31ff0e
commit ae207af82b
20 changed files with 117 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/version-management/git/default.nix
View File

@ -245,10 +245,11 @@ stdenv.mkDerivation (finalAttrs: {
+ (if svnSupport then ''
# wrap git-svn
wrapProgram $out/libexec/git-core/git-svn \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \
--prefix PATH : "${svn.out}/bin" ''
else '' # replace git-svn by notification script
wrapProgram $out/libexec/git-core/git-svn \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \
--prefix PATH : "${svn.out}/bin"
'' else ''
# replace git-svn by notification script
notSupported $out/libexec/git-core/git-svn
'')
@ -261,9 +262,11 @@ stdenv.mkDerivation (finalAttrs: {
notSupported $out/libexec/git-core/git-send-email
'')
+ lib.optionalString withManual ''# Install man pages
+ lib.optionalString withManual ''
# Install man pages
make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \
-C Documentation ''
-C Documentation
''
+ (if guiSupport then ''
# Wrap Tcl/Tk programs

4
pkgs/by-name/cu/cue/validator.nix
View File

@ -5,8 +5,8 @@
# against the fragment described by `document` or the whole definition.
# The script will be strict and enforce concrete values, i.e. partial documents are not supported.
cueSchemaFile: { document ? null }:
writeShellScript "validate-using-cue"
''${cue}/bin/cue \
writeShellScript "validate-using-cue" ''
${cue}/bin/cue \
--all-errors \
--strict \
vet \

3
pkgs/development/compilers/flutter/wrapper.nix
View File

@ -146,7 +146,8 @@ in
'' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) ''
--set-default FLUTTER_ENGINE "${flutter.engine}" \
--add-flags "--local-engine-host ${flutter.engine.outName}" \
'' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
'' + ''
--suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
--suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
--suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
--prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \

3
pkgs/development/compilers/gcc/default.nix
View File

@ -226,7 +226,8 @@ pipe ((callFile ./common/builder.nix {}) ({
libc = if libcCross != null then libcCross else stdenv.cc.libc;
in
(
'' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..."
''
echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..."
for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
do
grep -q _DYNAMIC_LINKER "$header" || continue

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -523,7 +523,7 @@ self: super: builtins.intersectAttrs super {
"--extra-include-dirs=${pkgs.cwiid}/include"
"--extra-include-dirs=${pkgs.bluez.dev}/include"
];
prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
prePatch = ''sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal"'';
}) super.hcwiid;
# cabal2nix doesn't pick up some of the dependencies.

16
pkgs/development/libraries/check/default.nix
View File

@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Unit testing framework for C";
longDescription =
'' Check is a unit testing framework for C. It features a simple
interface for defining unit tests, putting little in the way of the
developer. Tests are run in a separate address space, so Check can
catch both assertion failures and code errors that cause
segmentation faults or other signals. The output from unit tests
can be used within source code editors and IDEs.
'';
longDescription = ''
Check is a unit testing framework for C. It features a simple
interface for defining unit tests, putting little in the way of the
developer. Tests are run in a separate address space, so Check can
catch both assertion failures and code errors that cause
segmentation faults or other signals. The output from unit tests
can be used within source code editors and IDEs.
'';
homepage = "https://libcheck.github.io/check/";

24
pkgs/development/libraries/clutter/default.nix
View File

@ -84,20 +84,20 @@ stdenv.mkDerivation rec {
meta = {
description = "Library for creating fast, dynamic graphical user interfaces";
longDescription =
'' Clutter is free software library for creating fast, compelling,
portable, and dynamic graphical user interfaces. It is a core part
of MeeGo, and is supported by the open source community. Its
development is sponsored by Intel.
longDescription = ''
Clutter is free software library for creating fast, compelling,
portable, and dynamic graphical user interfaces. It is a core part
of MeeGo, and is supported by the open source community. Its
development is sponsored by Intel.
Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
on mobile and embedded platforms), but wraps an easy to use,
efficient, flexible API around GL's complexity.
Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
on mobile and embedded platforms), but wraps an easy to use,
efficient, flexible API around GL's complexity.
Clutter enforces no particular user interface style, but provides a
rich, generic foundation for higher-level toolkits tailored to
specific needs.
'';
Clutter enforces no particular user interface style, but provides a
rich, generic foundation for higher-level toolkits tailored to
specific needs.
'';
license = lib.licenses.lgpl2Plus;
homepage = "http://www.clutter-project.org/";

14
pkgs/development/libraries/glibc/common.nix
View File

@ -283,14 +283,14 @@ stdenv.mkDerivation ({
homepage = "https://www.gnu.org/software/libc/";
description = "GNU C Library";
longDescription =
'' Any Unix-like operating system needs a C library: the library which
defines the "system calls" and other basic facilities such as
open, malloc, printf, exit...
longDescription = ''
Any Unix-like operating system needs a C library: the library which
defines the "system calls" and other basic facilities such as
open, malloc, printf, exit...
The GNU C library is used as the C library in the GNU system and
most systems with the Linux kernel.
'';
The GNU C library is used as the C library in the GNU system and
most systems with the Linux kernel.
'';
license = licenses.lgpl2Plus;

4
pkgs/development/libraries/gmp/4.3.2.nix
View File

@ -43,8 +43,8 @@ let self = stdenv.mkDerivation rec {
branch = "4";
description = "GNU multiple precision arithmetic library";
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating
longDescription = ''
GMP is a free library for arbitrary precision arithmetic, operating
on signed integers, rational numbers, and floating point numbers.
There is no practical limit to the precision except the ones implied
by the available memory in the machine GMP runs on. GMP has a rich

4
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -56,8 +56,8 @@ let self = stdenv.mkDerivation rec {
description = "GNU multiple precision arithmetic library";
license = licenses.gpl3Plus;
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating
longDescription = ''
GMP is a free library for arbitrary precision arithmetic, operating
on signed integers, rational numbers, and floating point numbers.
There is no practical limit to the precision except the ones implied
by the available memory in the machine GMP runs on. GMP has a rich

36
pkgs/development/libraries/gmp/6.x.nix
View File

@ -64,27 +64,27 @@ let self = stdenv.mkDerivation rec {
gpl2Only
];
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating
on signed integers, rational numbers, and floating point numbers.
There is no practical limit to the precision except the ones implied
by the available memory in the machine GMP runs on. GMP has a rich
set of functions, and the functions have a regular interface.
longDescription = ''
GMP is a free library for arbitrary precision arithmetic, operating
on signed integers, rational numbers, and floating point numbers.
There is no practical limit to the precision except the ones implied
by the available memory in the machine GMP runs on. GMP has a rich
set of functions, and the functions have a regular interface.
The main target applications for GMP are cryptography applications
and research, Internet security applications, algebra systems,
computational algebra research, etc.
The main target applications for GMP are cryptography applications
and research, Internet security applications, algebra systems,
computational algebra research, etc.
GMP is carefully designed to be as fast as possible, both for small
operands and for huge operands. The speed is achieved by using
fullwords as the basic arithmetic type, by using fast algorithms,
with highly optimised assembly code for the most common inner loops
for a lot of CPUs, and by a general emphasis on speed.
GMP is carefully designed to be as fast as possible, both for small
operands and for huge operands. The speed is achieved by using
fullwords as the basic arithmetic type, by using fast algorithms,
with highly optimised assembly code for the most common inner loops
for a lot of CPUs, and by a general emphasis on speed.
GMP is faster than any other bignum library. The advantage for GMP
increases with the operand sizes for many operations, since GMP uses
asymptotically faster algorithms.
'';
GMP is faster than any other bignum library. The advantage for GMP
increases with the operand sizes for many operations, since GMP uses
asymptotically faster algorithms.
'';
platforms = platforms.all;
maintainers = [ ];

3
pkgs/development/libraries/gnutls/default.nix
View File

@ -98,7 +98,8 @@ stdenv.mkDerivation rec {
sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
'' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
# See https://gitlab.com/gnutls/gnutls/-/issues/945
sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh

10
pkgs/development/libraries/libmpc/default.nix
View File

@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
meta = {
description = "Library for multiprecision complex arithmetic with exact rounding";
longDescription =
'' GNU MPC is a C library for the arithmetic of complex numbers with
arbitrarily high precision and correct rounding of the result. It is
built upon and follows the same principles as GNU MPFR.
'';
longDescription = ''
GNU MPC is a C library for the arithmetic of complex numbers with
arbitrarily high precision and correct rounding of the result. It is
built upon and follows the same principles as GNU MPFR.
'';
homepage = "https://www.multiprecision.org/mpc/";
license = lib.licenses.lgpl2Plus;

2
pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
View File

@ -104,7 +104,7 @@ let
}
${# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
# about why to create a subdir for the workspace.
'' cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd ''
''cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd''
}
${# run the actual test snippet
bazelScript

8
pkgs/development/tools/misc/gdb/default.nix
View File

@ -117,10 +117,10 @@ stdenv.mkDerivation rec {
++ lib.optional enableDebuginfod "--with-debuginfod=yes"
++ lib.optional (!enableSim) "--disable-sim";
postInstall =
'' # Remove Info files already provided by Binutils and other packages.
rm -v $out/share/info/bfd.info
'';
postInstall = ''
# Remove Info files already provided by Binutils and other packages.
rm -v $out/share/info/bfd.info
'';
# TODO: Investigate & fix the test failures.
doCheck = false;

10
pkgs/development/tools/misc/gengetopt/default.nix
View File

@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
description = "Command-line option parser generator";
mainProgram = "gengetopt";
longDescription =
'' GNU Gengetopt program generates a C function that uses getopt_long
function to parse the command line options, to validate them and
fills a struct
'';
longDescription = ''
GNU Gengetopt program generates a C function that uses getopt_long
function to parse the command line options, to validate them and
fills a struct
'';
homepage = "https://www.gnu.org/software/gengetopt/";

4
pkgs/tools/archivers/sharutils/default.nix
View File

@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tools for remote synchronization and `shell archives'";
longDescription =
'' GNU shar makes so-called shell archives out of many files, preparing
longDescription = ''
GNU shar makes so-called shell archives out of many files, preparing
them for transmission by electronic mail services. A shell archive
is a collection of files that can be unpacked by /bin/sh. A wide
range of features provide extensive flexibility in manufacturing

22
pkgs/tools/compression/brotli/default.nix
View File

@ -54,18 +54,18 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
homepage = "https://github.com/google/brotli";
description = "Generic-purpose lossless compression algorithm and tool";
longDescription =
'' Brotli is a generic-purpose lossless compression algorithm that
compresses data using a combination of a modern variant of the LZ77
algorithm, Huffman coding and 2nd order context modeling, with a
compression ratio comparable to the best currently available
general-purpose compression methods. It is similar in speed with
deflate but offers more dense compression.
longDescription = ''
Brotli is a generic-purpose lossless compression algorithm that
compresses data using a combination of a modern variant of the LZ77
algorithm, Huffman coding and 2nd order context modeling, with a
compression ratio comparable to the best currently available
general-purpose compression methods. It is similar in speed with
deflate but offers more dense compression.
The specification of the Brotli Compressed Data Format is defined
in the following internet draft:
http://www.ietf.org/id/draft-alakuijala-brotli
'';
The specification of the Brotli Compressed Data Format is defined
in the following internet draft:
http://www.ietf.org/id/draft-alakuijala-brotli
'';
license = licenses.mit;
maintainers = with maintainers; [ freezeboy ];
pkgConfigModules = [

20
pkgs/tools/compression/gzip/default.nix
View File

@ -55,17 +55,17 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnu.org/software/gzip/";
description = "GNU zip compression program";
longDescription =
''gzip (GNU zip) is a popular data compression program written by
Jean-loup Gailly for the GNU project. Mark Adler wrote the
decompression part.
longDescription = ''
gzip (GNU zip) is a popular data compression program written by
Jean-loup Gailly for the GNU project. Mark Adler wrote the
decompression part.
We developed this program as a replacement for compress because of
the Unisys and IBM patents covering the LZW algorithm used by
compress. These patents made it impossible for us to use compress,
and we needed a replacement. The superior compression ratio of gzip
is just a bonus.
'';
We developed this program as a replacement for compress because of
the Unisys and IBM patents covering the LZW algorithm used by
compress. These patents made it impossible for us to use compress,
and we needed a replacement. The superior compression ratio of gzip
is just a bonus.
'';
platforms = lib.platforms.all;

24
pkgs/tools/compression/xz/default.nix
View File

@ -65,19 +65,19 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/tukaani-project/xz/releases/tag/v${finalAttrs.version}";
description = "General-purpose data compression software, successor of LZMA";
homepage = "https://tukaani.org/xz/";
longDescription =
'' XZ Utils is free general-purpose data compression software with high
compression ratio. XZ Utils were written for POSIX-like systems,
but also work on some not-so-POSIX systems. XZ Utils are the
successor to LZMA Utils.
longDescription = ''
XZ Utils is free general-purpose data compression software with high
compression ratio. XZ Utils were written for POSIX-like systems,
but also work on some not-so-POSIX systems. XZ Utils are the
successor to LZMA Utils.
The core of the XZ Utils compression code is based on LZMA SDK, but
it has been modified quite a lot to be suitable for XZ Utils. The
primary compression algorithm is currently LZMA2, which is used
inside the .xz container format. With typical files, XZ Utils
create 30 % smaller output than gzip and 15 % smaller output than
bzip2.
'';
The core of the XZ Utils compression code is based on LZMA SDK, but
it has been modified quite a lot to be suitable for XZ Utils. The
primary compression algorithm is currently LZMA2, which is used
inside the .xz container format. With typical files, XZ Utils
create 30 % smaller output than gzip and 15 % smaller output than
bzip2.
'';
license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ sander ];
platforms = platforms.all;