Commit Graph
423986 Commits
Author SHA1 Message Date
Yarny0 bafefd7ae2 samsung-unified-linux-driver (cups driver): patch all filters
ppd files in the `samsung-unified-linux-driver`
package invoke these filter commands:

* pstosecps
* pstospl
* rastertospl
* pstosplc

The paths to all of those commands excluding the last one got
patched with their absolute paths during the build process.
This commit adds the last one to
the list of commands to be patched.
2022-11-06 16:19:23 +01:00
Yarny0 bfe3271fc0 samsung-unified-linux-driver (cups driver): use patchPpdFilesHook
The `sed` script in the `installPhase` is removed.
Instead, the setup hook `patchPpdFilesHook` is
used to patch the path to the filter executables.

The result should essentially be the same.
Comparing the generated ppd files showed no difference,
short of the package's hash in the absolute paths and
added newline characters at the end of some ppd files.
Missing newline characters at the end of the last line are
apparently added by `awk`; this shouldn't affect functionality.
The new package also contains a `propagated-build-inputs`
file which propagates the package itself.
This ensures the package is available whenever
a ppd file is singled out by another package.
2022-11-06 16:19:23 +01:00
Yarny0 bf30b53817 cups-kyocera (cups driver): use patchPpdFilesHook
The `sed` script in the `installPhase` is removed.
Instead, the setup hook `patchPpdFilesHook`
is used to patch the path to `rastertokpsl`.

