3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

8314 commits

Author SHA1 Message Date
Doron Behar c568890eb8
Merge pull request #133537 from Yarny0/foomatic-db
foomatic-db ppd files
2022-11-06 22:25:55 +00:00
Yarny0 0d36fdc66b samsung-unified-linux-driver (cups driver): call {pre,post}Install
Add `preInstall` and `postInstall` to the `installPhase` to
permit package overrides to add commands to the install phase.

Suggested by r-rmcgibbo bot in
https://github.com/NixOS/nixpkgs/pull/133537#issuecomment-897437621
2022-11-06 19:28:16 +01:00
Yarny0 2c28e0dc18 cups-kyocera (cups driver): call {pre,post}Install
Add `preInstall` and `postInstall` to the `installPhase` to
permit package overrides to add commands to the install phase.

Suggested by r-rmcgibbo bot in
https://github.com/NixOS/nixpkgs/pull/133537#issuecomment-897437621
2022-11-06 19:28:15 +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
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 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
Anderson Torres dcea56508a
Merge pull request #197075 from ereslibre/bump-fastly-4-2-0
fastly: 3.2.4 -> 4.3.0
2022-11-05 23:30:35 -03:00
Rafael Fernández López 6a20958e75 fastly: 3.2.4 -> 4.3.0 2022-11-04 14:36:25 +01:00
ajs124 42ec4ec905
Merge pull request #198303 from cleeyv/jitsi-update
Update of all Jitsi Meet components
2022-11-03 22:57:04 +01:00
Weijia Wang f09703cd25 cups: fix build on darwin 2022-11-03 00:28:21 +01:00
github-actions[bot] 075f0857dd
Merge master into staging-next 2022-11-02 00:02:32 +00:00
R. Ryantm 739857a03e autotiling: 1.7 -> 1.8 2022-11-01 13:56:02 +00:00
github-actions[bot] 082314708c
Merge master into staging-next 2022-10-30 12:01:18 +00:00
Sergei Trofimovich 229fa2fd6d xautolock: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
2022-10-30 11:35:20 +01:00
github-actions[bot] d3cd7d0199
Merge master into staging-next 2022-10-29 18:01:22 +00:00
ajs124 366ab923b5
Merge pull request #197207 from cleeyv/jitsi-update-fix
jitsi: fix update scripts
2022-10-29 16:41:29 +02:00
github-actions[bot] 18b25cbb99
Merge master into staging-next 2022-10-29 12:01:19 +00:00
Sergei Trofimovich e180a6988a xtrlock-pam: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
2022-10-29 12:12:32 +02:00
Cleeyv d451a6ef0c jitsi-meet-prosody: 1.0.6600 -> 1.0.6644 2022-10-28 11:50:17 -04:00
Sergei Trofimovich 7824b4856c rss-glx: use xorg.* packages directly instead of xlibsWrapper
Validated as no change in `out` outputs with `diffoscope`.
2022-10-25 22:56:27 +01:00
github-actions[bot] 81a6c5a54c
Merge staging-next into staging 2022-10-25 18:16:24 +00:00
R. Ryantm 0d067d9a29 autotiling: 1.6.1 -> 1.7 2022-10-25 08:58:13 -07:00
github-actions[bot] c80ab7a746
Merge staging-next into staging 2022-10-25 00:05:26 +00:00
Artturin 6444c18e9c flashfocus: 2.2.3 -> 2.3.1
add updateScript
2022-10-24 22:25:37 +03:00
github-actions[bot] f4c71b2f8c
Merge staging-next into staging 2022-10-23 18:02:19 +00:00
Anderson Torres 925c0fa54a
Merge pull request #197322 from atorres1985-contrib/cleanup-maintainers
Cleanup maintainers
2022-10-23 11:59:28 -03:00
AndersonTorres 3888878db6 samsung cups driver: remove tohl from meta.maintainers list
Because tohl disappeared (last seen 2021-01-28).
2022-10-23 11:30:39 -03:00
Cleeyv 705e150b60 jitsi: fix update scripts
To consistently return the latest version number even when it is no longer
at the bottom of the alphanumeric list on the Jitsi stable download page.
Based on fix by @sbruder in 13760b87d2
2022-10-22 12:11:18 +02:00
Rick van Schijndel ae33e7cf40 cups: support prefixed pkg-config
Otherwise configure fails with the following error:
- configure: error: Need pkg-config to enable libusb support.
2022-10-19 20:38:28 +02:00
github-actions[bot] 958cbc7d51
Merge master into staging-next 2022-10-19 18:09:25 +00:00
rnhmjoj ea8a9631c4
sc-controller: 0.4.8.7 -> 0.4.8.9 2022-10-19 11:27:51 +02:00
github-actions[bot] e648107a22
Merge master into staging-next 2022-10-16 06:06:19 +00:00
Samuel Dionne-Riel 3f5416e81a
Merge pull request #195240 from ck3d/uboot-2022.10
uboot: 2022.07 -> 2022.10
2022-10-16 01:28:51 -04:00
Samuel Dionne-Riel 8e8391911b
Merge pull request #195275 from samueldr/fix/tfa-bintools239
armTrustedFirmware: Fix bintools 2.39 regression (LOAD segment with RWX)
2022-10-16 01:28:35 -04:00
github-actions[bot] 4f07e7f326
Merge master into staging-next 2022-10-15 06:07:54 +00:00
Artturi 56cbdc3b83
Merge pull request #195874 from Artturin/removeinheritxorg 2022-10-15 04:27:23 +03:00
Artturin 61c3058bcb all-packages.nix: remove inherit (*xorg) *'s
using inherits in callPackage args is discouraged and doesn't splice
correctly
2022-10-14 20:48:09 +03:00
github-actions[bot] cc090d2b94
Merge master into staging-next 2022-10-14 12:01:35 +00:00
Weijia Wang 6dfed5d51a sound-of-sorting: 2017-12-23 -> unstable-2022-10-12 2022-10-14 05:37:03 +02:00
Vladimír Čunát 00a757ed3f
Merge branch 'master' into staging 2022-10-13 08:27:55 +02:00
Sandro 2678c1b034
Merge pull request #193484 from wegank/gpl1-eol 2022-10-12 21:04:31 +02:00
Artturin f4ea1208ec treewide: *Flags convert to list from str
*Flags implies a list

slightly relevant:
> stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172

the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so
it's not a breaking change
2022-10-10 15:30:59 +03:00
Samuel Dionne-Riel 528fcc8762 armTrustedFirmware: Fix bintools 2.39 regression (LOAD segment with RWX)
Fixes:

```
.../aarch64-unknown-linux-gnu-ld.bfd: warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions
.../aarch64-unknown-linux-gnu-ld.bfd: warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions
.../aarch64-unknown-linux-gnu-ld.bfd: warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions
make: *** [Makefile:1306: /build/source/build/rk3399/release/bl31/bl31.elf] Error 1
```

See: https://developer.trustedfirmware.org/T996
2022-10-09 15:52:43 -04:00