Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 #89311

Merged

Conversation

@jsravn
Copy link
Contributor

@jsravn jsravn commented Jun 1, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@prusnak
Copy link
Member

@prusnak prusnak commented Jun 1, 2020

This PR does not fit CONTRIBUTING.md

You should backport commit using git cherry-pick -x which makes it very easy to verify the change has been already merged to master first.

Also the PR title should start with [20.03] not [backport].

@jsravn
Copy link
Contributor Author

@jsravn jsravn commented Jun 1, 2020

Sorry! I did not see CONTRIBUTING.md initially. I see now it's sort of hidden in .github. I will update accordingly.

@jsravn jsravn changed the title [backport] firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 [20.03] firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 Jun 1, 2020
@jsravn jsravn force-pushed the backport-firmware-linux-nonfree branch from 39cf476 to 5cd1d38 Jun 1, 2020
@jsravn
Copy link
Contributor Author

@jsravn jsravn commented Jun 1, 2020

Okay, all done.

prusnak
prusnak approved these changes Jun 1, 2020
@jsravn
Copy link
Contributor Author

@jsravn jsravn commented Jun 9, 2020

@prusnak can this be merged?

@prusnak
Copy link
Member

@prusnak prusnak commented Jun 9, 2020

@jsravn I don't have permissions to do so, unfortunately

@jsravn
Copy link
Contributor Author

@jsravn jsravn commented Jun 10, 2020

Ah okay. @fpletz then?

@worldofpeace worldofpeace merged commit f9b261c into NixOS:release-20.03 Jun 18, 2020
16 checks passed
@worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Jun 18, 2020

Thanks for backporting @jsravn

