darkkirb/nix-packages
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into visionfive2-linux

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2023-03-02 17:01:27 +01:00 committed by GitHub
commit 177e70b182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 65 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
akkoma/source.json
View file

@ -1,9 +1,9 @@
{
"url": "https://akkoma.dev/AkkomaGang/akkoma.git",
"rev": "f92484fd01681a4506320f3eb008e33c6c35f31a",
"date": "2023-02-11T11:19:33+00:00",
"path": "/nix/store/klgsxf50ricby2qlm2sr0izaxzr479z5-akkoma",
"sha256": "18n4v8ljdy4ydpgr395d5x40xrj1g7iwq000s1hvvz231ay5sdvb",
"rev": "45a11aa20ff9dd1909ec5bee54abcafbf50f4c6f",
"date": "2023-02-26T22:12:31+00:00",
"path": "/nix/store/3795087ic182ps0m83an5w9v883nqjvb-akkoma",
"sha256": "1y318qh5jmjhkbn2d2jpv7s4ajbfmam9b7ccgm74kdrjk31q15jr",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

18
flake.lock
View file

@ -11,11 +11,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1676104934,
"narHash": "sha256-bFzHDHiG5Uwopu/dgje9WNt/KDcxyVinK/k0SYIBtGw=",
"lastModified": 1676581287,
"narHash": "sha256-a/6ClchROZ5PoLz0WK42mkAkUtJlMDbe5QyyZZ7bomc=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "863f8dcca3efce87a29853f6c842f85de594019e",
"rev": "0bb3d001365a5d75947a7a713dfd06307b3934d4",
"type": "github"
},
"original": {
@ -89,11 +89,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
@ -136,11 +136,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1676138783,
"narHash": "sha256-BMgq0qr7hkTcOQfkFORNrO/7jROcx3mJL5mFWP2dIWw=",
"lastModified": 1677746272,
"narHash": "sha256-4raJuGYuBiZ2h+vl71i1itduZ5OLnXbipslPeGzOLds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f831445c5d645fb37027a1fbfd8548f5fb490bb6",
"rev": "a87b99a3c708dc91d2a7149fa28302aa0fae8c84",
"type": "github"
},
"original": {

2
hydra/jobsets.nix
View file

@ -5,7 +5,7 @@
pkgs = import nixpkgs {};
prs = builtins.fromJSON (builtins.readFile prsJSON);
systems = ["x86_64-linux" "aarch64-linux" "riscv64-linux"];
nixpkgs_version = ["master" "nixos-22.05"];
nixpkgs_version = ["master"];
mkJobsets = system: version:
(pkgs.lib.mapAttrs' (
num: info: {

2
matrix/matrix-media-repo/default.nix
View file

@ -35,7 +35,7 @@ in
description = "Matrix media repository with multi-domain in mind.";
license = lib.licenses.mit;
};
passthru.updateScript = writeScript "update-matrix-media-repo" ''
passthru.updateScript' = writeScript "update-matrix-media-repo" ''
${../../scripts/update-git.sh} "https://github.com/turt2live/matrix-media-repo" matrix/matrix-media-repo/source.json
if [ "$(git diff -- matrix/matrix-media-repo/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')

43
matrix/mautrix-discord/no-category-spaces.patch
View file

@ -1,48 +1,48 @@
diff --git a/database/portal.go b/database/portal.go
index d8ce90d..7c2d431 100644
index ba6bccd..2feebba 100644
--- a/database/portal.go
+++ b/database/portal.go
@@ -150,13 +150,13 @@ func (p *Portal) Scan(row dbutil.Scannable) *Portal {
@@ -159,13 +159,13 @@ func (p *Portal) Scan(row dbutil.Scannable) *Portal {
func (p *Portal) Insert() {
query := `
- INSERT INTO portal (dcid, receiver, type, other_user_id, dc_guild_id, dc_parent_id, mxid,
+ INSERT INTO portal (dcid, receiver, type, other_user_id, dc_guild_id, mxid,
plain_name, name, name_set, topic, topic_set, avatar, avatar_url, avatar_set,
encrypted, in_space, first_event_id)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
encrypted, in_space, first_event_id, relay_webhook_id, relay_webhook_secret)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)
`
_, err := p.db.Exec(query, p.Key.ChannelID, p.Key.Receiver, p.Type,
- strPtr(p.OtherUserID), strPtr(p.GuildID), strPtr(p.ParentID), strPtr(string(p.MXID)),
+ strPtr(p.OtherUserID), strPtr(p.GuildID), strPtr(string(p.MXID)),
p.PlainName, p.Name, p.NameSet, p.Topic, p.TopicSet, p.Avatar, p.AvatarURL.String(), p.AvatarSet,
p.Encrypted, p.InSpace, p.FirstEventID.String())
p.Encrypted, p.InSpace, p.FirstEventID.String(), strPtr(p.RelayWebhookID), strPtr(p.RelayWebhookSecret))
@@ -169,13 +169,13 @@ func (p *Portal) Insert() {
@@ -178,13 +178,13 @@ func (p *Portal) Insert() {
func (p *Portal) Update() {
query := `
UPDATE portal
- SET type=$1, other_user_id=$2, dc_guild_id=$3, dc_parent_id=$4, mxid=$5,
- plain_name=$6, name=$7, name_set=$8, topic=$9, topic_set=$10, avatar=$11, avatar_url=$12, avatar_set=$13,
- encrypted=$14, in_space=$15, first_event_id=$16
- WHERE dcid=$17 AND receiver=$18
+ SET type=$1, other_user_id=$2, dc_guild_id=$3, mxid=$4,
+ plain_name=$5, name=$6, name_set=$7, topic=$8, topic_set=$9, avatar=$10, avatar_url=$11, avatar_set=$12,
+ encrypted=$13, in_space=$14, first_event_id=$15
+ WHERE dcid=$16 AND receiver=$17
- encrypted=$14, in_space=$15, first_event_id=$16, relay_webhook_id=$17, relay_webhook_secret=$18
- WHERE dcid=$19 AND receiver=$20
+ SET type=$1, other_user_id=$2, dc_guild_id=$3, mxid=$6,
+ plain_name=$7, name=$8, name_set=$9, topic=$10, topic_set=$11, avatar=$12, avatar_url=$13, avatar_set=$14,
+ encrypted=$15, in_space=$16, first_event_id=$17, relay_webhook_id=$18, relay_webhook_secret=$19
+ WHERE dcid=$20 AND receiver=$21
`
_, err := p.db.Exec(query,
- p.Type, strPtr(p.OtherUserID), strPtr(p.GuildID), strPtr(p.ParentID), strPtr(string(p.MXID)),
+ p.Type, strPtr(p.OtherUserID), strPtr(p.GuildID), strPtr(string(p.MXID)),
p.PlainName, p.Name, p.NameSet, p.Topic, p.TopicSet, p.Avatar, p.AvatarURL.String(), p.AvatarSet,
p.Encrypted, p.InSpace, p.FirstEventID.String(),
p.Encrypted, p.InSpace, p.FirstEventID.String(), strPtr(p.RelayWebhookID), strPtr(p.RelayWebhookSecret),
p.Key.ChannelID, p.Key.Receiver)
diff --git a/portal.go b/portal.go
index 25e0dc2..e305942 100644
index bcdbb37..c4b3ecd 100644
--- a/portal.go
+++ b/portal.go
@@ -108,15 +108,6 @@ func (br *DiscordBridge) loadPortal(dbPortal *database.Portal, key *database.Por
@@ -119,14 +119,6 @@ func (br *DiscordBridge) loadPortal(dbPortal *database.Portal, key *database.Por
if portal.GuildID != "" {
portal.Guild = portal.bridge.GetGuildByID(portal.GuildID, true)
}
@ -54,11 +54,10 @@ index 25e0dc2..e305942 100644
- portal.Parent = br.loadPortal(br.DB.Portal.GetByID(parentKey), nil, -1)
- }
- }
-
return portal
}
@@ -351,7 +342,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
@@ -384,7 +376,7 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e
creationContent := make(map[string]interface{})
if portal.Type == discordgo.ChannelTypeGuildCategory {
@ -67,7 +66,7 @@ index 25e0dc2..e305942 100644
}
if !portal.bridge.Config.Bridge.FederateRooms {
creationContent["m.federate"] = false
@@ -1777,18 +1768,12 @@ func (portal *Portal) UpdateParent(parentID string) bool {
@@ -1861,18 +1853,12 @@ func (portal *Portal) UpdateParent(parentID string) bool {
}
portal.log.Debugfln("Updating parent ID %q -> %q", portal.ParentID, parentID)
portal.ParentID = parentID
@ -76,7 +75,7 @@ index 25e0dc2..e305942 100644
- } else {
- portal.Parent = nil
- }
+ portal.Parent = nil
+ portal.Parent = nil
return true
}
@ -88,7 +87,7 @@ index 25e0dc2..e305942 100644
return portal.Guild.MXID
}
return ""
@@ -1798,9 +1783,7 @@ func (portal *Portal) updateSpace() bool {
@@ -1882,9 +1868,7 @@ func (portal *Portal) updateSpace() bool {
if portal.MXID == "" {
return false
}

8
matrix/mautrix-discord/source.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/discord",
"rev": "3e5baa502eb5453e2a8bd4e3fed43c938d4e1c0e",
"date": "2023-02-04T16:33:40+02:00",
"path": "/nix/store/yrflscqfwhcd9l6hs94v4sc9z33bi38i-discord",
"sha256": "0mk66nk1z6jn89vl7awar8zz6ygvnisfi2bnp18i94ds6h5bcxcm",
"rev": "0e8b845014cfb5cd42e3a52f2ad7a01d0824f2bd",
"date": "2023-03-01T22:50:19+02:00",
"path": "/nix/store/r8w9cpkrmpmhgbwc07233wkaphiib4mi-discord",
"sha256": "1w3al7gwnpy21dpyrw3wj1l7llsm03xcj3wbh6xqam2h6c27a1wv",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

2
matrix/mautrix-discord/vendor.sha256
View file

@ -1 +1 @@
sha256-RpiatkjEGsgj2ed9ufJFxW67FM1eDext58nvZwda/Vw=
sha256-Mx16wh4W7Vg6z7nSiRElPHd8Nkbuz4wHkj8a3I1ikGY=

8
matrix/mautrix-signal/source.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/signal",
"rev": "c7fa21c1ed3345fa7f3e03cc2c767850d29eebdd",
"date": "2023-02-03T10:53:21-05:00",
"path": "/nix/store/k09g3j49z1lgi5chrbhkr3p79hpg0xr1-signal",
"sha256": "1nmyg5b8yzhmndy5b6wq3y1q14mii7c1rbh6a5455fmbh01mwdhq",
"rev": "d5824550172cbb8f58a45a56e312db828dd9c887",
"date": "2023-03-01T09:22:53-07:00",
"path": "/nix/store/39d0jpix3l2384iy8qkjiwqgq9s9j7b7-signal",
"sha256": "09811q0zl9alx4m951bmgjkczs5lz7dsn05xc4nv28h4ldhscvdc",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
matrix/mautrix-telegram/source.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/telegram",
"rev": "a32f797b0b42e133776d9c7c5d411f480f1c4471",
"date": "2023-02-10T21:20:51+02:00",
"path": "/nix/store/9rk9j9x6067l1s0i8d7907lm8r41nchj-telegram",
"sha256": "0352c9c77mhald440vkhy4c6dq46fl5xz3f7wbr7gsmwzvl40dvx",
"rev": "7372e7cbeaca60177b6500be77a68332d0ce585c",
"date": "2023-03-01T14:02:17+02:00",
"path": "/nix/store/df8g7sb0g9vq3afpdcgkzpwkzyli9svd-telegram",
"sha256": "030bx8c6ji8a9dmzc7i9arzndy7a2rl0091mbc8sydfl3mwa16fw",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
matrix/mautrix-whatsapp/source.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/whatsapp",
"rev": "08fe836b8a6b31d205f446d80da69621f1aa28ce",
"date": "2023-02-05T01:01:42+02:00",
"path": "/nix/store/wqpy97kl8d606wfjkw6znnn220ccfj7d-whatsapp",
"sha256": "1q3g1j940m55zngyplvlqxnkilp2s5g2ipgfm6gd0gai8zxx5hgh",
"rev": "59b6e9f2721726088ac1554c9274fea89ffb997d",
"date": "2023-02-27T01:28:44+02:00",
"path": "/nix/store/hnms6vsb759l88h32lyxqrdgwa12s0yk-whatsapp",
"sha256": "00cwjp7hhbkya47r61l00nmmn7ah6nrjayg6fvrhs73174cw43n5",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

2
matrix/mautrix-whatsapp/vendor.sha256
View file

@ -1 +1 @@
sha256-BlKzSplZwS+yyq+CFimcRKdevWjyePn5WxOIb6jQcHU=
sha256-rnn2LJi/8H3Xd4C643Xog+XBUR4LNjWoeUpWO1e872M=

6
minecraft/papermc/paper.json
View file

@ -1,6 +1,6 @@
{
"version": "1.19.3",
"build": 396,
"name": "paper-1.19.3-396.jar",
"sha256": "cdbd353adf40972c4868ae76c8135d8a4cc6fadb2be09eb09defb8e3ec96d2a2"
"build": 431,
"name": "paper-1.19.3-431.jar",
"sha256": "2802c3c36b623b78bef6c075959e7fad8237ab9704aa566df792d2e6a4e780cb"
}

8
plover/didoesdigital-dictionary.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/didoesdigital/steno-dictionaries",
"rev": "90c9cf6f0d6b7f046fcedbc78a2240b9fc234954",
"date": "2023-02-05T18:45:10+10:00",
"path": "/nix/store/dx86jhwvncnlrqjd68clk1cqd129i5ij-steno-dictionaries",
"sha256": "1cflydrylzk62h0dnd5mmlnz6014icyy3cvj2gfzz8dhd3xd79xs",
"rev": "a97e4f1de41dce5e59559ee6385786a01651a25f",
"date": "2023-02-18T14:32:35+10:00",
"path": "/nix/store/kfagmqhzlca8rwbyq1jvl1yq26vsw6i0-steno-dictionaries",
"sha256": "1nf24qnadp5yf7xh4m80drpabbaam2kdb2gzzy7mmxwal07nj89l",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

4
python/mautrix.nix
View file

@ -12,11 +12,11 @@
}:
buildPythonPackage rec {
pname = "mautrix";
version = "0.19.3";
version = "0.19.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xgMcEqiafstnfcVkP8UKM35IllEw7yfhSwNrfQJh6y0=";
sha256 = "sha256-OkB5UYIJCGuQeyRNoany9adJmmuftyl0CajOS+HAYRs=";
};
propagatedBuildInputs = [

4
python/tulir-telethon.nix
View file

@ -9,11 +9,11 @@
}:
buildPythonPackage rec {
pname = "tulir-telethon";
version = "1.28.0a1";
version = "1.28.0a4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc=";
sha256 = "sha256-kSFkmMhtCLeHgg9sdWbSrEthuJ9hufTkrh3enkcKQXQ=";
};
patchPhase = ''