Commit Graph

78191 Commits

Author SHA1 Message Date
Fabian Affolter
41b1a58f40 python310Packages.stubserver: init at 1.1 2022-11-07 17:55:36 +01:00
Aaron Andersen
d3c9c4df6b
Merge pull request #185683 from ilkecan/phpPackages-set-meta-mainProgram
phpPackages: set meta.mainProgram
2022-11-07 08:25:02 -05:00
Rok Garbas
5232a35ea7
Merge pull request #199589 from djacu/feature/add-ppx-yojson-conv-to-ocaml-modules
ocamlPackages.ppx_yojson_conv: init at 0.15.1
2022-11-07 13:39:56 +01:00
Damien Cassou
011e62ddd7
Merge pull request #198932 from linsui/safeeyes 2022-11-07 11:00:14 +01:00
Edward Tjörnhammar
ea396831fa mdevctl: init at 1.2.0 2022-11-07 09:05:23 +00:00
Ryan Burns
5a81fe3684
Merge pull request #196502 from r-burns/mips-darwin-cross
linuxHeaders: fix darwin -> linux-mips cross-compilation
2022-11-06 20:16:49 -08:00
amesgen
4a3fc076e4
clingcon: 5.0.0 -> 5.2.0 and fix build 2022-11-07 00:41:21 +01:00
Doron Behar
c568890eb8
Merge pull request #133537 from Yarny0/foomatic-db
foomatic-db ppd files
2022-11-06 22:25:55 +00:00
Thiago Kenji Okada
5edea0dc96
Merge pull request #199674 from BeneSim/photoprism
photoprism: init at 221102-905925b4d
2022-11-06 22:08:32 +00:00
Fabian Affolter
e933a145a7
Merge pull request #199884 from fabaff/python-lsp-server-bump
python310Packages.spyder: 5.3.3 -> 5.4.0
2022-11-06 22:41:35 +01:00
Bernardo Meurer
1577208185
Merge pull request #198770 from Madouura/pr/aggr 2022-11-06 15:34:21 -05:00
Timothy DeHerrera
431f726d7e
Merge pull request #199775 from blaggacao/pkgs-ifwifi-init
iwifi: init at 1.0.3
2022-11-06 12:27:44 -07:00
Benjamin Isbarn
106a616eae
photoprism: init at 221102-905925b4d 2022-11-06 19:43:05 +01:00
Yarny0
075d112131 foomatic-db-ppds (cups ppd files): init
`foomatic-db-ppds` uses the Foomatic database from the packages
`foomatic-db` and -- optionally -- `foomatic-db-nonfree`
and the perl modules from `foomatic-db-engine`
to generate about 8,800 ppd files.

The general structure of the build recipe is as follows:

* Merge `foomatic-db` and `foomatic-db-nonfree` into
  one package that represents the Foomatic database.
  The package `foomatic-db-nonfree` is optional
  as it taints the result license-wise;
  it will only be used if `withNonfreeDb`
  is to to `true` in the `callPackage` call.
  We create a tiny setup hook script that provides the combined
  database and sets an environment variable pointing to the
  database direcotry, which is expected by the foomatic engine.

* The final package's license and version are computed
  from the licenses and versions of the database packages.
  The license is set to `free` if each database-providing
  package has a free license, and to `unfree` otherwise.
  The version is simply the highest version
  of the database-providing packages.

* The final package uses `foomatic-compiledb`
  from the `foomatic-db-engine` package to extract
  all ppd files from the database packages.
  `patchPpdFilesHook` is used to patch most
  executable invocations in the ppd files
  so that they point to nix store paths.
  Finally, ppd files are gzipped to reduce storage
  (from about 550 MiB to 90 MiB installed).

The "nonfree" version of the package, i.e. the version that is
based on `foomatic-db-nonfree` in addition to `foomatic-db`,
contains about 120 additional ppd files
compared to the "free" version.
Since the "free" version already produces about 8,700
ppd files and hydra won't build the "nonfree" version,
the commit adds two package variables to `all-packages.nix`:

* `foomatic-db-ppds` is based on `foomatic-db` only
* `foomatic-db-ppds-withNonfreeDb`
  is also based on `foomaitc-db-nonfree`

The package introduced by this commit
is the result of combining other packages;
it is not the build product of a simple source tarball.
While it would also be possible to perform the ppd file
generation directly in the build process of the database
packages, this would yield further complexity as the
`foomatic-db-nonfree` package needs to be combined with the
`foomatic-db` package before ppd file extraction is possible.

There is no upstream product with a name that
could/should be used for the `name` attribute,
the variable name, or for the filename in nixpkgs.
Similar packages have different names across distributions:

* https://repology.org/projects/?search=openprinting
* https://repology.org/projects/?search=foomatic

