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.

Sign up for GitHub

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

Jump to bottom

Discord dependencies #106061

Closed
wants to merge 3,293 commits into from
Closed

Discord dependencies #106061

wants to merge 3,293 commits into from

Conversation

shdpl
Copy link
Contributor

@shdpl shdpl commented Dec 6, 2020

Included missing dependencies of libdrm and mesa to the 0.0.13 version of discord

Motivation for this change

Failure to run with missing shared libraries

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.

vcunat and others added 30 commits September 26, 2020 09:53
@vcunat
Merge NixOS#98684: brotli: fix patch URL
9f5ba92 
(cherry picked from commit 779ad18)
@primeos
signal-desktop: 1.36.2 -> 1.36.3
bef364c 
(cherry picked from commit 2e68440)
@primeos
llvm_11: Copy all files from llvmPackages_10
5662a6f 
This is simply the result of:
cp -r pkgs/development/compilers/llvm/10 pkgs/development/compilers/llvm/11/

(cherry picked from commit 28f2797)
@ggreif @primeos
llvm_11: init at 11.0.0rc1
dac4a48 
http://lists.llvm.org/pipermail/release-testers/2020-July/001305.html

TODO: Enable Polly.

Co-authored-by: conferno <conferno@camfex.cz>
(cherry picked from commit 0a8334d)
@ggreif @primeos
llvm_11: 11.0.0rc1 -> 11.0.0rc2
3768fde 
http://lists.llvm.org/pipermail/release-testers/2020-August/001321.html
(cherry picked from commit df267a4)
@primeos
chromiumDev: Drop nix_plugin_paths_68.patch
bed75af 
Ok, so I was about to update the patch (didn't apply anymore) when I
also started looking at it's usage and realized that
NIX_CHROMIUM_PLUGIN_PATH_ (and other substrings) only appears in the
patch itself (i.e. it seemed like we don't need this patch anymore).

Turns out that we have this patch since 2014 (1b84fbf) and it was
only ever used for NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE (and from the log
it isn't clear if/when or how well that worked). But in 2019 that last
usage got removed (545d58a) so we should be able to safely drop this
patch now :) \o/

(I just wanted to note that as it seemed somewhat of a funny story :D
But there is of course nothing wrong with it.)
Git history (git log --oneline -S NIX_CHROMIUM_PLUGIN_PATH_):
7205bd6 ungoogled-chromium: init at 81.0.4044.92-2
545d58a chromium: fix widevine
cd3283f chromium: 67.0.3396.99 -> 68.0.3440.75
72d7b5d chromium: fix nix_plugin_paths for 68+
7a3a16d chromium: Remove plugin paths patch for version 50
79d18eb chromium: Update dev channel to v52.0.2743.10
c7a3645 chromium: Remove stuff for versions <= v51
8b97ca2 chromium: Update all channels to latest versions
b9093f1 chromium: Updates, fixes NixOS#11492
471cdd1 chromium: Update beta and dev channels.
5c6aa39 chromium: Cleanup old patch and update stable
af54ddf chromium: Drop plugin_paths patch for old versions.
6a8afa4 chromium: Fix plugin_paths patch for version 44.
0aad4b7 chromium: Update all channels to latest versions.
1b84fbf chromium: Allow env vars for passing plugin paths.

(cherry picked from commit 2213c46)
@primeos
chromiumDev: Drop the optional VA-API patches
ef889f4 
I didn't look into this yet but IIRC M86 will finally have a flag for
Linux to enable VA-API. So we shouldn't need
enable-video-acceleration-on-linux.patch anymore.

But we likely need to update enable-vdpau-support-for-nvidia.patch
when/before M86 hits the stable channel if we want to keep VDPAU
support.

(cherry picked from commit bf0e13a)
@primeos
chromiumDev: Fix "patchShebangs ."
f6a84a2 
Note: The following might also need to be updated:
substituteStream(): WARNING: pattern '/usr/share/xcb' doesn't match anything in file 'ui/gfx/x/BUILD.gn'

(cherry picked from commit 8815c9e)
@primeos
chromiumBeta: Fix the build by using LLVM 11
fdb4b8f 
We'll need a working build of Chromium M86 for NixOS 20.03 to provide
security updates for 30 days after the release of 20.09.
@primeos
Merge pull request NixOS#98844 from primeos/signal-desktop-backport
c8561e5 
[20.03] signal-desktop: 1.36.2 -> 1.36.3
@vcunat
Merge NixOS#98628: thunderbird*: 78.2.2 -> 78.3.1 (security)
360e2af 
(cherry picked from commit 4212f71)
Briefly re-tested atop 20.03.
@primeos
Merge pull request NixOS#98856 from primeos/chromium-backport
d110708 
[20.03] Backport LLVM 11 to build Chromium M86
@vcunat
Merge branch 'staging-20.03' into release-20.03
16f0e6b 
Only a few thousand aarch64 builds are missing on Hydra ATM.
@Ma27
Merge pull request NixOS#98332 from Ma27/nextcloud-20.03
a6f277f 
[20.03]  nextcloud: 17.0.6 -> 17.0.9, 18.0.7 -> 18.0.9, 19.0.1 -> 19.0.3
@andir
nixos/security/wrapper: ensure the tmpfs is not world writeable
ad246fb 
The /run/wrapper directory is a tmpfs. Unfortunately, it's mounted with
its root directory has the standard (for tmpfs) mode: 1777 (world writeable,
sticky -- the standard mode of shared temporary directories). This means that
every user can create new files and subdirectories there, but can't
move/delete/rename files that belong to other users.
@NeQuissimus
linux: 4.19.147 -> 4.19.148
c9fb177
@NeQuissimus
linux: 5.4.67 -> 5.4.68
f646148
@Ma27 @asbachb
roundcube: 1.4.8 -> 1.4.9
6b80a3d 
https://github.com/roundcube/roundcubemail/releases/tag/1.4.9
(cherry picked from commit f09ae7e)
(cherry picked from commit f8bd03c)
graylog: 3.3.4 -> 3.3.6
5accfcf 
Bumps Graylog and integration plugins to version 3.3.6.
Fixes wrong description of aggregates plugin.

(cherry picked from commit dee78b7)
@Ma27
Merge pull request NixOS#99048 from asbachb/update/roundcube-20.03
629fe7b 
[20.03] roundcube: 1.4.8 -> 1.4.9
@Ma27
Merge pull request NixOS#99081 from fadenb/graylog_3.3.6_20.03
414eedc 
[20.03] graylog: 3.3.4 -> 3.3.6
@danieldk
Merge pull request NixOS#98483 from danieldk/freeoffice-979-20.03
b4db68f 
[20.03] Update SoftMaker Office/FreeOffice
@NeQuissimus
Merge pull request NixOS#99270 from NeQuissimus/linux_5_4_69
b8a2127 
linux: 5.4.68 -> 5.4.69
(cherry picked from commit de6f754)
@NeQuissimus
Merge pull request NixOS#99269 from NeQuissimus/linux_4_4_238
6c822ca 
linux: 4.4.237 -> 4.4.238
(cherry picked from commit ea11b55)
@NeQuissimus
Merge pull request NixOS#99267 from NeQuissimus/linux_4_19_149
6126295 
linux: 4.19.148 -> 4.19.149
(cherry picked from commit b2a80be)
@NeQuissimus
Merge pull request NixOS#99266 from NeQuissimus/linux_4_14_200
e6810a0 
linux: 4.14.199 -> 4.14.200
(cherry picked from commit 2f177a2)
@Ma27
element-desktop: 1.7.7 -> 1.7.8
151e1aa 
(cherry picked from commit 0bf368d)
@Ma27
element-web: 1.7.7 -> 1.7.8
b7b36a2 
(cherry picked from commit f10049c)
@NeQuissimus
linux: 4.9.237 -> 4.9.238
b2d463f
@etu @Ma27
php74: 7.4.8 -> 7.4.11
960c3fc 
https://www.php.net/ChangeLog-7.php#7.4.9
https://www.php.net/ChangeLog-7.php#7.4.10
https://www.php.net/ChangeLog-7.php#7.4.11
(cherry picked from commit a792db6)
(cherry picked from commit 07c6f1f)
@peti
Copy link
Member

peti commented Dec 6, 2020

3000+ commits? This PR is screwed up. You probably didn't use master in your local git repository.

@peti peti closed this Dec 6, 2020
@shdpl shdpl deleted the discord-dependencies branch December 8, 2020 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisbladis adisbladis Awaiting requested review from adisbladis

@alyssais alyssais Awaiting requested review from alyssais alyssais is a code owner

@andir andir Awaiting requested review from andir

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@edolstra edolstra Awaiting requested review from edolstra

@edwtjo edwtjo Awaiting requested review from edwtjo edwtjo is a code owner

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@FRidh FRidh Awaiting requested review from FRidh

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@jonringer jonringer Awaiting requested review from jonringer

@jtojnar jtojnar Awaiting requested review from jtojnar jtojnar is a code owner

@kalbasit kalbasit Awaiting requested review from kalbasit kalbasit is a code owner

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@mmahut mmahut Awaiting requested review from mmahut mmahut is a code owner

@nbp nbp Awaiting requested review from nbp

@peti peti Awaiting requested review from peti peti is a code owner

@Profpatsch Profpatsch Awaiting requested review from Profpatsch Profpatsch is a code owner

@RaghavSood RaghavSood Awaiting requested review from RaghavSood RaghavSood is a code owner

@roberth roberth Awaiting requested review from roberth roberth is a code owner

@stigtsp stigtsp Awaiting requested review from stigtsp stigtsp is a code owner

@teto teto Awaiting requested review from teto teto is a code owner

@tfc tfc Awaiting requested review from tfc tfc is a code owner

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@WilliButz WilliButz Awaiting requested review from WilliButz

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: emacs 6.topic: fetch 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: lua 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: steam 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation 8.has: module (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet