Jonathan Ringer 182e07f0d9 Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/development/libraries/webkitgtk/default.nix pkgs/development/python-modules/pylast/default.nix pkgs/development/python-modules/pymavlink/default.nix		2021-12-23 10:16:42 -08:00
..
common.nix	Merge staging-next into staging	2021-12-15 18:01:52 +00:00
env_var_for_system_dir-ff86.patch	firefox: 85.0.2 -> 86.0	2021-02-24 15:06:49 +01:00
fix-build-with-wayland-1.20.patch	firefox: Fix the build with wayland 1.20.0	2021-12-11 18:07:30 +01:00
no-buildconfig-ffx90.patch	firefox: 89.0.2 -> 90.0	2021-07-12 16:47:24 +02:00
no-buildconfig-ffx95.patch	firefox: 94.0.2 -> 95.0	2021-12-08 11:24:19 +01:00
packages.nix	Merge pull request #151384 from r-ryantm/auto-update/firefox-unwrapped	2021-12-20 11:43:25 -08:00
update.nix	firefox/update.nix: Use fingerprint instead of keyid	2021-06-17 00:07:09 +09:00
wrapper.nix	wrapFirefox: fix icon linking for Thunderbird	2021-11-14 13:54:00 +09:00