The name `foomatic-db-ppds` seems to be most common
(albeit not really *that* common):

* https://repology.org/project/foomatic-db-ppds/versions

At least openSUSE splits their corresponding
package into multiple "binary" packages
(similar to our multi-output packages):

* https://build.opensuse.org/package/binaries/Printing/OpenPrintingPPDs/openSUSE_Tumbleweed

I considered something similar.
However, after doing some statistics,
I concluded that it's not worth the effort:
The biggest dependencies (`perl` and `cups-filters`) are
already present on most NixOS systems, and they cannot
be "split away" easily since it cannot be
done along a canonical line (e.g. printer driver).
Splitting directly by dependency risks that ppd files
unexpectedly "move from output to output" on package updates;
disappearing ppd files can be quite annoying for package users.
2022-11-06 19:28:15 +01:00
Yarny0
156cc612ff foomatic-db-nonfree (cups ppd files): init at unstable/2015-06-05
`foomatic-db-nonfree` contains -- similar to its sister
package `foomatic-db` -- knowledge about printers,
drivers, and driver options from OpenPrinting in xml files.
It needs to be combined with the `foomatic-db`
package to yield a working database.
It also provides about 100 (gzipped) ppd files.
In contrast to `foomatic-db`, this package contains
data that is provided under non-free licenses.

Quoting
https://github.com/OpenPrinting/foomatic-db-nonfree/blob/master/README

> This is a repository of PPD and Foomatic XML files that may
> have restrictions that keep them from being used on a variety
> of machines for licensing and other non-technical reasons.

ppd files can be found in
`$out/share/cups/model/foomatic-db-nonfree`.
The subdirectory `foomatic-db-nofree` is used to avoid conflicts
with other packages that might be combined with the package
`foomatic-db-nonfree` in `config.services.printing.drivers`.

ppd files in this package are *not* patched
to call executables from the nix store:
The only executable "rastertophaser6100" that is
called from ppd files isn't available in nixpkgs.

There is a daily snapshot of a source archive available at
https://www.openprinting.org/download/foomatic/ .
However, these files rotate daily and
cannot be used as a stable download source.
So we rely on OpenPrinting's Github repository
instead and pinpoint a fresh commit.
Note that the current version is from 2015,
so updates are unlikely.
2022-11-06 19:28:15 +01:00
Yarny0
90a8a78e7c foomatic-db (cups ppd files): init at unstable/2022-10-03
`foomatic-db` contains the collected knowledge about printers,
drivers, and driver options from OpenPrinting in xml files.
It also provides thousands of ppd files.
The build process patches those files to reference executables
in the nix store and gzips them to reduce storage
(from about 670 MiB to 90 MiB installed).

In contrast to the sister package `foomatic-db-nonfree`
(packaged in a follow-up commit),
this package only includes files published under a free license.
Most files are published under the GPL,
some under the MIT license.
For details see
https://github.com/OpenPrinting/foomatic-db/blob/master/COPYING .
To encompass the different licenses, the package's
license is set to "free" as the common denominator.

ppd files can be found in `$out/share/cups/model/foomatic-db`.
The subdirectory `foomatic-db` is used to avoid conflicts
with other packages that might be combined with the package
`foomatic-db` in `config.services.printing.drivers`.

There is a daily snapshot of a source archive available at
https://www.openprinting.org/download/foomatic/ .
However, these files rotate daily and
cannot be used as a stable download source.
So we rely on OpenPrinting's Github repository
instead and pinpoint a fresh commit.
2022-11-06 19:28:15 +01:00
Yarny0
cd4c8d63f5 foomatic-db-engine: init at unstable-2022-05-03
`foomatic-db-engine` contains several perl scripts to parse
and process XML files from the Foomatic database packages.
It can be used to extract ppd files,
which will be accomplished in a follow-up commit.

The package also contains scripts
to handle print queues and jobs.
It can -- optionally -- talk to the local cups server,
to network printers and to SMB print servers.
The build recipe contains switches to enable these features;
however, they are not needed when generating ppd files.

