Commit graph

8093 commits

Author SHA1 Message Date
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
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
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
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
Artturi 60a0871486
Merge pull request #172391 from Artturin/deprecate-stdenv-glibc 2022-05-27 17:56:19 +03: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
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
github-actions[bot] 2282e994f2
Merge staging-next into staging 2022-05-10 00:02:52 +00:00
Rick van Schijndel 081d4ccd71
Merge pull request #170705 from jansol/xow
xow: 0.5 -> unstable-2022-04-24
2022-05-09 21:24:43 +02:00
github-actions[bot] 629adb097a
Merge staging-next into staging 2022-05-09 18:01:59 +00:00
Sandro 7814586dfa
Merge pull request #172049 from zhaofengli/uboot-riscv64-zicsr
ubootQemuRiscv64Smode: Fix build with binutils 2.38
2022-05-09 14:58:51 +02:00
Adam Joseph ce9122d1e8 pressureaudio: remove autoreconfHook to fix build for ZHF
pressureaudio's nix expression uses `src = pulseaudio.src`, so when
pulseaudio switched over to meson an dropped autoreconfHook the same
should have been done here as well.
2022-05-09 04:15:19 -07:00
github-actions[bot] 31938a3f5c
Merge staging-next into staging 2022-05-09 00:03:28 +00:00
github-actions[bot] f39e774f11
Merge master into staging-next 2022-05-09 00:02:27 +00:00
Sandro fd9aa19396
Merge pull request #171953 from Artturin/netcatbsd
netcat-openbsd: init at 1.218-5
2022-05-08 23:59:19 +02:00
Zhaofeng Li 34724f221e ubootQemuRiscv64Smode: Fix build with binutils 2.38 2022-05-08 02:46:32 -07:00
Joel 194f81efa1
rich-cli: 1.7.0 -> 1.8.0 2022-05-08 13:21:08 +10:00
Artturin 51838e184e flashfocus: use make it possible to use nc_flash_window
it is faster than flash_window
it needs netcat-openbsd
2022-05-07 17:10:22 +03:00
github-actions[bot] ff5c4d3404
Merge master into staging-next 2022-05-06 06:01:36 +00:00
Bernardo Meurer e6b94ad07e
Merge pull request #171602 from malob/treewide-mainProgram
treewide: add meta.mainProgram to many packages
2022-05-05 18:16:09 -07:00
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
Malo Bourgon 16e15fa68f treewide: add meta.mainProgram to many packages 2022-05-04 18:08:19 -07: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