Update dependencies
This commit is contained in:
parent
6bbce6a263
commit
c09280d19e
2 changed files with 9 additions and 68 deletions
18
flake.lock
generated
18
flake.lock
generated
|
@ -45,11 +45,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703659301,
|
"lastModified": 1703934749,
|
||||||
"narHash": "sha256-EjtTQwjRmf74fMB2IJJGoKr/2xd1wakK3TF70eoUmu4=",
|
"narHash": "sha256-ILmmU1U9BfLRPrlaPePrxT/xfMOaalqCdczaj1pcPaI=",
|
||||||
"owner": "accentor",
|
"owner": "accentor",
|
||||||
"repo": "api",
|
"repo": "api",
|
||||||
"rev": "9a264b21efef8b69b0c71b743396c37ee433dbb8",
|
"rev": "b45b3d7181875a2fc2f61b66926d3ffbbe5ebd97",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -458,11 +458,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703438236,
|
"lastModified": 1703637592,
|
||||||
"narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=",
|
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b",
|
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -536,11 +536,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703925859,
|
"lastModified": 1703934776,
|
||||||
"narHash": "sha256-yOjMkTxFd0WAk7Ay8kc+JzCK9hnbPixIVJECGxpp8w8=",
|
"narHash": "sha256-/JTDTXcoxxEmoZWpvkfEfcp98K7ZAAOEj2nIXYMDB1w=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "a41eea0f67c4bcc0c735ccb7e4f1b474a2527e3b",
|
"rev": "ab31dcd1445522e950a2ce0ae0dc4cbdc32a20fc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,59 +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 ed8ed30327816a..a859efd3fae70f 100644
|
|
||||||
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
|
||||||
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
+, fetchpatch
|
|
||||||
, makeWrapper
|
|
||||||
, makeDesktopItem
|
|
||||||
, copyDesktopItems
|
|
||||||
@@ -19,20 +20,30 @@
|
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
|
||||||
pname = "teams-for-linux";
|
|
||||||
- version = "1.3.22";
|
|
||||||
+ version = "1.4.1";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "IsmaelMartinez";
|
|
||||||
repo = "teams-for-linux";
|
|
||||||
rev = "v${finalAttrs.version}";
|
|
||||||
- hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A=";
|
|
||||||
+ hash = "sha256-1URS9VPqV58p8RUA47j8sdqYqps1Ruo0aqdZXedvPX8=";
|
|
||||||
};
|
|
||||||
|
|
||||||
offlineCache = fetchYarnDeps {
|
|
||||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
|
||||||
- hash = "sha256-ydhJXAvz3k6GwpnSL6brl9xFpb+ooi8Am89TkcE00hc=";
|
|
||||||
+ hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
+ patches = [
|
|
||||||
+ # remove when IsmaelMartinez/teams-for-linux#1058 is merged
|
|
||||||
+ (fetchpatch {
|
|
||||||
+ name = "teams-for-linux-fix-version.patch";
|
|
||||||
+ url = "https://github.com/IsmaelMartinez/teams-for-linux/commit/1d14947eef35c6a2e0cbdfcce405820f8dd36c68.diff";
|
|
||||||
+ hash = "sha256-kj2jEAqgZ0frUw85hY23mFYFcXz95z/WQSDymsheDfg=";
|
|
||||||
+ })
|
|
||||||
+ ];
|
|
||||||
+
|
|
||||||
+
|
|
||||||
nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
|
||||||
index 6dc814930760ff..1e0345a0ac263a 100644
|
|
||||||
--- a/pkgs/top-level/all-packages.nix
|
|
||||||
+++ b/pkgs/top-level/all-packages.nix
|
|
||||||
@@ -35678,7 +35678,7 @@ with pkgs;
|
|
||||||
teams = callPackage ../applications/networking/instant-messengers/teams { };
|
|
||||||
|
|
||||||
teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {
|
|
||||||
- electron = electron_27;
|
|
||||||
+ electron = electron_28;
|
|
||||||
};
|
|
||||||
|
|
||||||
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
|
|
Loading…
Add table
Add a link
Reference in a new issue