The result should essentially be the same.
Comparing the generated ppd files showed no difference
(short of the package's hash in the absolute paths).
The new package also contains a `propagated-build-inputs`
file which propagates the package itself.
This ensures the package is available whenever
a ppd file is singled out by another package.
2022-11-06 16:19:22 +01:00
Yarny0 ef8566f38b cups-drv-rastertosag-gdi (cups driver): patch ppd bin paths
The `cups-drv-rastertosag-gdi` CUPS printer driver
package provides a filter executable `rastertosag-gdi`
and two ppd files that reference the filter file.
The commit at hand uses `patchPpdFilesHook` to
replace calls to the filter executable with
absolute paths to increase package purity.
2022-11-06 16:19:22 +01:00
Yarny0 335a9083b0 patchPpdFilesHook: new setup hook for absolute executable paths
PostScript Printer Description (ppd) files
describe printer features and capabilities.
They are usually evaluated by CUPS to convert
print jobs into a format suitable for a printer.
The conversion is often accomplished by commands
or even short shell scripts inside the ppd files.

ppd files are included in many printer driver packages.
Their scripts sometimes refer to other executables;
some of them are more common (like `perl`),
others are more exotic (like `rastertohp`).
If an executable is called with its name alone,
the effects of the ppd file depend on whether
the executable is in the PATH of CUPS,
and on the executable's version.
If an executable is called with an absolut path
(like `/usr/bin/perl`), it won't work at all in NixOS.

The commit at hand adds a setup hook that uses
the `fixupPhase` to substitute certain executable's
invocations in pdd files with absolute paths.
To use it, add the hook to `nativeBuildInputs` and
provide a list of executable names in `ppdFileCommands`.
Each executable must be available in the
package that is being built, or in `buildInputs`.
The setup hook's script then looks for ppd files in
`share/cups/model` and `share/ppds` in each output,
and replaces executable names with their absolute paths.
If ppd files need to be patched in unorthodox locations or
the setup hook needs to be invoked manually for other reasons,
one may leave the list `ppdFileCommands` empty to
avoid automatic processing of ppd files, then call
the shell function `patchPpdFileCommands` directly.
Details are described in the file `patch-ppd-hook.sh`.

Notes on the motivation for this setup hook:

Most packages in nixpkgs that provide
ppd files do not patch those ppd files at all.
This is not fatal when the executables are just called
with their names since the user can add packages
with the executables to `services.printing.drivers`.
E.g. if the user adds `pkgs.perl`, then all ppd
files that invoke `perl` will work as expected.
Nevertheless, to make these ppd files independent of
their execution environment, command invocations should
be substituted with absolut paths into the nix store.
This is similar to patching shebang lines so scripts can be
called independently of having the interpreter in the PATH.

The hook script in this commit is meant to support new packages
`foomatic-db*` which will generate several thousands of
ppd files referencing a plethora of different executables.
During development of these packages, I realized that
it's quite hard to patch ppd files in a robust way.
While binary names like `rastertokpsl` seem to be sufficiently
unique to be patched with `sed`, names like `date` or `gs`
are hard to patch without producing "false positives",
i.e., coincidental occurences of the executable's name that do
*not* refer to the executable and should not be patched at all.
As this problem also affects other packages,
it seems reasonable to put a robust implementation
in its own setup hook so that other
packages can use it without much effort.

Notes on the implementation:

The ppd file format is far from trivial.
The basic structure are key-value pairs;
keys may occur multiple times.
Only a small subset of keys may contain
executable names or shell scripts in their values.
Some values may span multiple lines;
a linebreak might even occur in the middle of a token.
Some executable names also occur in other keys by accident
where they must not be substituted (e.g. `gs` or `date`).

It is necessary to provide the list of command
names that will be patched for two reasons:
ppd files often contain "tokens" that might look
like commands (e.g. "file" or "host") but aren't;
these would erroneously get patched.
Also, looking for everything that might be a command
would slow down the patching process considerably.

The implementation uses `awk` to detect
keys that might contain executable names;
only their values are treated for substitution.
This avoids most cases of "overzealous" substitutions.
Since values may span multiple lines,
`sed` alone (while faster than `awk`) cannot focus
its substitution capabilities on relevant keys.
An elaborate set of regular expressions further helps
to minimize the probability of "false positives".
Several tricks are employed to speed up `awk`.
Notably, relevant files are identified with
`grep` before `awk` is applied to those files only.
Note that the script probably cannot handle fancy command
names (like spaces or backslashes as part of the name).
Also, there are still edge cases that the script would
mistakenly skip, e.g. if a shell script contains a
line break in the middle of an executable's name;
although ppd files permit such constellations,
I have yet to see one.

ppd files may be gzipped.
The setup hook accepts gzipped ppd files:
It decompresses them, substitutes paths, then recompresses them.
However, Nix cannot detect substituted paths as
runtime dependencies in compressed ppd files.
To ensure substituted paths are propagated as
runtime dependencies, the script adds each substituted
path to the variable `propagatedBuildInputs`.
Since this might not be enough for multi-output packages,
those paths are also written directly to
`nix-support/propagated-build-inputs`.
See the comment in `patch-ppd-hook.sh` for details.

Finally, the setup hook comes with a small test that
probes some edge cases with an artificial ppd file.

References:

* https://www.cups.org/doc/spec-ppd.html
  * general ppd file specification
  * lists some keys that may contain
    executable names or shell scripts

* https://refspecs.linuxfoundation.org/LSB_4.0.0/LSB-Printing/LSB-Printing/ppdext.html
  * lists some keys that may contain
    executable names or shell scripts

* https://en.wikipedia.org/wiki/PostScript_Printer_Description#CUPS
  * lists the usual locations of ppd files
2022-11-06 16:19:22 +01:00
Yarny0 6f622e91c5 cups-drv-rastertosag-gdi (cups driver): gzip ppd files
ppd files are gzipped to save some space.
The `gzip` "-n" option prevents gzip from storing
a timestamp, thus facilitating reproducibility.
2022-11-06 16:19:22 +01:00
Yarny0 5222363936 cups-drv-rastertosag-gdi (cups driver): fix simple comment typo 2022-11-06 16:19:22 +01:00
Mario RodasandGitHub 3bacde6273 Merge pull request #199554 from r-ryantm/auto-update/awscli2
awscli2: 2.8.8 -> 2.8.9
2022-11-05 01:30:49 -05:00
Mario RodasandGitHub ff2e4e2408 Merge pull request #199605 from fabaff/google-cloud-appengine-logging-bump
python310Packages.google-cloud-appengine-logging: 1.1.5 -> 1.1.6
2022-11-05 01:28:55 -05:00
github-actions[bot]andzowoq 429feeb354 terraform-providers.tencentcloud: 1.78.7 → 1.78.8 2022-11-05 16:28:44 +10:00
github-actions[bot]andzowoq 0bf54c5ee7 terraform-providers.sumologic: 2.19.1 → 2.19.2 2022-11-05 16:28:44 +10:00
github-actions[bot]andzowoq 9389dec4a7 terraform-providers.snowflake: 0.49.0 → 0.50.0 2022-11-05 16:28:44 +10:00
github-actions[bot]andzowoq ea85340ba7 terraform-providers.skytap: 0.15.0 → 0.15.1 2022-11-05 16:28:44 +10:00
Mario RodasandGitHub f815e016e3 Merge pull request #199604 from fabaff/whois-bump
python310Packages.whois: 0.9.16 -> 0.9.17
2022-11-05 01:28:32 -05:00
Mario RodasandGitHub 3d6507eed3 Merge pull request #199611 from figsoda/nextest
cargo-nextest: 0.9.42 -> 0.9.43, add figsoda as a maintainer
2022-11-05 01:27:01 -05:00
Mario RodasandGitHub 8268152e56 Merge pull request #199620 from figsoda/cargo-deny
cargo-deny: 0.13.3 -> 0.13.4
2022-11-05 01:24:45 -05:00
Mario RodasandGitHub 24ca01fb3a Merge pull request #199643 from NickCao/sysdig
Revert "sysdig: pin to openssl_1_1"
2022-11-05 01:24:24 -05:00
Mario RodasandGitHub a395a15960 Merge pull request #195604 from tjni/starship
starship: reenable default features on darwin
2022-11-05 01:14:07 -05:00
Mario RodasandGitHub 2a0350d496 Merge pull request #199555 from senorsmile/mutagen-0.16.0
mutagen: 0.14.0 -> 0.16.0
2022-11-05 00:39:33 -05:00
Mario RodasandGitHub 532ab107ba Merge pull request #199626 from r-ryantm/auto-update/syft
syft: 0.60.2 -> 0.60.3
2022-11-05 00:24:13 -05:00
Mario RodasandGitHub ed229c09e9 Merge pull request #199638 from marsam/update-nodejs
nodejs: 14.21.0 -> 14.21.1, 16.18.0 -> 16.18.1, 18.12.0 -> 18.12.1, 19.0.0 -> 19.0.1 

resolves #199578 
resolves #199607
resolves #199608
2022-11-05 00:22:56 -05:00
Mario RodasandGitHub b473e04a37 Merge pull request #199540 from r-ryantm/auto-update/oh-my-posh
oh-my-posh: 12.10.0 -> 12.11.0
2022-11-05 00:14:31 -05:00
Nick Cao a9fb9f3b06 Revert "sysdig: pin to openssl_1_1"
This reverts commit 240ace010d.
2022-11-05 13:10:51 +08:00
R. RyantmandBobby Rong f9dc913011 v2ray-geoip: 202210270100 -> 202211030059 2022-11-05 13:07:29 +08:00
Mario Rodas 71d53b94c6 oh-my-posh: 12.11.0 -> 12.12.1 2022-11-05 04:20:00 +00:00
Mario RodasandGitHub 94d4893136 Merge pull request #199627 from r-ryantm/auto-update/terragrunt
terragrunt: 0.39.2 -> 0.40.0
2022-11-04 23:08:05 -05:00
R. RyantmandBobby Rong 44770699ea netbird: 0.10.3 -> 0.10.4 2022-11-05 12:01:19 +08:00
R. RyantmandBobby Rong c8abf9c376 debootstrap: 1.0.127 -> 1.0.128 2022-11-05 11:58:03 +08:00
R. RyantmandBobby Rong 6c731843c3 pgloader: 3.6.8 -> 3.6.9 2022-11-05 11:53:56 +08:00
Mario RodasandGitHub fa7b12e493 Merge pull request #199606 from fabaff/canonicaljson-bump
python310Packages.canonicaljson: 1.6.3 -> 1.6.4
2022-11-04 22:51:27 -05:00
R. RyantmandBobby Rong 2390991544 s3cmd: 2.2.0 -> 2.3.0 2022-11-05 11:50:46 +08:00
R. RyantmandBobby Rong d163332ff9 jellyfin-ffmpeg: 5.1.2-2 -> 5.1.2-4 2022-11-05 11:47:12 +08:00
R. RyantmandBobby Rong c4937f84a5 cloud-init: 22.3.3 -> 22.3.4 2022-11-05 11:44:04 +08:00
Anderson TorresandGitHub eb738c0fd3 Merge pull request #199492 from kilianar/calibre-6.8.0
calibre: 6.7.1 -> 6.8.0
2022-11-05 00:11:23 -03:00
Bobby RongandGitHub bfd16c5676 Merge pull request #199469 from afh/afh-got-update
got: 0.77 -> 0.78
2022-11-05 11:03:05 +08:00
R. Ryantm 177eaa168a terragrunt: 0.39.2 -> 0.40.0 2022-11-05 02:55:17 +00:00
R. Ryantm 7cd0ea9d37 syft: 0.60.2 -> 0.60.3 2022-11-05 02:47:55 +00:00
ArtturiandGitHub bed653c5fa Merge pull request #164169 from martinetd/logrotate_post_cleanup
logrotate: cleanup legacy options
2022-11-05 04:27:33 +02:00
figsoda 5eaab876db cargo-deny: 0.13.3 -> 0.13.4 2022-11-04 22:18:58 -04:00
SandroandGitHub c28018857a Merge pull request #199426 from r-ryantm/auto-update/aws-c-sdkutils 2022-11-05 02:41:25 +01:00
Lin JianandCole Helbling fb445b517e nixos/fish: use a local version of runCommand for babelfishTranslate
Building etc."fish/setEnvironment.fish" needs
config.system.build.setEnvironment, which can be very large. And what
babelfishTranslate does is to translate env vars exported by bash
syntax, which does not need much computing power.

This patch can reduce the network traffic when using remote builders
with almost no harm.
2022-11-04 18:35:18 -07:00
Dominique Martinet 665d896244 logrotate: add services.logrotate.settings example 2022-11-05 10:34:04 +09:00
Dominique Martinet 01ff1dd23f logrotate service: cleanup deprecated options 2022-11-05 10:34:03 +09:00
Theodore NiandYt 1dd8696f96 vector: 0.24.1 -> 0.25.0 2022-11-04 21:06:39 -04:00
figsoda 2b4a5cf5c1 cargo-nextest: 0.9.42 -> 0.9.43, add figsoda as a maintainer 2022-11-04 21:04:21 -04:00
Theodore Ni 7b9bb27e08 starship: reenable default features on darwin 2022-11-04 17:55:53 -07:00
Fabian Affolter a913371b15 python310Packages.canonicaljson: 1.6.3 -> 1.6.4 2022-11-05 01:44:04 +01:00
Fabian Affolter ec3c0418a5 python310Packages.google-cloud-appengine-logging: 1.1.5 -> 1.1.6 2022-11-05 01:40:54 +01:00
Fabian AffolterandGitHub 0a471a0b94 Merge pull request #199600 from fabaff/mockupdb-fix
python310Packages.mockupdb: switch to pytestCheckHook
2022-11-05 01:36:27 +01:00
Fabian AffolterandGitHub fcb005f99f Merge pull request #199590 from fabaff/aiomysensors-bump
python310Packages.aiomysensors: 0.3.1 -> 0.3.2
2022-11-05 01:32:06 +01:00