Commit graph

8113 commits

Author SHA1 Message Date
7c6f434c 0ab21ed9c1
Merge pull request #176498 from ehmry/xscreensaver-perl
xscreensaver: add missing Perl libs
2022-06-06 06:53:05 +00:00
Emery Hemingway 78ecfd54e5 xscreensaver: add missing Perl libs 2022-06-05 22:02:46 -05:00
Guillaume Girol 7548b71138
Merge pull request #171778 from zhaofengli/infnoise-0.3.2
infnoise: unstable-2019-08-12 -> 0.3.2, nixos/infnoise: init
2022-06-05 17:30:34 +00:00
Robert Scott 53573e4866
Merge pull request #176278 from risicle/ris-jar-source-provenance
treewide: set `sourceProvenance` for packages containing downloaded jars
2022-06-05 12:04:38 +01:00
adisbladis 8a970d86ee
Merge pull request #173997 from adisbladis/rkdeveloptool-pine64-init
rkdeveloptool-pine64: init at unstable-2021-09-04
2022-06-05 08:01:58 +08:00
Robert Scott 3b6bc4b69c treewide: set sourceProvenance for packages containing downloaded jars
these are the easily identifiable cases and will not be comprehensive
2022-06-04 19:47:57 +01:00
Rick van Schijndel 446ede8e5c
Merge pull request #174691 from a-m-joseph/pr/atf-set-unfreeIncludeHDCPBlob-master
arm-trusted-firmware: set unfree only if hdcp.bin is used; otherwise delete it before building
2022-06-04 09:35:18 +02:00
PedroHLC ☭ 8b4c4bf34f elk7: 7.16.1 -> 7.17.4 2022-06-03 11:11:06 -04:00
github-actions[bot] 8d36a138eb
Merge master into staging-next 2022-05-30 18:01:09 +00:00
Rick van Schijndel 010f6ee30d
treewide: mark broken for darwin 2022-05-30 13:42:58 +02:00
Adam Joseph 8485bfc9bf arm-trusted-firmware: unfree only if hdcp.bin used; otherwise delete it
The `unfreeIncludeHDCPBlob` parameter was introduced as a result of
this reviewer request:

  https://github.com/NixOS/nixpkgs/issues/148890#issuecomment-1032002903

The default value `unfreeIncludeHDCPBlob?true` causes a change in the
`meta.license` field for all of the subpackages within
`pkgs/misc/arm-trusted-firmware/`, and results in them needing
`NIXPKGS_ALLOW_NONFREE=1`.

For non-Rockchip platforms the file hdcp.bin does not get included in
the output; the blob is for a Synopsys HDCP core that is currently
used only by Rockchip (although other companies could license it from
Synopsys in the future). Therefore on non-Rockchip we can delete
hdcp.bin before building instead of changing the license. This
preserves the ability to build them without NIXPKGS_ALLOW_NONFREE=1.

Let's do that.

Deleting hdcp.bin ensures that we won't be caught by surprise if some
future non-Rockchip Arm CPU licenses the same Synopsys HDCP core that
Rockchip is using.