luigy added a commit to luigy/nixpkgs that referenced this issue Jun 7, 2021
cec9f5e9012 Merge remote-tracking branch 'NixOS-nixpkgs-channels/nixos-20.03' into nixos-20.03_local
2b41770 Remove Google Talk Plugin
788764b transmission: patch CVE-2018-10756
7bb2e7e Merge pull request NixOS#90699 from cole-h/sudo
30c703c nixos/sudo: default rule should be first
87cde1c pantheon.elementary-code: 3.4.0 -> 3.4.1
8442ba4 Merge pull request NixOS#89756 from hax404/20.03_jool
52ff653 Merge pull request NixOS#86567 from mmilata/20.03/encrypted-devices-loaof-warning
4b5ed67 Merge pull request NixOS#87249 from martinbaillie/backport-ssm-session-manager-plugin-release-20.03
7ea8a46 Merge pull request NixOS#87807 from mmilata/20.03/samba-4.11.9
50fc221 Merge pull request NixOS#88581 from lourkeur/backport_xpra
f9b261c Merge pull request NixOS#89311 from jsravn/backport-firmware-linux-nonfree
1a11b5e Merge pull request NixOS#89801 from mmilata/20.03/sympa-6.2.56
e429855 Merge pull request NixOS#90213 from OPNA2608/backport-update-palemoon-28.10.0
a99fd45 Merge pull request NixOS#90222 from volth/cental.maven.org-20.03
55ddbd2 Merge pull request NixOS#90677 from erictapen/haskell-geojson-unmark-as-broken
efe40ce Merge pull request NixOS#89763 from worldofpeace/backport-86163-
f70a599 nixos/gnome3: nixos-artwork -> pkgs.nixos-artwork
993d0b3 Merge pull request NixOS#89830 from worldofpeace/pantheon-updates-20.03
73d7516 matrix-synapse: 1.14.0 -> 1.15.1
9e37911 xdg_utils: xdg-open: add $out to PATH
725c4fd google-chrome: add coreutils to PATH
92f1c50 Merge pull request NixOS#90679 from mmilata/20.03/fwupd-cve-2020-10759
80b50f3 fwupd: add patch for CVE-2020-10759
583ccf8 Don't enable nix-bash-completions when using Nix 2.4
bb4fd7e haskellPackages.geojson: Unmark as broken
c5fd298 vlc: 3.0.8 -> 3.0.11 (security)
8056c50 Merge pull request NixOS#90603 from primeos/chromium-backport
243f698 vagrant: 2.2.8 -> 2.2.9
b2a6d2f linuxPackages.wireguard: 1.0.20200520 -> 1.0.20200611
8ab112e riot-desktop: 1.6.4 -> 1.6.5
724d123 riot-web: 1.6.4 -> 1.6.5
564db6b Merge pull request NixOS#90007 from mweinelt/20.03/microcode-intel
c27866c microcodeIntel: 20200609 -> 20200616
dce9ef5 youtube-dl: 2020.06.06 -> 2020.06.16.1
33e9bc8 Merge pull request NixOS#90611 from omniitgmbh/graylog_3.3.1_with_plugins_backport
02b95cf strace-graph: fix strace-graph shebang which points to perl
60da5ed graylogPlugins: Update plugins
70ecf77 graylog: 3.3.0 -> 3.3.1
0d8250a chromium: 83.0.4103.97 -> 83.0.4103.106
b0bfe9b chromium: Build with VA-API but disable it by default
a84b797 pycurl: Exclude flaky multi_timer_test. Fixes NixOS#77304
ae27952 pycurl: Exclude another flaky test. Fixes NixOS#77304
db0200e system-config-printer: Fix ABRT: free(): invalid pointer
d46e037 Merge pull request NixOS#90498 from dotlambda/postfix-3.4.13
4351ace postfix: 3.4.12 -> 3.4.13
41268a3 postfix: 3.4.10 -> 3.4.12
1594eb9 postfix: 3.4.9 -> 3.4.10
927d4e6 Merge pull request NixOS#90064 from aszlig/nixpart0-glibc-fixes
ddeb47c Merge pull request NixOS#89320 from zaninime/sane-airscan-update-20.03
5376727 Merge pull request NixOS#90407 from thiagokokada/release-20.03
10e5f1f intltool: add a backup url for a patch
126fb3a bbswitch: fix build with Linux kernel version >= 5.6.0
daace8a python2Packages.nixpart0/multipath_tools: fixup path to internal libraries
4fa1d54 python2Packages.nixpart0/pyblock: patch for glibc >= 2.28
1ecfb2c python2Packages.nixpart0/parted: patch for glibc >= 2.28
497b215 python2Packages.nixpart0/multipath_tools: patch for glibc >= 2.28
5858bc2 python2Packages.nixpart0/lvm2: patch for glibc >= 2.28
573b24e python2Packages.nixpart0/cryptsetup: patch for glibc >= 2.28
098fdc6 treewide: central.maven.org -> repo1.maven.org
807d383 palemoon: 28.9.3 -> 28.10.0
db31e48 python.pkgs.apsw: 3.30.1-r1 -> 3.32.2-r1
a6e8ffb Merge pull request NixOS#90165 from primeos/signal-desktop-backport
ec7fdd6 Merge pull request NixOS#89920 from mweinelt/20.03/hostapd
b6cda51 poezio: add missing setuptools dependency
158cfa6 Merge pull request NixOS#90167 from zowoq/backport-gh
10ceb8f gitAndTools.gh: 0.9.0 -> 0.10.0
f5e3447 gitAndTools.gh: add github-cli alias
e2f9675 signal-desktop: 1.34.1 -> 1.34.2
f09d743 linux: 5.6.17 -> 5.6.18
adeb94a linux: 5.4.45 -> 5.4.46
5bcdf90 linux: 4.9.226 -> 4.9.227
ff24b8a linux: 4.4.226 -> 4.4.227
d8a5c62 linux: 4.19.127 -> 4.19.128
a808627 linux: 4.14.183 -> 4.14.184
8b071be Merge pull request NixOS#90102 from flokli/20.03-gitlab-12.10.11
8c521cb Merge pull request NixOS#89800 from andir/20.03/firefox
3748b5f gitlab: 12.10.9 -> 12.10.11
0094820 hostapd: add hexa as maintainer
3f31c0d nixos/sympa: fix PATH_INFO splitting for sympa-6.2.56
8946799 slurm: bugifx, add su/echo paths
118e07c slurm: 19.05.5.1 -> 19.05.7.1
d3bfabe Merge pull request NixOS#89838 from omniitgmbh/20.03_graylog_3.3.0_with_plugins
e0c7e1f chromium{Beta,Dev}: Fix the builds
48f3b97 chromiumBeta: Fix the configuration phase
159c6a7 chromiumDev: Fix the configuration phase
57f7f17 microcodeIntel: 20200520 -> 20200609
1763fe3 microcodeIntel: 20200508 → 20200520
123d831 mumble: 1.3.0 -> 1.3.1 (NixOS#89988)
d6c8902 Merge pull request NixOS#89560 from primeos/chromium-backport
fd516cb Merge branch 'staging-20.03' into release-20.03
304183d Merge pull request NixOS#89808 from lourkeur/backport_89570
fc382da hostapd: apply patches for CVE-2020-12695
92d5b1b hydra-unstable: 2020-04-16 -> 2020-06-01
d68215d Merge NixOS#89029: sqlite: 3.30.1 -> 3.32.2 (security)
03da878 gnutls: 3.6.13 -> 3.6.14
ca6e453 coq_8_11: 8.11.1 → 8.11.2
7224539 Merge pull request NixOS#89702 from OPNA2608/backport-update-palemoon
f6f6d50 linux: 5.6.16 -> 5.6.17
a91a07a linux: 5.4.44 -> 5.4.45
a83164c linux: 4.19.126 -> 4.19.127
974353b graylogPlugins: Update and add plugins
b845898 graylog: 3.2.5 -> 3.3.0
06e882b gcc: Clean up configure flags
bf57132 gcc: Fix MinGW exception handling so Rust works
034c9b1 pyxdg: fix missing class field Type
b3a5802 pantheon.switchboard-plug-sound: 2.2.3 -> 2.2.4
003af9c pantheon.switchboard-plug-security-privacy: 2.2.3 -> 2.2.4
5421f40 pantheon.switchboard-plug-printers: 2.1.8 -> 2.1.9
d8cac26 pantheon.switchboard-plug-power: 2.4.1 -> 2.4.2
e40d5b5 pantheon.switchboard-plug-notifications: 2.1.6 -> 2.1.7
68d7569 pantheon.switchboard-plug-network: 2.3.0 -> 2.3.1
489245e pantheon.switchboard-plug-mouse-touchpad: 2.4.1 -> 2.4.2
d3805ad pantheon.switchboard-plug-display: 2.2.1 -> 2.2.2
34ce395 pantheon.switchboard-plug-datetime: 2.1.7 -> 2.1.9
7780479 pantheon.switchboard-plug-bluetooth: 2.3.1 -> 2.3.2
df72656 pantheon.switchboard-plug-about: 2.6.2 -> 2.6.3
ac21fd7 pantheon.elementary-onboarding: 1.2.0 -> 1.2.1
ae8c62c pantheon.elementary-shortcut-overlay: 1.1.1 -> 1.1.2
4a25ae5 pantheon.wingpanel-applications-menu: 2.7.0 -> 2.7.1
0d8445d pantheon.wingpanel-indicator-network: 2.2.3 -> 2.2.4
8f24062 pantheon.pantheon-agent-polkit: 1.0.1 -> 1.0.2
85146f0 pantheon.elementary-greeter: 5.0.3 -> 5.0.4
adca4a3 pantheon.sideload: 1.1.0 -> 1.1.1
d71bdb2 pantheon.elementary-files: 4.4.2 -> 4.4.3
adacfd0 pantheon.elementary-calendar: 5.0.4 -> 5.0.5
3c96a13 pantheon.elementary-icon-theme: 5.3.0 -> 5.3.1
044c9a4 pantheon.appcenter: 3.3.0 -> 3.4.0
c0c768b pantheon.gala: 3.3.1 -> 3.3.2
c064cd0 pantheon.wingpanel-applications-menu: 2.6.0 -> 2.7.0
3b4dbf3 pantheon.granite: 5.3.1 -> 5.4.0
016f42b pantheon.elementary-icon-theme: 5.2.0 -> 5.3.0
9fdefdc pantheon.switchboard: 2.3.9 -> 2.4.0
2678e4f pantheon.appcenter: 3.2.4 -> 3.3.0
70717a3 nix: 2.3.6 -> 2.3.6
4a644cc sympa: 6.2.54 -> 6.2.56
fb93299 firefox-bin: 76.0 -> 77.0.1
f7446a5 firefox-esr-68: 68.8.0esr -> 68.9.0esr
03be5f3 firefox: 76.0.1 -> 77.0.1
e3e66c8 rust-cbindgen_0_14_1: init
582b4bb nss_3_52: 3.52.0 -> 3.52.1
b119c09 flake.nix: Remove edition field
8759f46 sane-airscan: 0.99.0 -> 0.99.3
4340dd7 nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper
b6042f5 moosefs: fix datapath for mfscgiserv
82dc55e atlassian-crowd: 3.4.5 -> 4.0.2
e2bb73c Merge pull request NixOS#89681 from mweinelt/20.03/borgbackup
b2bd937 nixos/pantheon: install nixos wallpaper
489ebe4 nixos/gnome3: install nixos wallpapers
20bfce5 nixos/lightdm: change background type to path
392b8bc nixos-artwork: add file path attributes
90057c5 jool: 4.0.5 -> 4.0.9
f8463ef cargo-make: 0.30.8 -> 0.31.0
7a7fcac dlib: 19.19 -> 19.20
cc28f9c i3status-rust: 0.13.1 -> 0.14.0
3154bb9 roundcube: 1.4.5 -> 1.4.6
11c84a9 boot: fix order of arguments for `hasPrefix` (NixOS#89751)
0c2ddc1 epkowa: fix parsing of interpreters (NixOS#82909) (NixOS#89506)
a53ed23 Merge pull request NixOS#89692 from grahamc/fwupd-backport
6956305 borgbackup: 1.1.11 -> 1.1.13
af29475 palemoon: 28.9.1 -> 28.9.3
a2add30 fwupd: 1.3.8 → 1.3.9
83b5900 fwupd: 1.3.7 → 1.3.8
1aa5271 Merge pull request NixOS#89260 from schmittlauch/cawbird1.1.0-backport
e33969c chromiumBeta: Fix the source hash
c136fd3 Merge pull request NixOS#89370 from toonn/release-20.03
f277096 riot-desktop: 1.6.3 -> 1.6.4
33d51b7 riot-web: 1.6.3 -> 1.6.4
a0466d5 mautrix-whatsapp: 2020-06-01 -> 0.1.1
29c0151 Merge NixOS#89474: thunderbird*: 68.8.1 -> 68.9.0 (security)
e1ff9d3 youtube-dl: 2020.05.29 -> 2020.06.06
82ef74d xpra: adjust patches
79ac325 xpra: fix NixOS#41106
cd6ea1d xpra: fix NixOS#85694
b96198c chromium: 83.0.4103.61 -> 83.0.4103.97
fdfd5ab linux: 5.6.15 -> 5.6.16
114bc19 linux: 5.4.43 -> 5.4.44
e8f0687 linux: 4.9.225 -> 4.9.226
9ecbc8d linux: 4.4.225 -> 4.4.226
1f96786 linux: 4.19.125 -> 4.19.126
6524079 linux: 4.14.182 -> 4.14.183
1f54141 atlassian-confluence: 7.5.0 -> 7.5.1
6797081 atlassian-jira: 8.8.0 -> 8.9.0
58f884c Merge pull request NixOS#89435 from flokli/20.03/gitlab-12.10.9
6939378 Merge staging-20.03 into release-20.03
ea2d173 riot-desktop: 1.6.2 -> 1.6.3
bad756a riot-web: 1.6.2 -> 1.6.3
7ec663f Merge pull request NixOS#89458 from peterhoeg/bp/qqc2-desktop-style
1ce9a00 kdeFrameworks.qqc2-desktop-style: init at 5.68
2947a53 gitlab: 12.10.8 -> 12.10.9
0610639 gitlab: 12.10.6 -> 12.10.8
6bd20ee gitaly: fix gitlab-shell-config path patching
d181fdf gitaly: revert a commit that broke config loading
3069def nixos/gitlab: use new structure.sql
2968e6f gitlab: increase webpack memory limit
3a0a5e5 gitlab: 12.8.10 -> 12.10.6
05a32d8 Merge pull request NixOS#89422 from Frostman/20.03-grafana-6.7.4
ca7a4d1 grafana: 6.7.1 -> 6.7.4
08c346a Merge pull request NixOS#89398 from ehmry/tor-browser
5c5e386 atlassian-confluence: 7.4.0 -> 7.5.0
28d19fa atlassian-confluence: 7.3.4 -> 7.4.0
7532268 tor-browser-bundle-bin: 9.0.9 -> 9.5
ede1184 jetbrains: update
6197877 roundcube: 1.4.4 -> 1.4.5
be20f1e Merge pull request NixOS#89148 from zowoq/backport-gh
4606ae3 wire-desktop: mac 3.17.3666 -> 3.18.3728
bf8b946 wire-desktop: linux 3.17.2924 -> 3.18.2925
79d7841 mautrix-whatsapp: 2020-05-29 -> 2020-06-01
20fcae3 Merge pull request NixOS#89336 from Frostman/docker-backport-19.03.11
17a6106 go-bindata: use fetchFromGitHub
6567ff5 colormake: use fetchFromGitHub
4aad3f5 docker: 19.03.10 -> 19.03.11
33973b7 docker: 19.03.9 -> 19.03.10
1e1b0ac docker: 19.03.8 -> 19.03.9
52cc587 docker: use installShellFiles
7bf0d1c docker: add git to extraPath
45bfb96 dblatex: add pdflscape as a dependency
5cd1d38 firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19
4a2da01 Merge pull request NixOS#88550 from prusnak/electron-20.03
bdee067 alacritty: 0.4.2 -> 0.4.3
7a21e9f mautrix-whatsapp: 2020-05-27 -> 2020-05-29
d6d6a87 Merge branch 'staging-20.03' into release-20.03
36641b2 ip2unix: 2.1.2 -> 2.1.3
4a7821a linuxPackages.wireguard: 1.0.20200506 -> 1.0.20200520
44c1be5 cawbird: 1.0.5 -> 1.1.0
aca160e docker-compose: fix zsh completion
dc26834 matrix-synapse: 1.13.0 -> 1.14.0
7907623 python27Packages.authlib: 0.13 -> 0.14.3
3c90d4c gitea: 1.11.5 -> 1.11.6
5fc6f8c glibc: patch CVE-2020-1752
5150040 python38: 3.8.2 -> 3.8.3
c570247 python38: 3.8.1 -> 3.8.2
7b1fab7 Merge release-20.03 into staging-20.03
5a46292 buildRustCrate: Replace hyphen with underscore in env variables (NixOS#88054)
acba0f1 nix-daemon module: do not rely on the daemon being running (NixOS#89191)
d124852 Merge pull request NixOS#89149 from zowoq/backport-ffmpeg
adad002 Merge pull request NixOS#88878 from mweinelt/20.03/activemq
e478626 gitAndTools.gh: 0.8.0 -> 0.9.0
1a1018d ffmpeg-full: 4.2.2 -> 4.2.3
0fbd580 ffmpeg_4: 4.2.2 -> 4.2.3
e696f11 ffmpeg_2_8: 2.8.15 -> 2.8.16
3f4ce08 activemq: 5.14.5 -> 5.15.12
a99bb40 electron_8: 8.0.0 -> 8.3.0
b3c5bba electron_7: 7.1.10 -> 7.3.0
9a5239f electron_6: 6.1.7 -> 6.1.12
8830690 samba: 4.11.5 -> 4.11.9
fc9ca52 ssm-session-manager-plugin: init at 1.1.61.0
4a41762 silence warning from NixOS#63103 in encrypted-devices.nix

git-subtree-dir: dep/nixpkgs-channels
git-subtree-split: cec9f5e9012eb315e7005f06ed7ea737425ad14a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants