1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Commit graph

8048 commits

Author SHA1 Message Date
github-actions[bot] 5b965b95d5
Merge master into staging-next 2022-05-05 12:04:22 +00:00
Fabian Affolter 39cdd05c72
Merge pull request #171533 from fabaff/textual-bump
python310Packages.textual: 0.1.15 -> 0.1.18, rich-cli: 1.5.1 -> 1.7.0
2022-05-05 08:07:53 +02:00
github-actions[bot] 375b571b04
Merge master into staging-next 2022-05-05 06:01:10 +00:00
Fabian Affolter 2efd1090cf rich-cli: 1.5.1 -> 1.7.0 2022-05-04 16:23:18 +02:00
Mario Rodas 7b1a798741 platformsh: 3.79.1 -> 3.79.2
https://github.com/platformsh/platformsh-cli/releases/tag/v3.79.2
2022-05-04 04:20:00 +00:00
github-actions[bot] 46944fe032
Merge staging-next into staging 2022-05-03 00:02:25 +00:00
Sandro 556eb21b30
Merge pull request #158132 from deinferno/pantum-driver
pantum-driver: init at 1.1.84
2022-05-03 00:15:07 +02:00
deinferno 129a6899a0 pantum-driver: init at 1.1.84 2022-05-02 22:44:05 +05:00
Vladimír Čunát 9478ec747c
Merge branch 'staging-next-2022-04-23'
Close #169965: the PR and real 'staging-next' branch contained
extra systemd rebuild that I wanted to avoid in this iteration.
(to save Hydra's work)
2022-05-02 09:12:51 +02:00
github-actions[bot] 677697c12f
Merge staging-next into staging 2022-05-01 18:01:35 +00:00
github-actions[bot] da9b549e31
Merge master into staging-next 2022-05-01 18:01:03 +00:00
Mario Rodas 915c233daf
Merge pull request #170958 from SuperSandro2000/platformsh
platformsh: fix version parsing with nix-env
2022-05-01 10:12:27 -05:00
Vladimír Čunát c480cc2895
Merge branch 'master' into staging-next-2022-04-23 2022-04-30 23:02:28 +02:00
R. Ryantm b918d3c71c platformsh: 3.79.0 -> 3.79.1
https://github.com/platformsh/platformsh-cli/releases/tag/v3.79.1
2022-04-30 10:36:26 +00:00
Sandro Jäckel 4aa7c71088
platformsh: fix version parsing with nix-env 2022-04-30 02:32:29 +02:00
Robert Scott f5db448b86 Merge pull request #170336 from risicle/ris-ghostscript-9.56.1
ghostscript: 9.55.0 -> 9.56.1
2022-04-30 01:24:51 +01:00
Robert Scott 2047e6eb7d ghostscript: 9.55.0 -> 9.56.1 2022-04-29 22:36:08 +01:00
github-actions[bot] cbdf1f436c
Merge staging-next into staging 2022-04-29 12:01:53 +00:00
github-actions[bot] 8fcc2694d6
Merge master into staging-next 2022-04-29 12:01:18 +00:00
Artturi 20a38d4e06
Merge pull request #170820 from hexchen/fix/kyodialog3
cups-kyodialog3: fix download URL
2022-04-29 13:03:26 +03:00
github-actions[bot] fbd67854c6
Merge staging-next into staging 2022-04-29 06:01:45 +00:00
github-actions[bot] 2254d18031
Merge master into staging-next 2022-04-29 06:01:11 +00:00
Artturi f706bf055d
Merge pull request #170808 from msfjarvis/hs/2022-04-29/scrcpy-1.24
scrcpy: 1.23 -> 1.24
2022-04-29 03:33:43 +03:00
github-actions[bot] 03ecebd53a
Merge staging-next into staging 2022-04-29 00:03:11 +00:00
github-actions[bot] 619828db66
Merge master into staging-next 2022-04-29 00:02:35 +00:00
hexchen 3612596e61 cups-kyodialog3: fix download URL 2022-04-28 22:10:25 +00:00
Harsh Shandilya c7e4f2d4ce
scrcpy: 1.23 -> 1.24 2022-04-29 00:56:49 +05:30
R. Ryantm 20bc45ebeb platformsh: v3.78.0 -> v3.79.0 2022-04-28 07:59:12 +00:00
Vladimír Čunát 51554cbbdb
Merge branch 'master' into staging-next-2022-04-23 2022-04-27 22:50:17 +02:00
github-actions[bot] da11317d1c
Merge staging-next into staging 2022-04-27 06:01:39 +00:00
github-actions[bot] 2ac5c4af82
Merge master into staging-next 2022-04-27 06:01:04 +00:00
Bernardo Meurer d6b996030d
Merge pull request #170528 from lovesegfault/rpi-full-tree
feat: add support for the RaspberryPi CM4
2022-04-26 20:55:16 -07:00
Bernardo Meurer 0594277183
ubootRaspberryPi4_64bit: remove NVMe support patches 2022-04-26 19:09:06 -07:00
Bernardo Meurer 21b28447eb
uboot: add node on where rpi-cm4 patches come from 2022-04-26 19:05:27 -07:00
Bernardo Meurer 77bb75d6a2
ubootRaspberryPi4_64bit: rebase patch series 2022-04-26 19:05:26 -07:00
Bernardo Meurer cff95d1193
ubootRaspberryPi4_64bit: add patch for USB stall with non-MSD USB devices 2022-04-26 19:05:25 -07:00
Bernardo Meurer b30105b7c2
ubootRaspberryCM4_64bit: merge with ubootRaspberryPi4_64bit 2022-04-26 19:05:23 -07:00
github-actions[bot] 45a2d659a4
Merge staging-next into staging 2022-04-27 00:02:50 +00:00
github-actions[bot] 8261a7aaba
Merge master into staging-next 2022-04-27 00:02:17 +00:00
Congee a356e86676 tpm2-pkcs11: 1.7.0 -> 1.8.0 2022-04-26 16:25:06 -07:00
Bernardo Meurer 323f123f6a
ubootRaspberryCM4_64bit: add all NVME patches 2022-04-26 15:22:36 -07:00
Bernardo Meurer ca0c9279ab
ubootRaspberryCM4_64bit: enable USB and NVME 2022-04-26 15:22:35 -07:00
Bernardo Meurer d094a3e175
uboot: enable parallel building again 2022-04-26 15:22:34 -07:00
Bernardo Meurer f6f41cf740
uboot: 2021.10 -> 2022.01 2022-04-26 15:22:27 -07:00
Bernardo Meurer faf42ffbd0
ubootRaspberryCM4_64bit: init 2022-04-26 15:22:25 -07:00
github-actions[bot] 1dd75b14e7
Merge staging-next into staging 2022-04-25 12:09:44 +00:00
github-actions[bot] 073cad8fd6
Merge master into staging-next 2022-04-25 12:04:02 +00:00
Sandro 33d1f7c0bd
Merge pull request #169575 from Ma27/ghostscript-openjpeg
ghostscript: use system-wide openjpeg
2022-04-25 02:01:24 +02:00
Soner Sayakci 0d92d898ed
platformsh: init at v3.78.0 2022-04-24 08:40:25 +00:00
Maximilian Bosch d9218155d2
ghostscript: use system-wide openjpeg
The following error occurs when using `imagemagickBig`:

    $ ./result/bin/identify sample.jp2
    [1]    699089 IOT instruction (core dumped)  ./result/bin/identify sample.jp2

When looking at the call-trace it seems as if certain symbols, e.g.
`opj_malloc` are mixed up:

    #8  0x00007f78c79ad2f5 in MagickSignalHandler.cold () from /nix/store/bqy80qiw6czqh7vsmmmivwdswp9zzjgl-imagemagick-7.1.0-29/lib/libMagickCore-7.Q16HDRI.so.10
    #9  <signal handler called>
    #10 0x00007f78c5a6095f in opj_malloc () from /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9
    #11 0x00007f78c5a60981 in opj_calloc () from /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9
    #12 0x00007f78c4f48e24 in opj_create_decompress () from /nix/store/qwalb0kjz1p9c4j48qkk6ql47ds2lnhh-openjpeg-2.4.0/lib/libopenjp2.so.7

The `opj_create_decompress()` is called from the `openjpeg`-integration
of `imagemagick` and thus shouldn't affect `ghostscript` at all.
However, `ghostscript` (`libgs.so` to be precise) also exposes e.g.
`opj_malloc`:

    $ objdump -t /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9.55|grep opj_malloc
    0000000000205940 g     F .text	000000000000002b              opj_malloc

Because of that, two incompatible symbols are used in the same process
and thus the `identify`-call breaks because the wrong one is used. To
work around that I decided to use the system-wide openjpeg instead.
I'm not sure why `libgs.so` wants to expose these symbols anyways, but
with that workaround the problem is solved.

Even though it's mentioned that ghostscript's openjpeg is heavily
patched, I think that this is somewhat outdated or at least irrelevant
considering that both ArchLinux[1] and Fedora[2] use the system-wide
`openjpeg` instead.

[1] bafcb5473b/trunk/PKGBUILD (L50)
[2] e4eec13ab6/f/ghostscript.spec (_245)
2022-04-23 00:54:22 +02:00