Use easier-to-follow names for controlling the blob
inclusion/exclusion.  Also, if the blob is believed to be unnecessary,
delete it beforehand so we will know if we were wrong about that belief.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-05-29 16:07:15 -07:00
github-actions[bot] d68aadb952
Merge master into staging-next 2022-05-29 12:01:24 +00:00
Rick van Schijndel c6d61292de
Merge pull request #174762 from K900/embiggening
u-boot: embiggen RPi kernel allocation again, again
2022-05-29 09:42:05 +02:00
github-actions[bot] 5fcd509ac0
Merge master into staging-next 2022-05-29 06:01:21 +00:00
Bobby Rong b7f291c934
Merge pull request #173445 from Infinidoge/update/kitty-themes
kitty-themes: 2022-02-03 -> 2022-05-04
2022-05-29 11:38:50 +08:00
github-actions[bot] c74c0a18ba
Merge master into staging-next 2022-05-29 00:02:55 +00:00
Fabian Affolter 14702f74c0
Merge pull request #175137 from lorenz/hplip-distro-dep
hplip: add missing distro dependency
2022-05-28 21:05:26 +02:00
Lorenz Brun d40f59d7db hplip: add missing distro dependency
This is required by hp-wificonfig, otherwise it crashes.
2022-05-28 16:36:47 +02:00
Martin Weinelt 68b24492ec
Merge pull request #174898 from LeSuisse/cups-2.4.2 2022-05-28 12:47:43 +02:00
Zhaofeng Li d7432b815d infnoise: Also build and install tools 2022-05-27 15:18:45 -07:00
Zhaofeng Li 31cb3f9908 infnoise: Add patch to fix build on aarch64-linux 2022-05-27 15:18:45 -07:00
Zhaofeng Li 6c4bfe583c nixos/infnoise: init 2022-05-27 15:18:43 -07:00
Zhaofeng Li d2aa5ff6e7 infnoise: unstable-2019-08-12 -> 0.3.2 2022-05-27 15:13:13 -07:00
Artturi 60a0871486
Merge pull request #172391 from Artturin/deprecate-stdenv-glibc 2022-05-27 17:56:19 +03:00
Thomas Gerbet c590c23f49 cups: 2.4.1 -> 2.4.2
Fixes CVE-2022-26691.
https://github.com/OpenPrinting/cups/releases/tag/v2.4.2
2022-05-27 14:33:28 +02:00
Artturin c1fffdfffb treewide: change some glibc to stdenv.cc.libc 2022-05-27 05:57:43 +03:00
K900 ff391e0f0d u-boot: embiggen RPi kernel allocation again, again 2022-05-26 19:37:45 +03:00
Sandro f59b7ca34c
Merge pull request #174463 from lockejan/tmux/prefix-highlight 2022-05-26 00:29:41 +02:00
Sandro 8eb7383c5d
Merge pull request #174461 from lockejan/tmux/continuum 2022-05-26 00:28:48 +02:00
Sandro 0f17a93aec
Merge pull request #174464 from lockejan/tmux/resurrect 2022-05-26 00:28:18 +02:00
Artturin 0c4d65b21e treewide: stdenv.glibc -> glibc 2022-05-25 15:51:20 +03:00
Jan Schmitt 7cba3cbc47
tmuxPlugins.prefix-highlight: unstable-2020-03-26 -> unstable-2021-03-30 2022-05-25 12:17:56 +02:00
Jan Schmitt 17c0c51660
tmuxPlugins.resurrect: unstable-2020-09-18 -> unstable-2022-05-01 2022-05-25 12:13:45 +02:00
Jan Schmitt fe4c66fbaf
tmuxPlugins.continuum: unstable-2020-10-16 -> unstable-2022-01-25 2022-05-25 12:07:49 +02:00
R. Ryantm 157035b4d8 betterlockscreen: 4.0.3 -> 4.0.4 2022-05-25 04:52:41 +00:00
adisbladis 4647a8f70a rkdeveloptool-pine64: init at unstable-2021-09-04 2022-05-23 01:13:10 +08:00
github-actions[bot] b833efbcd7
Merge master into staging-next 2022-05-19 18:06:51 +00:00
lom a695081e68 wiki-tui: 0.4.7 -> 0.4.8 2022-05-18 18:32:01 -06:00
Infinidoge f8d8fd7529 kitty-themes: 2022-02-03 -> 2022-05-04 2022-05-17 22:17:38 -04:00
Jan Tojnar d1b77f990f Merge branch 'staging-next' into staging
Conflicts:
	pkgs/applications/networking/browsers/firefox/common.nix between f6c5761935 and a373324120.
2022-05-15 07:08:29 +02:00
github-actions[bot] 7e7fb6332c
Merge master into staging-next 2022-05-14 18:01:09 +00:00
Sergei Trofimovich 4281933727 foomatic-filters: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of
      `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here
2022-05-14 12:12:30 +01:00
github-actions[bot] fe71877bbd
Merge staging-next into staging 2022-05-13 18:03:04 +00:00
github-actions[bot] bcb22e9a7b
Merge master into staging-next 2022-05-13 18:01:23 +00:00
rnhmjoj 74b5bb9050
sc-controller: 0.4.8.6 -> 0.4.8.7 2022-05-13 10:40:38 +02:00
Nick Cao f6c5761935
firefox-unwrapped: fix cross compilation 2022-05-13 13:28:52 +08:00
github-actions[bot] da834a289d
Merge staging-next into staging 2022-05-12 00:02:59 +00:00
Theodore Ni b1e6ccc862
cliscord: fix build on Darwin
Security needs to be added as a buildInput.
2022-05-11 16:51:17 -05:00
github-actions[bot] 7dbfbc2e90
Merge staging-next into staging 2022-05-11 18:10:52 +00:00
Rick van Schijndel d14b6e65ff samsung-unified-linux-driver_4_00_39: drop
Broken since 2018-10-03
2022-05-11 19:23:05 +02:00