There is a daily snapshot of a source archive available at
https://www.openprinting.org/download/foomatic/ .
However, these files rotate daily and
cannot be used as a stable download source.
So we rely on OpenPrinting's Github repository
instead and pinpoint a fresh commit.
2022-11-06 19:28:15 +01:00
Fabian Affolter
f14cafb944 python310Packages.pylint-venv: init at 2.3.0 2022-11-06 19:24:42 +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
Mario Rodas
4fb1df25be
Merge pull request #199793 from marsam/update-gurk
gurk-rs: 0.2.5 -> 0.3.0
2022-11-06 09:51:34 -05:00
Franz Pletz
c190f823d5
Merge pull request #199598 from avdv/mold-on-aarch64-linux
mold: Unbreak on aarch64-linux
2022-11-06 12:31:40 +01:00
Bobby Rong
c0d0e8c45e
Merge pull request #199823 from linj-fork/bump-kanata
kanata: 1.0.7 -> 1.0.8
2022-11-06 19:12:50 +08:00
Sandro
ef98abf6eb
Merge pull request #199779 from SuperSandro2000/spotify 2022-11-06 11:20:15 +01:00
Sandro Jäckel
696449dedb spotify: consolidate wrapper 2022-11-06 11:19:51 +01:00
Sandro
a362cc95bd
Merge pull request #194337 from andersk/ortools 2022-11-06 11:06:41 +01:00
Lin Jian
ce61694247
kanata: override kanata to generate kanata-with-cmd 2022-11-06 16:42:23 +08:00
Anders Kaseorg
503864768b or-tools: 9.1 → 9.4
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2022-11-05 18:13:35 -07:00
Anderson Torres
9eb107c54e
Merge pull request #199747 from lucasew/fix/weka
weka: use openjdk11
2022-11-05 22:12:31 -03:00
David Arnold
455ea2e5e5
iwifi: init at 1.0.3 2022-11-05 20:02:40 -05:00
lucasew
407b1ce09d weka: use openjdk11
Signed-off-by: lucasew <lucas59356@gmail.com>
2022-11-05 20:36:59 -03:00
Mario Rodas
e0beee1844
Merge pull request #195877 from wegank/xmlcopyeditor-darwin
xmlcopyeditor: 1.2.1.3 -> 1.3.1.0
2022-11-05 14:55:18 -05:00
Luke Granger-Brown
69cf4149ab python3Packages.aiolifx-themes: init at v0.2.0 2022-11-05 13:29:20 +01:00
Martin Weinelt
a975823d5b python3Packages.mac-vendor-lookup: init at 0.1.12 2022-11-05 13:29:20 +01:00
Fabian Affolter
0917dd484e python310Packages.oralb-ble: init at 0.10.1 2022-11-05 13:29:18 +01:00
Martin Weinelt
2d4340c2b7 python3Packages.bsblan: remove in favor of python-bsblan
Duplicate with the correct name introduced in #197857.
2022-11-05 13:29:18 +01:00
Nick Cao
a9fb9f3b06
Revert "sysdig: pin to openssl_1_1"
This reverts commit 240ace010d.
2022-11-05 13:10:51 +08:00
Claudio Bley
efa86fc3b0 mold: Unbreak on aarch64-linux
The default stdenv C++ compiler / library on this platform is too old to
support mold's C++20 code base.
2022-11-05 00:56:56 +01:00
Daniel Baker
35dbaabc78 ocamlPackages.ppx_yojson_conv: init at 0.15.1 2022-11-05 00:07:33 +01:00
Robert Scott
36e7b7f085
Merge pull request #198558 from LeSuisse/wolfssl-5.5.2
wolfssl: 5.5.1 -> 5.5.2
2022-11-04 21:11:33 +00:00
Valentin Gagarin
b02d74fb5e
Merge pull request #173225 from matthuszagh/uhdm
Add systemverilog plugin to yosys
2022-11-04 18:37:13 +01:00
Weijia Wang
b9efaafce1 xmlcopyeditor: 1.2.1.3 -> 1.3.1.0 2022-11-04 17:39:01 +01:00
Christian Kögler
759bbe2f57
Merge pull request #190900 from bzizou/seqkit
seqkit: init at 2.3.1
2022-11-04 16:48:40 +01:00
Bernardo Meurer
dac8adf99a
Merge pull request #197235 from PedroHLC/spirv-llvm-translator_14-init 2022-11-04 14:48:17 +00:00
Sandro
26ffd79fda
Merge pull request #191255 from reckenrode/wine-moltenvk 2022-11-04 15:33:32 +01:00
Sandro
8f679a5327
Merge pull request #194031 from NickCao/stellarium 2022-11-04 15:33:03 +01:00
figsoda
6ca88b3b7a
Merge pull request #199366 from figsoda/guppy
cargo-guppy: init at unstable-2022-10-29
2022-11-04 10:31:06 -04:00
figsoda
59549a5a73
Merge pull request #199418 from MrcJkb/lemmy-help
lemmy-help: init at 0.9.0
2022-11-04 10:05:23 -04:00
Madoura
ec690a4cf4
rocthrust: init at 2.16.0-5.3.1 2022-11-04 08:20:30 -05:00
Madoura
edbebe1dbb
clang-ocl: init at 5.3.1 2022-11-04 08:20:30 -05:00
Madoura
d147c1d5dd
composable_kernel: init at unstable-2022-11-02 2022-11-04 08:20:30 -05:00