Update dependencies
This commit is contained in:
parent
0dd5fadc57
commit
c7d29abdf7
5 changed files with 54 additions and 66 deletions
|
@ -1,26 +0,0 @@
|
|||
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
||||
index 2ff8a8d81a89cc..5d24459f274f73 100644
|
||||
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
||||
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
||||
@@ -19,18 +19,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
- version = "1.3.18";
|
||||
+ version = "1.3.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
- hash = "sha256-evOwjHUmeGw8AUpXSig8zVW2cpJbWkNTH/RUuNipFsQ=";
|
||||
+ hash = "sha256-+n26VTNRymPdzMbSz8AZsQ73xOHizOFAstw6toKfZQM=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
- hash = "sha256-tMC8/qHYli7+OTdxVWRDEyCNzrkYA+zKlHJXlTsl+W0=";
|
||||
+ hash = "sha256-SxUdTzk8WngkKwT05U8HJsK8+8ezcJWdiT/ettxpeEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
|
14
patches/268027.patch
Normal file
14
patches/268027.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
|
||||
index 1a6f9c784cf675..6d51b51b215d43 100644
|
||||
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
|
||||
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
|
||||
@@ -57,7 +57,8 @@
|
||||
# Raise an error if two packages are installed with the same name
|
||||
# TODO: For cross we probably need a different PYTHONPATH, or not
|
||||
# add the runtime deps until after buildPhase.
|
||||
-, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
|
||||
+# FIXME: disabled for Python 2 because broken
|
||||
+, catchConflicts ? false
|
||||
|
||||
# Additional arguments to pass to the makeWrapper function, which wraps
|
||||
# generated binaries.
|
Loading…
Add table
Add a link
Reference in a new issue