-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge staging-next-24.05 into staging-24.05
- Loading branch information
Showing
16 changed files
with
725 additions
and
403 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,4 +22,4 @@ foldl | |
}; | ||
}) | ||
{ } | ||
[ 27 28 29 ] | ||
[ 27 28 29 30 ] |
8 changes: 4 additions & 4 deletions
8
pkgs/applications/networking/instant-messengers/element/pin.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
{ | ||
"version" = "1.11.77"; | ||
"version" = "1.11.79"; | ||
"hashes" = { | ||
"desktopSrcHash" = "sha256-y7cmTSkNzA4aNY7z9sjgyIquTPVvl+nH7BHUx/2nJ5A="; | ||
"desktopSrcHash" = "sha256-w9JWrStxmiiffu8kKVxM5h8Frxig7v4Vul3YwTnJias="; | ||
"desktopYarnHash" = "0fwkdrfhfl6knvx552q2lpp5pd54qbzkm4kx6jvcrdwjk3x4cgqd"; | ||
"webSrcHash" = "sha256-IeBuLlcorsHZ78P6h5LVCCGHauqzwwm2Lc9B07su86Y="; | ||
"webYarnHash" = "0nm70m37kqkb959vi69r8zidsh25nzgn1550yl46pzihzbiqm8nx"; | ||
"webSrcHash" = "sha256-rla55a0SgeWddXpgaDfsvPcL00NP4DbMDgtc25TM4dw="; | ||
"webYarnHash" = "084nm85y2fmzi27i0050hnxa4m2bqcbl7fn33zd1yini8dwr2n7s"; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
License issues: | ||
Date: Mon, 10 Dec 2007 19:55:16 -0500 | ||
From: TeamSpeak Sales <sales@tritoncia.com> | ||
To: 'Marc Weber' <marco-oweber@gmx.de> | ||
Subject: RE: teamspeak on nix? | ||
|
||
Yes, that would be fine. As long as you are not renting servers or selling | ||
TeamSpeak then you are more than welcome to distribute it. | ||
|
||
Thank you, | ||
|
||
TeamSpeak Sales Team | ||
________________________________ | ||
e-Mail: sales@tritoncia.com | ||
TeamSpeak: http://www.TeamSpeak.com | ||
Account Login: https://sales.TritonCIA.com/users | ||
|
||
|
||
|
||
-----Original Message----- | ||
From: Marc Weber [mailto:marco-oweber@gmx.de] | ||
Sent: Monday, December 10, 2007 5:03 PM | ||
To: sales@tritoncia.com | ||
Subject: teamspeak on nix? | ||
|
||
Hello, | ||
|
||
nix is very young software distribution system (http://nix.cs.uu.nl/) | ||
I'd like to ask wether you permit us to add teamspeak (server/ client?) | ||
|
||
Sincerly | ||
Marc Weber (small nix contributor) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.