what the hell

.drone.yml

@@ -0,0 +1,59 @@
+---
+kind: pipeline
+type: docker
+name: update-script
+
+steps:
+  - name: Update flake
+    image: nixos/nix
+    commands:
+      - echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
+      - nix flake update
+  - name: Run update script
+    image: nixos/nix
+    commands:
+      - yes | nix-shell ./scripts/update.nix
+    depends_on:
+      - Update flake
+  - name: Format nix
+    image: nixery.dev/shell/alejandra
+    commands:
+      - alejandra .
+    depends_on:
+      - Run update script
+  - name: Push git
+    image: nixery.dev/shell/gitfull/git-lfs/shadow
+    commands:
+      - groupadd -g 0 root
+      - useradd -u 0 -g root -d $HOME root
+      - mkdir ~/.ssh
+      - echo "$SSH_KEY" > ~/.ssh/id_ed25519
+      - chmod 600 ~/.ssh/id_ed25519
+      - echo "git.chir.rs ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQ77jA9S5qXDFGPLZRsC++AtxiXXeF8gVbkLlglx0GQ" > ~/.ssh/known_hosts
+      - echo "git.chir.rs ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY0pZzNTAqaVqqfC31gYFixFs5KySv0UqvlDEAzEXJMB/pBWkE5GAd5Ik1NxD4QiAVWc2UARdmJEBbYf8mk5JiAv6fjsodJdJVRau4Ax7FtIfbxdFyzBgFery/KUnNIr6cmAWU2Af8JhzrnpEbhe5U3LftYnkdE1lI+iVqaQRARp0qikdzoAl3uMUhbdTxp1/6rtfN6bP2XZCsUx3t3W5ZG1QTQz8l7nrbXZX1TT3pZ2vcUANcMtOxEAwO6lbL210GX63C8XEoE7+4lLxRrSiaq3SkVlG07VspozKEtrrcsqCRNLebiaapmNWVoEq9Wd9VGAEjja5efyU6/HUlRogAOo1WP73UwoQLv5LTFH+ECoHhKS14xfPeXeVG8dbYyh5+CnmiVe43dH1qZw+ceYuYel31f47cAgScbxFvNkct0spK9m9mivnoUmYcxwTc+VbFbmnJvSuZw3a+OEYn9biitP/tTkYFiLZVdPZTxDkvd1oOyuVH9d4RMXbVgNS92/lr2iKFZkyhWMJ61hFMc2tupwmkp5Us5ce42XA0zC/aVY3vYoih/c5Ib0eZF1AEJdB6Bt5dWqITVsB3mip3Jn/mqVBIPTGXT6+FnGSEuL68Dj2yKBD7kj8YO/1SWpkVMy+bfoLXY/usgcaLCxpUu8dDrdrcKExLigCVbi3rdRmg7w==" >> ~/.ssh/known_hosts
+      - git remote set-url origin gitea@git.chir.rs:darkkirb/nix-packages.git
+      - git config --global 'user.email' 'gitea-bot@chir.rs'
+      - git config --global 'user.name' 'Gitea Bot'
+      - git add .
+      - git commit -am "Update packages"
+      - git push --force origin main:update-package
+    environment:
+      SSH_KEY:
+        from_secret: SSH_KEY
+    depends_on: 
+      - Format nix
+  - name: Create pull request
+    image: nixery.dev/shell/curl
+    commands:
+      - |
+        echo '{ "assignee": "DarkKirb", "base": "main", "head": "update-package", "title": "Update packages", "body": "" }' | curl -XPOST  'https://git.chir.rs/api/v1/repos/DarkKirb/nix-packages/pulls' -H "Accept: application/json" -H "Content-Type: application/json" -H "Authorization: Bearer $AUTHORISATION" --data-binary @-
+    environment:
+      AUTHORISATION:
+        from_secret: GITEA_KEY
+    depends_on:
+      - Push git
+trigger:
+  event:
+    - cron
+  cron:
+    - updater

.github/workflows/update.yml

@@ -0,0 +1,46 @@
+name: update
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: "49 4 * * *"
+jobs:
+  flake-lock:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Install Nix
+        uses: cachix/install-nix-action@v18
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs= chir-rs:AnwyFacopHSkprD6aXY4/R3J9JYzTbV2rosJCBPaB28=
+            experimental-features = nix-command flakes ca-derivations
+            post-build-hook = ${{ github.workspace }}/scripts/post-build-hook
+            substituters = https://attic.chir.rs/chir-rs/ https://cache.nixos.org/
+      - name: Download attic
+        run: nix build github:DarkKirb/nix-packages#attic-client
+      - name: Set up secrets
+        run: nix run github:DarkKirb/nix-packages#attic-client -- login attic-server https://attic-nocdn.chir.rs/ "$ATTIC_TOKEN"
+        env:
+          ATTIC_TOKEN: ${{secrets.ATTIC_TOKEN}}
+      - name: Update flake.lock
+        run: nix flake update
+      - name: Run update script
+        run: yes '' | nix-shell ./scripts/update.nix --argstr max-workers 1
+      - name: Format
+        run: nix fmt
+      - name: Delete secrets
+        run: |
+          rm ~/cache.key
+      - name: Create PR
+        uses: peter-evans/create-pull-request@v4.2.0
+        with:
+          commit-message: Update nix-packages
+          author: Github Actions <github-actions@users.noreply.github.com>
+          committer: Github Actions <github-actions@users.noreply.github.com>
+          title: Automated updates for nix-packages
+          body: Automated updates
+          assignees: darkkirb
+          reviewers: darkkirb

.gitignore

@@ -1,2 +1,3 @@
 .direnv
-/result*
+/result
+/result-man

.woodpecker/update-lockfile.yaml

@@ -1,76 +0,0 @@
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-pipeline:
-  clone2:
-    image: nixery.dev/shell/gitfull
-    commands:
-      - cd ..
-      - rm -rf $CI_REPO_NAME
-      - git clone https://git.chir.rs/$CI_REPO_OWNER/$CI_REPO_NAME
-      - cd $CI_REPO_NAME
-    when:
-      - event: cron
-      - event: manual
-  flake-update:
-    image: nixpkgs/nix-unstable
-    commands:
-      - mkdir -p /etc/nix
-      - |
-        cat > /etc/nix/nix.conf << EOF
-        # WARNING: this file is generated from the nix.* options in
-        # your NixOS configuration, typically
-        # /etc/nixos/configuration.nix.  Do not edit it!
-        build-users-group = nixbld
-        allowed-users = *
-        auto-optimise-store = true
-        builders-use-substitutes = true
-        require-sigs = true
-        sandbox = false
-        substituters = https://hydra.int.chir.rs/ https://cache.nixos.org/
-        system-features = big-parallel benchmark ca-derivations
-        trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs= chir-rs:AnwyFacopHSkprD6aXY4/R3J9JYzTbV2rosJCBPaB28=
-        trusted-substituters =
-        trusted-users = @wheel
-        experimental-features = nix-command flakes ca-derivations
-        EOF
-      - nix flake update
-    when:
-      - event: cron
-      - event: manual
-  git-push:
-    image: nixery.dev/shell/openssh/gitfull/git-lfs/gnupg/shadow
-    commands:
-      - groupadd -g 0 root
-      - useradd -u 0 -g root -d $HOME root
-      - mkdir -p ~/.ssh
-      - echo "$SSH_KEY" > ~/.ssh/id_ed25519
-      - chmod 600 ~/.ssh/id_ed25519
-      - echo "git.chir.rs ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQ77jA9S5qXDFGPLZRsC++AtxiXXeF8gVbkLlglx0GQ" > ~/.ssh/known_hosts
-      - echo "git.chir.rs ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY0pZzNTAqaVqqfC31gYFixFs5KySv0UqvlDEAzEXJMB/pBWkE5GAd5Ik1NxD4QiAVWc2UARdmJEBbYf8mk5JiAv6fjsodJdJVRau4Ax7FtIfbxdFyzBgFery/KUnNIr6cmAWU2Af8JhzrnpEbhe5U3LftYnkdE1lI+iVqaQRARp0qikdzoAl3uMUhbdTxp1/6rtfN6bP2XZCsUx3t3W5ZG1QTQz8l7nrbXZX1TT3pZ2vcUANcMtOxEAwO6lbL210GX63C8XEoE7+4lLxRrSiaq3SkVlG07VspozKEtrrcsqCRNLebiaapmNWVoEq9Wd9VGAEjja5efyU6/HUlRogAOo1WP73UwoQLv5LTFH+ECoHhKS14xfPeXeVG8dbYyh5+CnmiVe43dH1qZw+ceYuYel31f47cAgScbxFvNkct0spK9m9mivnoUmYcxwTc+VbFbmnJvSuZw3a+OEYn9biitP/tTkYFiLZVdPZTxDkvd1oOyuVH9d4RMXbVgNS92/lr2iKFZkyhWMJ61hFMc2tupwmkp5Us5ce42XA0zC/aVY3vYoih/c5Ib0eZF1AEJdB6Bt5dWqITVsB3mip3Jn/mqVBIPTGXT6+FnGSEuL68Dj2yKBD7kj8YO/1SWpkVMy+bfoLXY/usgcaLCxpUu8dDrdrcKExLigCVbi3rdRmg7w==" >> ~/.ssh/known_hosts
-      - git remote set-url origin gitea@git.chir.rs:$CI_REPO_OWNER/$CI_REPO_NAME.git
-      - git config --global 'user.email' 'gitea-bot@chir.rs'
-      - git config --global 'user.name' 'Gitea Bot'
-      - echo "$GPG_KEY" | gpg --import
-      - git config --global "user.signingKey" "0x417A4BCCAB696E24"
-      - git config --global "commit.gpgSign" "true"
-      - git add .
-      - git commit -am "Update flake"
-      - git push --force origin main:update-flake
-    secrets:
-      - gpg_key
-      - ssh_key
-    when:
-      - event: cron
-      - event: manual
-  gitea-pr:
-    image: nixery.dev/shell/curl
-    commands:
-      - |
-        echo '{ "assignee": "darkkirb", "base": "main", "head": "update-flake", "title": "Update flake", "body": "" }' | curl -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/json" --data-binary @- "https://git.chir.rs/api/v1/repos/$CI_REPO_OWNER/$CI_REPO_NAME/pulls"
-    secrets:
-      - gitea_token
-    when:
-      - event: cron
-      - event: manual
-skip_clone: true

.woodpecker/update.yaml

@@ -1,124 +0,0 @@
-pipeline:
-  clone2:
-    image: nixery.dev/shell/gitfull
-    commands:
-      - cd ..
-      - rm -rf $CI_REPO_NAME
-      - git clone https://git.chir.rs/$CI_REPO_OWNER/$CI_REPO_NAME
-      - cd $CI_REPO_NAME
-    when:
-      - event: cron
-      - event: manual
-  update-${PACKAGE}:
-    image: nixos/nix
-    commands:
-      - mkdir -p /etc/nix
-      - |
-        cat > /etc/nix/nix.conf << EOF
-        # WARNING: this file is generated from the nix.* options in
-        # your NixOS configuration, typically
-        # /etc/nixos/configuration.nix.  Do not edit it!
-        build-users-group = nixbld
-        allowed-users = *
-        auto-optimise-store = true
-        builders-use-substitutes = true
-        require-sigs = true
-        sandbox = false
-        substituters = https://hydra.int.chir.rs/ https://cache.nixos.org/
-        system-features = big-parallel benchmark ca-derivations
-        trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixcache:8KKuGz95Pk4UJ5W/Ni+pN+v+LDTkMMFV4yrGmAYgkDg= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs= chir-rs:AnwyFacopHSkprD6aXY4/R3J9JYzTbV2rosJCBPaB28=
-        trusted-substituters =
-        trusted-users = @wheel
-        experimental-features = nix-command flakes ca-derivations
-        EOF
-      - mkdir -p /tmp2
-      - chmod 1777 /tmp2
-      - export TMPDIR=/tmp2
-      - yes '' | nix-shell ./scripts/update.nix --argstr path ${PACKAGE}
-    when:
-      - event: cron
-      - event: manual
-  format:
-    image: nixery.dev/shell/alejandra
-    commands:
-      - alejandra .
-    when:
-      - event: cron
-      - event: manual
-  git-push:
-    image: nixery.dev/shell/openssh/gitfull/git-lfs/gnupg/shadow
-    commands:
-      - groupadd -g 0 root
-      - useradd -u 0 -g root -d $HOME root
-      - mkdir -p ~/.ssh
-      - echo "$SSH_KEY" > ~/.ssh/id_ed25519
-      - chmod 600 ~/.ssh/id_ed25519
-      - echo "git.chir.rs ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQ77jA9S5qXDFGPLZRsC++AtxiXXeF8gVbkLlglx0GQ" > ~/.ssh/known_hosts
-      - echo "git.chir.rs ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY0pZzNTAqaVqqfC31gYFixFs5KySv0UqvlDEAzEXJMB/pBWkE5GAd5Ik1NxD4QiAVWc2UARdmJEBbYf8mk5JiAv6fjsodJdJVRau4Ax7FtIfbxdFyzBgFery/KUnNIr6cmAWU2Af8JhzrnpEbhe5U3LftYnkdE1lI+iVqaQRARp0qikdzoAl3uMUhbdTxp1/6rtfN6bP2XZCsUx3t3W5ZG1QTQz8l7nrbXZX1TT3pZ2vcUANcMtOxEAwO6lbL210GX63C8XEoE7+4lLxRrSiaq3SkVlG07VspozKEtrrcsqCRNLebiaapmNWVoEq9Wd9VGAEjja5efyU6/HUlRogAOo1WP73UwoQLv5LTFH+ECoHhKS14xfPeXeVG8dbYyh5+CnmiVe43dH1qZw+ceYuYel31f47cAgScbxFvNkct0spK9m9mivnoUmYcxwTc+VbFbmnJvSuZw3a+OEYn9biitP/tTkYFiLZVdPZTxDkvd1oOyuVH9d4RMXbVgNS92/lr2iKFZkyhWMJ61hFMc2tupwmkp5Us5ce42XA0zC/aVY3vYoih/c5Ib0eZF1AEJdB6Bt5dWqITVsB3mip3Jn/mqVBIPTGXT6+FnGSEuL68Dj2yKBD7kj8YO/1SWpkVMy+bfoLXY/usgcaLCxpUu8dDrdrcKExLigCVbi3rdRmg7w==" >> ~/.ssh/known_hosts
-      - git remote set-url origin gitea@git.chir.rs:$CI_REPO_OWNER/$CI_REPO_NAME.git
-      - git config --global 'user.email' 'gitea-bot@chir.rs'
-      - git config --global 'user.name' 'Gitea Bot'
-      - echo "$GPG_KEY" | gpg --import
-      - git config --global "user.signingKey" "0x417A4BCCAB696E24"
-      - git config --global "commit.gpgSign" "true"
-      - git add .
-      - git commit -am "Update ${PACKAGE}"
-      - git push --force origin main:update-${PACKAGE}
-    secrets:
-      - gpg_key
-      - ssh_key
-    when:
-      - event: cron
-      - event: manual
-  gitea-pr:
-    image: nixery.dev/shell/curl
-    commands:
-      - |
-        echo '{ "assignee": "darkkirb", "base": "main", "head": "update-${PACKAGE}", "title": "Update ${PACKAGE}", "body": "" }' | curl -X POST -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/json" --data-binary @- "https://git.chir.rs/api/v1/repos/$CI_REPO_OWNER/$CI_REPO_NAME/pulls"
-    secrets:
-      - gitea_token
-    when:
-      - event: cron
-      - event: manual
-matrix:
-  PACKAGE:
-    - akkoma
-    - pleroma-fe
-    - admin-fe
-    - emoji-volpeon-blobfox
-    - emoji-volpeon-bunhd
-    - emoji-volpeon-drgn
-    - emoji-volpeon-fox
-    - emoji-volpeon-gphn
-    - emoji-volpeon-raccoon
-    - emoji-volpeon-vlpn
-    - emoji-caro
-    - lotte-art
-    - nasin-nanpa
-    - matrix-media-repo
-    - mautrix-discord
-    - mautrix-whatsapp
-    - mautrix-signal
-    - mautrix-telegram
-    - python-mautrix
-    - python-tulir-telethon
-    - papermc
-    - python-plover-stroke
-    - python-rtf-tokenize
-    - plover
-    - plover-plugins-manager
-    - python-simplefuzzyset
-    - plover-plugin-emoji
-    - plover-plugin-tapey-tape
-    - plover-plugin-yaml-dictionary
-    - plover-plugin-machine-hid
-    - plover-plugin-rkb1-hid
-    - plover-dict-didoesdigital
-    - miifox-net
-    - python-instagram
-    - element-web
-    - woodpecker-server
-    - wordpress-plugins
-    - wordpress-themes
-    - kubo
-skip_clone: true

akkoma/0001-Revert-Config-Restrict-permissions-of-OTP-config-fil.patch

@@ -1,38 +0,0 @@
-From 1ec87ef4a78882e0cf4619b02f0a4ec644c7b29a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
-Date: Sun, 6 Aug 2023 12:30:52 +0100
-Subject: [PATCH] Revert "Config: Restrict permissions of OTP config file"
-
-This reverts commit ae03513934acbd2b3bae18aa4e0b223c6738cdc9.
----
- lib/pleroma/config/release_runtime_provider.ex | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex
-index a829a0206..e5f2d6339 100644
---- a/lib/pleroma/config/release_runtime_provider.ex
-+++ b/lib/pleroma/config/release_runtime_provider.ex
-@@ -22,20 +22,6 @@ def load(config, opts) do
- 
-     with_runtime_config =
-       if File.exists?(config_path) do
--        # <https://git.pleroma.social/pleroma/pleroma/-/issues/3135>
--        %File.Stat{mode: mode} = File.lstat!(config_path)
--
--        if Bitwise.band(mode, 0o007) > 0 do
--          raise "Configuration at #{config_path} has world-permissions, execute the following: chmod o= #{config_path}"
--        end
--
--        if Bitwise.band(mode, 0o020) > 0 do
--          raise "Configuration at #{config_path} has group-wise write permissions, execute the following: chmod g-w #{config_path}"
--        end
--
--        # Note: Elixir doesn't provides a getuid(2)
--        # so cannot forbid group-read only when config is owned by us
--
-         runtime_config = Config.Reader.read!(config_path)
- 
-         with_defaults
--- 
-2.41.0
-

akkoma/0001-make-previews-not-break-on-apps-like-telegram.patch

@@ -1,195 +0,0 @@
-From 192348a73e57f556a96f5c2bc2c15fa680ee526a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
-Date: Thu, 31 Aug 2023 14:35:17 +0100
-Subject: [PATCH] make previews not break on apps like telegram
-
----
- .../web/metadata/providers/twitter_card.ex    | 121 ++++++++++--------
- 1 file changed, 71 insertions(+), 50 deletions(-)
-
-diff --git a/lib/pleroma/web/metadata/providers/twitter_card.ex b/lib/pleroma/web/metadata/providers/twitter_card.ex
-index ab48ea272..f99d953e1 100644
---- a/lib/pleroma/web/metadata/providers/twitter_card.ex
-+++ b/lib/pleroma/web/metadata/providers/twitter_card.ex
-@@ -16,18 +16,39 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do
-   @media_types ["image", "audio", "video"]
- 
-   @impl Provider
--  def build_tags(%{activity_id: id, object: object, user: user}) do
--    attachments = build_attachments(id, object)
-+  def build_tags(%{
-+        object: object,
-+        url: url,
-+        user: user
-+      }) do
-+    attachments = build_attachments(object)
-     scrubbed_content = Utils.scrub_html_and_truncate(object)
- 
-     [
--      title_tag(user),
--      {:meta, [name: "twitter:description", content: scrubbed_content], []}
-+      {:meta,
-+        [
-+          property: "twitter:card",
-+          content: "summary"
-+        ], []},
-+      {:meta,
-+       [
-+         property: "twitter:title",
-+         content: Utils.user_name_string(user)
-+       ], []},
-+      {:meta, [property: "twitter:url", content: url], []},
-+      {:meta,
-+       [
-+         property: "twitter:description",
-+         content: scrubbed_content
-+       ], []},
-+      {:meta, [property: "twitter:type", content: "article"], []}
-     ] ++
-       if attachments == [] or Metadata.activity_nsfw?(object) do
-         [
--          image_tag(user),
--          {:meta, [name: "twitter:card", content: "summary"], []}
-+          {:meta, [property: "twitter:image", content: MediaProxy.preview_url(User.avatar_url(user))],
-+           []},
-+          {:meta, [property: "twitter:image:width", content: 150], []},
-+          {:meta, [property: "twitter:image:height", content: 150], []}
-         ]
-       else
-         attachments
-@@ -38,33 +59,32 @@ def build_tags(%{activity_id: id, object: object, user: user}) do
-   def build_tags(%{user: user}) do
-     with truncated_bio = Utils.scrub_html_and_truncate(user.bio) do
-       [
--        title_tag(user),
--        {:meta, [name: "twitter:description", content: truncated_bio], []},
--        image_tag(user),
--        {:meta, [name: "twitter:card", content: "summary"], []}
-+        {:meta,
-+         [
-+           property: "twitter:title",
-+           content: Utils.user_name_string(user)
-+         ], []},
-+        {:meta, [property: "twitter:url", content: user.uri || user.ap_id], []},
-+        {:meta, [property: "twitter:description", content: truncated_bio], []},
-+        {:meta, [property: "twitter:type", content: "article"], []},
-+        {:meta, [property: "twitter:image", content: MediaProxy.preview_url(User.avatar_url(user))],
-+         []},
-+        {:meta, [property: "twitter:image:width", content: 150], []},
-+        {:meta, [property: "twitter:image:height", content: 150], []}
-       ]
-     end
-   end
- 
--  defp title_tag(user) do
--    {:meta, [name: "twitter:title", content: Utils.user_name_string(user)], []}
--  end
--
--  def image_tag(user) do
--    {:meta, [name: "twitter:image", content: MediaProxy.preview_url(User.avatar_url(user))], []}
--  end
--
--  defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
-+  defp build_attachments(%{data: %{"attachment" => attachments}}) do
-     Enum.reduce(attachments, [], fn attachment, acc ->
-       rendered_tags =
-         Enum.reduce(attachment["url"], [], fn url, acc ->
-+          # TODO: Whatsapp only wants JPEG or PNGs. It seems that if we add a second twitter:image
-+          # object when a Video or GIF is attached it will display that in Whatsapp Rich Preview.
-           case Utils.fetch_media_type(@media_types, url["mediaType"]) do
-             "audio" ->
-               [
--                {:meta, [name: "twitter:card", content: "player"], []},
--                {:meta, [name: "twitter:player:width", content: "480"], []},
--                {:meta, [name: "twitter:player:height", content: "80"], []},
--                {:meta, [name: "twitter:player", content: player_url(id)], []}
-+                {:meta, [property: "twitter:audio", content: MediaProxy.url(url["href"])], []}
-                 | acc
-               ]
- 
-@@ -75,32 +95,19 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
-             # workaround.
-             "image" ->
-               [
--                {:meta, [name: "twitter:card", content: "summary_large_image"], []},
--                {:meta,
--                 [
--                   name: "twitter:player",
--                   content: MediaProxy.url(url["href"])
--                 ], []}
-+                {:meta, [property: "twitter:image", content: MediaProxy.url(url["href"])], []},
-+                {:meta, [property: "twitter:image:alt", content: attachment["name"]], []}
-                 | acc
-               ]
-               |> maybe_add_dimensions(url)
- 
-             "video" ->
--              # fallback to old placeholder values
--              height = url["height"] || 480
--              width = url["width"] || 480
--
-               [
--                {:meta, [name: "twitter:card", content: "player"], []},
--                {:meta, [name: "twitter:player", content: player_url(id)], []},
--                {:meta, [name: "twitter:player:width", content: "#{width}"], []},
--                {:meta, [name: "twitter:player:height", content: "#{height}"], []},
--                {:meta, [name: "twitter:player:stream", content: MediaProxy.url(url["href"])],
--                 []},
--                {:meta, [name: "twitter:player:stream:content_type", content: url["mediaType"]],
--                 []}
-+                {:meta, [property: "twitter:video", content: MediaProxy.url(url["href"])], []}
-                 | acc
-               ]
-+              |> maybe_add_dimensions(url)
-+              |> maybe_add_video_thumbnail(url)
- 
-             _ ->
-               acc
-@@ -111,21 +118,35 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
-     end)
-   end
- 
--  defp build_attachments(_id, _object), do: []
-+  defp build_attachments(_), do: []
- 
--  defp player_url(id) do
--    url(~p[/notice/#{id}/embed_player])
--  end
--
--  # Videos have problems without dimensions, but we used to not provide WxH for images.
--  # A default (read: incorrect) fallback for images is likely to cause rendering bugs.
-+  # We can use url["mediaType"] to dynamically fill the metadata
-   defp maybe_add_dimensions(metadata, url) do
-+    type = url["mediaType"] |> String.split("/") |> List.first()
-+
-     cond do
-       !is_nil(url["height"]) && !is_nil(url["width"]) ->
-         metadata ++
-           [
--            {:meta, [name: "twitter:player:width", content: "#{url["width"]}"], []},
--            {:meta, [name: "twitter:player:height", content: "#{url["height"]}"], []}
-+            {:meta, [property: "twitter:#{type}:width", content: "#{url["width"]}"], []},
-+            {:meta, [property: "twitter:#{type}:height", content: "#{url["height"]}"], []}
-+          ]
-+
-+      true ->
-+        metadata
-+    end
-+  end
-+
-+  # Media Preview Proxy makes thumbnails of videos without resizing, so we can trust the
-+  # width and height of the source video.
-+  defp maybe_add_video_thumbnail(metadata, url) do
-+    cond do
-+      Pleroma.Config.get([:media_preview_proxy, :enabled], false) ->
-+        metadata ++
-+          [
-+            {:meta, [property: "twitter:image:width", content: "#{url["width"]}"], []},
-+            {:meta, [property: "twitter:image:height", content: "#{url["height"]}"], []},
-+            {:meta, [property: "twitter:image", content: MediaProxy.preview_url(url["href"])], []}
-           ]
- 
-       true ->
--- 
-2.41.0
-

akkoma/admin-fe/source.json

@@ -1,10 +1,9 @@
 {
   "url": "https://akkoma.dev/AkkomaGang/admin-fe.git",
-  "rev": "d58fe6f84d352acaf960f7360eb79f000bf6726c",
-  "date": "2023-08-15T01:24:52+01:00",
-  "path": "/nix/store/kllvvk1ymbwinpsjj35dxb8272wf1fqf-admin-fe",
-  "sha256": "0v84fp71ql1n9bimnl14r18lbasd8c5y73ajqf7ci8j7brg9brxn",
-  "hash": "sha256-tueVXl5HosiOw1KN4wtDTatFUcgkUFvjSjZQHM51BG0=",
+  "rev": "0802dc5777e722d5df8bc595e025a6124eb02837",
+  "date": "2022-12-14T12:05:59+00:00",
+  "path": "/nix/store/pqj5iqn2y89qfgd33b9jjbn58cq395nn-admin-fe",
+  "sha256": "0qvr245604yaslvnphx2ybclh51svqi570pzch917jffi8kkr5gr",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

akkoma/akkoma-fe/source.json

@@ -1,12 +0,0 @@
-{
-  "url": "https://akkoma.dev/AkkomaGang/akkoma-fe.git",
-  "rev": "52b0b6f0088acf82bebf2a2d141011517459daf8",
-  "date": "2023-10-02T13:28:23+01:00",
-  "path": "/nix/store/0sdpp85l2a79cnfwxjfy05fw2x38hjkg-akkoma-fe",
-  "sha256": "02ga8a5m3jpwfn1ddnq86zlvifbx8nx5628mvsvx87m66hgwg6dx",
-  "hash": "sha256-vZnHHzSmHtS33hUJU7pFfbm46TcI29aCdfzKUYtC6gk=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

akkoma/change-twitter-preview.patch

@@ -0,0 +1,57 @@
+diff --git a/lib/pleroma/web/metadata/providers/twitter_card.ex b/lib/pleroma/web/metadata/providers/twitter_card.ex
+index 79183df86..563a18bd0 100644
+--- a/lib/pleroma/web/metadata/providers/twitter_card.ex
++++ b/lib/pleroma/web/metadata/providers/twitter_card.ex
+@@ -14,8 +14,12 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do
+   @media_types ["image", "audio", "video"]
+ 
+   @impl Provider
+-  def build_tags(%{activity_id: id, object: object, user: user}) do
+-    attachments = build_attachments(id, object)
++  def build_tags(%{
++        object: object,
++        url: url,
++        user: user
++      }) do
++    attachments = build_attachments(object)
+     scrubbed_content = Utils.scrub_html_and_truncate(object)
+ 
+     [
+@@ -53,7 +57,7 @@ def image_tag(user) do
+      []}
+   end
+ 
+-  defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
++  defp build_attachments(%{data: %{"attachment" => attachments}}) do
+     Enum.reduce(attachments, [], fn attachment, acc ->
+       rendered_tags =
+         Enum.reduce(attachment["url"], [], fn url, acc ->
+@@ -63,7 +67,7 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
+                 {:meta, [property: "twitter:card", content: "player"], []},
+                 {:meta, [property: "twitter:player:width", content: "480"], []},
+                 {:meta, [property: "twitter:player:height", content: "80"], []},
+-                {:meta, [property: "twitter:player", content: player_url(id)], []}
++                {:meta, [property: "twitter:player", content: MediaProxy.url(url["href"])], []}
+                 | acc
+               ]
+ 
+@@ -91,7 +95,7 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
+ 
+               [
+                 {:meta, [property: "twitter:card", content: "player"], []},
+-                {:meta, [property: "twitter:player", content: player_url(id)], []},
++                {:meta, [property: "twitter:player", content: MediaProxy.url(url["href"])], []},
+                 {:meta, [property: "twitter:player:width", content: "#{width}"], []},
+                 {:meta, [property: "twitter:player:height", content: "#{height}"], []},
+                 {:meta, [property: "twitter:player:stream", content: MediaProxy.url(url["href"])],
+@@ -112,10 +116,6 @@ defp build_attachments(id, %{data: %{"attachment" => attachments}}) do
+ 
+   defp build_attachments(_id, _object), do: []
+ 
+-  defp player_url(id) do
+-    Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :notice_player, id)
+-  end
+-
+   # Videos have problems without dimensions, but we used to not provide WxH for images.
+   # A default (read: incorrect) fallback for images is likely to cause rendering bugs.
+   defp maybe_add_dimensions(metadata, url) do

akkoma/default.nix

@@ -9,6 +9,7 @@
   writeText,
   writeScript,
   applyPatches,
+  libxcrypt,
   ...
 }: let
   source = builtins.fromJSON (builtins.readFile ./source.json);
@@ -24,24 +25,10 @@
       ./jxl-polyfill.patch
       ./block-invalid-datetime-mrf.patch
       ./require-image-description.patch
+      ./change-twitter-preview.patch
       ./make-uploads-private.patch
-      ./0001-Revert-Config-Restrict-permissions-of-OTP-config-fil.patch
-      ./0001-make-previews-not-break-on-apps-like-telegram.patch
     ];
   };
-  mkOverride = final: prev: name:
-    prev.${name}.override {
-      patchPhase = ''
-        mkdir -p config
-        cp ${final.mime}/config/config.exs config/config.exs
-      '';
-    };
-  mkOverrides = final: prev: names:
-    builtins.listToAttrs (map (name: {
-        inherit name;
-        value = mkOverride final prev name;
-      })
-      names);
 in
   beamPackages.mixRelease rec {
     pname = "akkoma";
@@ -62,218 +49,145 @@ in
 
     mixNixDeps = import ./mix.nix {
       inherit beamPackages lib;
-      overrides = final: prev:
-        {
-          # mix2nix does not support git dependencies yet,
-          # so we need to add them manually
-          captcha = beamPackages.buildMix {
-            name = "captcha";
-            version = "0.1.0";
+      overrides = final: prev: {
+        # mix2nix does not support git dependencies yet,
+        # so we need to add them manually
+        captcha = beamPackages.buildMix rec {
+          name = "captcha";
+          version = "0.1.0";
 
-            src = fetchFromGitLab {
-              domain = "git.pleroma.social";
-              group = "pleroma";
-              owner = "elixir-libraries";
-              repo = "elixir-captcha";
-              rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2";
-              sha256 = "1fknjlshc52hrd841rw5incp47h1fk20h068gq9mbskq051p8imj";
-            };
-            beamDeps = [];
+          src = fetchFromGitLab {
+            domain = "git.pleroma.social";
+            group = "pleroma";
+            owner = "elixir-libraries";
+            repo = "elixir-captcha";
+            rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab";
+            sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";
           };
-          concurrent_limiter = beamPackages.buildMix rec {
-            name = "concurrent_limiter";
-            version = "0.1.1";
+          beamDeps = with final; [];
+        };
+        crypt = beamPackages.buildRebar3 rec {
+          name = "crypt";
+          version = "0.4.3";
 
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "concurrent-limiter";
-              rev = "a9e0b3d64574bdba761f429bb4fba0cf687b3338";
-              hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys=";
-            };
-
-            beamDeps = with final; [];
+          src = fetchFromGitHub {
+            owner = "msantos";
+            repo = "crypt";
+            rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";
+            sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";
           };
-          elasticsearch = beamPackages.buildMix rec {
-            name = "elasticsearch";
-            version = "1.0.1";
 
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "elasticsearch-elixir";
-              rev = "6cd946f75f6ab9042521a009d1d32d29a90113ca";
-              hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0=";
-            };
+          postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
 
-            beamDeps = with final; [];
+          beamDeps = with final; [elixir_make];
+          buildInputs = [libxcrypt];
+        };
+        elasticsearch = beamPackages.buildMix rec {
+          name = "elasticsearch";
+          version = "1.0.1";
+
+          src = fetchFromGitea {
+            domain = "akkoma.dev";
+            owner = "AkkomaGang";
+            repo = "elasticsearch-elixir";
+            rev = "6cd946f75f6ab9042521a009d1d32d29a90113ca";
+            hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0=";
           };
-          file_ex = beamPackages.buildMix rec {
-            name = "file_ex";
-            version = "0.1.0";
 
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "file_ex";
-              rev = "cc7067c7d446c2526e9ecf91d40896b088851569";
-              hash = "sha256-3sxfdOy0cpst4jiutoaabk72VFJ2USKiJN9ODN01Dco=";
-            };
+          beamDeps = with final; [];
+        };
+        linkify = beamPackages.buildMix rec {
+          name = "linkify";
+          version = "0.5.2";
 
-            beamDeps = with final; [];
+          src = fetchFromGitea {
+            domain = "akkoma.dev";
+            owner = "AkkomaGang";
+            repo = "linkify";
+            rev = "2567e2c1073fa371fd26fd66dfa5bc77b6919c16";
+            hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg=";
           };
-          http_signatures = beamPackages.buildMix rec {
-            name = "http_signatures";
-            version = "0.1.1";
 
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "http_signatures";
-              rev = "6640ce7d24c783ac2ef56e27d00d12e8dc85f396";
-              hash = "sha256-Q/IoVbM/TBgGCmx8AxiBHF2hARb0FbPml8N1HjN3CsE=";
-            };
+          beamDeps = with final; [];
+        };
+        mfm_parser = beamPackages.buildMix rec {
+          name = "mfm_parser";
+          version = "0.1.1";
 
-            patchPhase = ''
-              substituteInPlace mix.exs --replace ":logger" ":logger, :public_key"
+          src = fetchFromGitea {
+            domain = "akkoma.dev";
+            owner = "AkkomaGang";
+            repo = "mfm-parser";
+            rev = "912fba81152d4d572e457fd5427f9875b2bc3dbe";
+            hash = "sha256-n3WmERxKK8VM8jFIBAPS6GkbT7/zjqi3AjjWbjOdMzs=";
+          };
+
+          beamDeps = with final; [phoenix_view temple];
+        };
+        search_parser = beamPackages.buildMix rec {
+          name = "search_parser";
+          version = "0.1.0";
+
+          src = fetchFromGitHub {
+            owner = "FloatingGhost";
+            repo = "pleroma-contrib-search-parser";
+            rev = "08971a81e68686f9ac465cfb6661d51c5e4e1e7f";
+            hash = "sha256-sbo9Kcp2oT05o2GAF+IgziLPYmCkWgBfFMBCytmqg3Y=";
+          };
+
+          beamDeps = with final; [nimble_parsec];
+        };
+        temple = beamPackages.buildMix rec {
+          name = "temple";
+          version = "0.9.0-rc.0";
+
+          src = fetchFromGitea {
+            domain = "akkoma.dev";
+            owner = "AkkomaGang";
+            repo = "temple";
+            rev = "066a699ade472d8fa42a9d730b29a61af9bc8b59";
+            hash = "sha256-qA0z8WTMjO2OixcZBARn/LbuV3s3LGtwZ9nSjj/tWBc=";
+          };
+
+          mixEnv = "dev";
+          beamDeps = with final; [earmark_parser ex_doc makeup makeup_elixir makeup_erlang nimble_parsec];
+        };
+
+        # Some additional build inputs and build fixes
+        fast_html = prev.fast_html.override {
+          nativeBuildInputs = [cmake];
+          dontUseCmakeConfigure = true;
+        };
+        http_signatures = prev.http_signatures.override {
+          patchPhase = ''
+            substituteInPlace mix.exs --replace ":logger" ":logger, :public_key"
+          '';
+        };
+        majic = prev.majic.override {
+          buildInputs = [file];
+        };
+        syslog = prev.syslog.override {
+          buildPlugins = with beamPackages; [pc];
+        };
+
+        mime = prev.mime.override {
+          patchPhase = let
+            cfgFile = writeText "config.exs" ''
+              use Mix.Config
+              config :mime, :types, %{
+                "application/activity+json" => ["activity+json"],
+                "application/jrd+json" => ["jrd+json"],
+                "application/ld+json" => ["activity+json"],
+                "application/xml" => ["xml"],
+                "application/xrd+xml" => ["xrd+xml"]
+              }
             '';
-
-            beamDeps = with final; [];
-          };
-          linkify = beamPackages.buildMix rec {
-            name = "linkify";
-            version = "0.5.2";
-
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "linkify";
-              rev = "2567e2c1073fa371fd26fd66dfa5bc77b6919c16";
-              hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg=";
-            };
-
-            beamDeps = with final; [];
-          };
-          majic = beamPackages.buildMix rec {
-            name = "majic";
-            version = "1.0.0";
-
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "majic";
-              rev = "80540b36939ec83f48e76c61e5000e0fd67706f0";
-              hash = "sha256-OMM9aDRvbqCOBIE+iPySU8ONRn1BqHDql22rRSmdW08=";
-            };
-            buildInputs = [file];
-
-            beamDeps = with final; [elixir_make mime nimble_pool plug];
-            patchPhase = ''
-              mkdir -p config
-              cp ${final.mime}/config/config.exs config/config.exs
-            '';
-          };
-          mfm_parser = beamPackages.buildMix rec {
-            name = "mfm_parser";
-            version = "0.1.1";
-
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "mfm-parser";
-              rev = "b21ab7754024af096f2d14247574f55f0063295b";
-              hash = "sha256-couG5jrAo0Fbk/WABd4n3vhXpDUp+9drxExKc5NM9CI=";
-            };
-
-            beamDeps = with final; [phoenix_view temple];
-          };
-          search_parser = beamPackages.buildMix rec {
-            name = "search_parser";
-            version = "0.1.0";
-
-            src = fetchFromGitHub {
-              owner = "FloatingGhost";
-              repo = "pleroma-contrib-search-parser";
-              rev = "08971a81e68686f9ac465cfb6661d51c5e4e1e7f";
-              hash = "sha256-sbo9Kcp2oT05o2GAF+IgziLPYmCkWgBfFMBCytmqg3Y=";
-            };
-
-            beamDeps = with final; [nimble_parsec];
-          };
-          temple = beamPackages.buildMix rec {
-            name = "temple";
-            version = "0.9.0-rc.0";
-
-            src = fetchFromGitea {
-              domain = "akkoma.dev";
-              owner = "AkkomaGang";
-              repo = "temple";
-              rev = "066a699ade472d8fa42a9d730b29a61af9bc8b59";
-              hash = "sha256-qA0z8WTMjO2OixcZBARn/LbuV3s3LGtwZ9nSjj/tWBc=";
-            };
-
-            mixEnv = "dev";
-            beamDeps = with final; [earmark_parser ex_doc makeup makeup_elixir makeup_erlang nimble_parsec];
-          };
-
-          fast_html = prev.fast_html.override {
-            nativeBuildInputs = [cmake];
-            dontUseCmakeConfigure = true;
-          };
-          syslog = prev.syslog.override {
-            buildPlugins = with beamPackages; [pc];
-          };
-          mime = prev.mime.override {
-            patchPhase = let
-              cfgFile = writeText "config.exs" ''
-                use Mix.Config
-                config :mime, :types, %{
-                  "application/xml" => ["xml"],
-                  "application/xrd+xml" => ["xrd+xml"],
-                  "application/jrd+json" => ["jrd+json"],
-                  "application/activity+json" => ["activity+json"],
-                  "application/ld+json" => ["activity+json"]
-                }
-                config :mime, :extensions, %{
-                  "activity+json" => "application/activity+json"
-                }
-              '';
-            in ''
-              mkdir config
-              cp ${cfgFile} config/config.exs
-            '';
-            postInstall = ''
-              mkdir -p $out/config
-              cp config/config.exs $out/config/config.exs
-            '';
-          };
-        }
-        // (mkOverrides final prev [
-          "ex_aws"
-          "finch"
-          "ex_aws_s3"
-          "plug"
-          "tesla"
-          "cors_plug"
-          "fast_sanitize"
-          "open_api_spex"
-          "phoenix_html"
-          "plug_cowboy"
-          "phoenix_template"
-          "phoenix_view"
-          "websock_adapter"
-          "phoenix"
-          "trailing_format_plug"
-          "phoenix_live_view"
-          "phoenix_live_dashboard"
-          "phoenix_ecto"
-          "remote_ip"
-          "plug_static_index_html"
-          "ueberauth"
-          "swoosh"
-          "phoenix_swoosh"
-          "telemetry_metrics_prometheus"
-        ]);
+          in ''
+            mkdir config
+            cp ${cfgFile} config/config.exs
+          '';
+        };
+      };
     };
 
     passthru = {

akkoma/jxl-polyfill.patch

@@ -1,13 +1,13 @@
 diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex
-index d7cff7343..d09159c4f 100644
+index b1f1ada94..8bae50900 100644
 --- a/lib/pleroma/web/plugs/http_security_plug.ex
 +++ b/lib/pleroma/web/plugs/http_security_plug.ex
-@@ -116,7 +116,7 @@ defp csp_string(conn) do
+@@ -114,7 +114,7 @@ defp csp_string(conn) do
      style_src = "style-src 'self' '#{nonce_tag}'"
      font_src = "font-src 'self'"
  
--    script_src = "script-src 'self' '#{nonce_tag}' "
-+    script_src = "script-src 'self' 'unsafe-eval' '#{nonce_tag}' "
+-    script_src = "script-src 'self' '#{nonce_tag}'"
++    script_src = "script-src 'self' 'unsafe-eval' '#{nonce_tag}'"
  
-     script_src =
-       if @mix_env == :dev do
+     report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"]
+     insecure = if scheme == "https", do: "upgrade-insecure-requests"

akkoma/mix.nix

@@ -13,12 +13,12 @@
   with self; {
     argon2_elixir = buildMix rec {
       name = "argon2_elixir";
-      version = "3.1.0";
+      version = "3.0.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0wyxj4197jnz4z38611f00ym5n3w7hv06l4l3dfid4h2xvhfm3y0";
+        sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb";
       };
 
       beamDeps = [comeonin elixir_make];
@@ -52,12 +52,12 @@
 
     bcrypt_elixir = buildMix rec {
       name = "bcrypt_elixir";
-      version = "3.0.1";
+      version = "2.3.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1kwnzcjf6v4af12nzw5b2fksk1m1fvbxvhclczy1wpb4zdgbjss8";
+        sha256 = "0ybjs37fyn45x31lzhxic4kd4jmzwcwkgy4spwayykbn8rgjs622";
       };
 
       beamDeps = [comeonin elixir_make];
@@ -117,12 +117,12 @@
 
     castore = buildMix rec {
       name = "castore";
-      version = "1.0.3";
+      version = "0.1.22";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8";
+        sha256 = "1b1cl89fzkykimxwgm8mwb9wmxcrd8qk8hfc83pa2npb8zgpcxf1";
       };
 
       beamDeps = [];
@@ -167,6 +167,19 @@
       beamDeps = [];
     };
 
+    concurrent_limiter = buildMix rec {
+      name = "concurrent_limiter";
+      version = "0.1.1";
+
+      src = fetchHex {
+        pkg = "${name}";
+        version = "${version}";
+        sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk";
+      };
+
+      beamDeps = [telemetry];
+    };
+
     connection = buildMix rec {
       name = "connection";
       version = "1.1.0";
@@ -182,12 +195,12 @@
 
     cors_plug = buildMix rec {
       name = "cors_plug";
-      version = "3.0.3";
+      version = "2.0.3";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z";
+        sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf";
       };
 
       beamDeps = [plug];
@@ -195,12 +208,12 @@
 
     cowboy = buildErlangMk rec {
       name = "cowboy";
-      version = "2.10.0";
+      version = "2.9.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0sqxqjdykxc2ai9cvkc0xjwkvr80z98wzlqlrd1z3iiw32vwrz9s";
+        sha256 = "1phv0a1zbgk7imfgcm0dlacm7hbjcdygb0pqmx4s26jf9f9rywic";
       };
 
       beamDeps = [cowlib ranch];
@@ -208,12 +221,12 @@
 
     cowboy_telemetry = buildRebar3 rec {
       name = "cowboy_telemetry";
-      version = "0.4.0";
+      version = "0.3.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x";
+        sha256 = "1bzhcdq12p837cii2jgvzjyrffiwgm5bsb1pra2an3hkcqrzsvis";
       };
 
       beamDeps = [cowboy telemetry];
@@ -221,30 +234,17 @@
 
     cowlib = buildRebar3 rec {
       name = "cowlib";
-      version = "2.12.1";
+      version = "2.11.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1c4dgi8canscyjgddp22mjc69znvwy44wk3r7jrl2wvs6vv76fqn";
+        sha256 = "1ac6pj3x4vdbsa8hvmbzpdfc4k0v1p102jbd39snai8wnah9sgib";
       };
 
       beamDeps = [];
     };
 
-    credo = buildMix rec {
-      name = "credo";
-      version = "1.7.0";
-
-      src = fetchHex {
-        pkg = "${name}";
-        version = "${version}";
-        sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8";
-      };
-
-      beamDeps = [bunt file_system jason];
-    };
-
     custom_base = buildMix rec {
       name = "custom_base";
       version = "0.2.1";
@@ -260,25 +260,25 @@
 
     db_connection = buildMix rec {
       name = "db_connection";
-      version = "2.5.0";
+      version = "2.4.3";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "18jsnmabdjwj3i7ml43ljzrzzvfy1a3bnbaqywgsv7nndji5nbf9";
+        sha256 = "04iwywfqf8k125yfvm084l1mp0bcv82mwih7xlpb7kx61xdw29y1";
       };
 
-      beamDeps = [telemetry];
+      beamDeps = [connection telemetry];
     };
 
     decimal = buildMix rec {
       name = "decimal";
-      version = "2.1.1";
+      version = "2.0.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1k7z418b6cj977wswpxsk5844xrxc1smaiqsmrqpf3pdjzsfbksk";
+        sha256 = "0xzm8hfhn8q02rmg8cpgs68n5jz61wvqg7bxww9i1a6yanf6wril";
       };
 
       beamDeps = [];
@@ -299,12 +299,12 @@
 
     dialyxir = buildMix rec {
       name = "dialyxir";
-      version = "1.3.0";
+      version = "1.2.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0vv90jip2w362n3l7dkhqfdwlz97nwji535kn3fbk3dassya9ch0";
+        sha256 = "0qw4zyd86fjwsav744jvz1wpdbmy9nz645xqr9s1d1bs88v221v1";
       };
 
       beamDeps = [erlex];
@@ -312,12 +312,12 @@
 
     earmark = buildMix rec {
       name = "earmark";
-      version = "1.4.39";
+      version = "1.4.37";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0h547ri1nbxyaisyx7jddg3wib7fpm3q4v914szwvv6bqf79sv0m";
+        sha256 = "01mibj51iys1l289mk2adqs50hfbpfj643mh459nvf4dhq95wvfq";
       };
 
       beamDeps = [earmark_parser];
@@ -325,12 +325,12 @@
 
     earmark_parser = buildMix rec {
       name = "earmark_parser";
-      version = "1.4.33";
+      version = "1.4.31";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid";
+        sha256 = "0nfhxyklbz0ixkl33xqkchqgdzk948dcjikym0vz0pikw1z3cz9i";
       };
 
       beamDeps = [];
@@ -351,12 +351,12 @@
 
     ecto = buildMix rec {
       name = "ecto";
-      version = "3.10.3";
+      version = "3.9.4";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4";
+        sha256 = "0xgfz1pzylj22k0qa8zh4idvd4139b1lwnmq33na8fia2j69hpyy";
       };
 
       beamDeps = [decimal jason telemetry];
@@ -377,12 +377,12 @@
 
     ecto_psql_extras = buildMix rec {
       name = "ecto_psql_extras";
-      version = "0.7.12";
+      version = "0.7.10";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0k3iczvfj7m77170falil6h49r4hih1p54m952j37q2cnw81s7aa";
+        sha256 = "123h3s4zpk5q618rcxlfz4axj3rz3cmyk68gps8c05sg3vc8qpjh";
       };
 
       beamDeps = [ecto_sql postgrex table_rex];
@@ -390,12 +390,12 @@
 
     ecto_sql = buildMix rec {
       name = "ecto_sql";
-      version = "3.10.1";
+      version = "3.9.2";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0sy5277akp828hvcg60yxhpfgj543y2z1bqy2z414pv9ppdmp8pn";
+        sha256 = "0w1zplm8ndf10dwxffg60iwzvbz3hyyiy761x91cvnwg6nsfxd8y";
       };
 
       beamDeps = [db_connection ecto postgrex telemetry];
@@ -403,28 +403,15 @@
 
     elixir_make = buildMix rec {
       name = "elixir_make";
-      version = "0.7.7";
+      version = "0.6.3";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0v3y9i3bif14486dliwn9arwd0pcp4nv24gjwnxm5b8gjpzrzhav";
+        sha256 = "05ppvbhqi5m9zk1c4xnrki814sqhxrc7d1dpvfmwm2v7qm8xdjzm";
       };
 
-      beamDeps = [castore];
-    };
-
-    elixir_xml_to_map = buildMix rec {
-      name = "elixir_xml_to_map";
-      version = "3.0.0";
-
-      src = fetchHex {
-        pkg = "${name}";
-        version = "${version}";
-        sha256 = "1fzg8z42g7bg0m16mspxwk3f3c5x5ncird32crxdpy19y3bjs8hi";
-      };
-
-      beamDeps = [erlsom];
+      beamDeps = [];
     };
 
     erlex = buildMix rec {
@@ -440,19 +427,6 @@
       beamDeps = [];
     };
 
-    erlsom = buildRebar3 rec {
-      name = "erlsom";
-      version = "1.5.1";
-
-      src = fetchHex {
-        pkg = "${name}";
-        version = "${version}";
-        sha256 = "1srr89dxyzjf0zhipv1r90bzmb8s2h7w8sk54z8lv165jia4hrbr";
-      };
-
-      beamDeps = [];
-    };
-
     eternal = buildMix rec {
       name = "eternal";
       version = "1.2.2";
@@ -468,15 +442,15 @@
 
     ex_aws = buildMix rec {
       name = "ex_aws";
-      version = "2.4.4";
+      version = "2.1.9";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1iqxr74m7wwqbjkrzrm6xs2ri9kshabh1wpk0jw6zcd2bi43xmm7";
+        sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y";
       };
 
-      beamDeps = [hackney jason mime sweet_xml telemetry];
+      beamDeps = [hackney jason sweet_xml];
     };
 
     ex_aws_s3 = buildMix rec {
@@ -507,12 +481,12 @@
 
     ex_doc = buildMix rec {
       name = "ex_doc";
-      version = "0.30.5";
+      version = "0.29.2";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1rnqv7b0g5jwqb5ssf4bz7xk8imyxfkg8bg2yzpfy75rvhay38c8";
+        sha256 = "1bq37vm5sc46k75n1m6h1n42r3czj957xqjh68z7b2m1xlwp2pbb";
       };
 
       beamDeps = [earmark_parser makeup_elixir makeup_erlang];
@@ -533,51 +507,38 @@
 
     ex_syslogger = buildMix rec {
       name = "ex_syslogger";
-      version = "2.0.0";
+      version = "1.5.2";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "17h1p3l3a3icqlkyxglw4wwqxxhjb1indas9s7nfdsb42zkjyax5";
+        sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb";
       };
 
-      beamDeps = [jason syslog];
+      beamDeps = [poison syslog];
     };
 
     excoveralls = buildMix rec {
       name = "excoveralls";
-      version = "0.16.1";
+      version = "0.15.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0f7i5gx1rpswbqmmqv133v3lpjwpkhjb2k56fmqcy210ir367rys";
+        sha256 = "1rq7vqvzw7sa2r7n59bhbxbhcnjr6z44dkvq45mdb0h01kcnnhgq";
       };
 
       beamDeps = [hackney jason];
     };
 
-    expo = buildMix rec {
-      name = "expo";
-      version = "0.4.1";
-
-      src = fetchHex {
-        pkg = "${name}";
-        version = "${version}";
-        sha256 = "0iyfl4vppfhmimfqaracjza9a6y8rgia03sm28y5934cg5xbmxrg";
-      };
-
-      beamDeps = [];
-    };
-
     fast_html = buildMix rec {
       name = "fast_html";
-      version = "2.2.0";
+      version = "2.0.5";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06";
+        sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0";
       };
 
       beamDeps = [elixir_make nimble_pool];
@@ -611,12 +572,12 @@
 
     finch = buildMix rec {
       name = "finch";
-      version = "0.16.0";
+      version = "0.14.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1iayffbjzb1rcy1p0wibzv6j5n7dc16ha5lhcbn5z7ji9m61fq7n";
+        sha256 = "1pd805jyd4qbpb2md3kw443325yqynpkpyr2iixb9zf432psqnal";
       };
 
       beamDeps = [castore mime mint nimble_options nimble_pool telemetry];
@@ -637,12 +598,12 @@
 
     floki = buildMix rec {
       name = "floki";
-      version = "0.34.3";
+      version = "0.34.2";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm";
+        sha256 = "1j6ilik6pviff34rrqr8456h7pp0qlash731pv36ny811w7xbf96";
       };
 
       beamDeps = [];
@@ -650,28 +611,28 @@
 
     gen_smtp = buildRebar3 rec {
       name = "gen_smtp";
-      version = "1.2.0";
+      version = "0.15.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y";
+        sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99";
       };
 
-      beamDeps = [ranch];
+      beamDeps = [];
     };
 
     gettext = buildMix rec {
       name = "gettext";
-      version = "0.22.3";
+      version = "0.20.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1gb49f75apkgfa5ddg02x08w1i3qm31jifzicrl4m58kfx226pwk";
+        sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw";
       };
 
-      beamDeps = [expo];
+      beamDeps = [];
     };
 
     hackney = buildRebar3 rec {
@@ -713,6 +674,19 @@
       beamDeps = [];
     };
 
+    http_signatures = buildMix rec {
+      name = "http_signatures";
+      version = "0.1.1";
+
+      src = fetchHex {
+        pkg = "${name}";
+        version = "${version}";
+        sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc";
+      };
+
+      beamDeps = [];
+    };
+
     httpoison = buildMix rec {
       name = "httpoison";
       version = "1.8.2";
@@ -754,12 +728,12 @@
 
     jason = buildMix rec {
       name = "jason";
-      version = "1.4.1";
+      version = "1.4.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v";
+        sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr";
       };
 
       beamDeps = [decimal];
@@ -780,12 +754,12 @@
 
     jose = buildMix rec {
       name = "jose";
-      version = "1.11.6";
+      version = "1.11.5";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2";
+        sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw";
       };
 
       beamDeps = [];
@@ -806,17 +780,30 @@
 
     mail = buildMix rec {
       name = "mail";
-      version = "0.3.1";
+      version = "0.2.3";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "19jjwflgapmkj8la58fqm368fxaqrnqmfavb57xdbhb5k3l03dqx";
+        sha256 = "1xbbdkyar8h0pdihfnsd84j1w3vfh9sk3xkz1llxz7y6m67kjawk";
       };
 
       beamDeps = [];
     };
 
+    majic = buildMix rec {
+      name = "majic";
+      version = "1.0.0";
+
+      src = fetchHex {
+        pkg = "${name}";
+        version = "${version}";
+        sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br";
+      };
+
+      beamDeps = [elixir_make mime nimble_pool plug];
+    };
+
     makeup = buildMix rec {
       name = "makeup";
       version = "1.1.0";
@@ -832,12 +819,12 @@
 
     makeup_elixir = buildMix rec {
       name = "makeup_elixir";
-      version = "0.16.1";
+      version = "0.16.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1ik7qw0d5xyc7dv3n33qxl49jfk92l565lbv1zc9n80vmm0s69z1";
+        sha256 = "1rrqydcq2bshs577z7jbgdnrlg7cpnzc8n48kap4c2ln2gfcpci8";
       };
 
       beamDeps = [makeup nimble_parsec];
@@ -845,12 +832,12 @@
 
     makeup_erlang = buildMix rec {
       name = "makeup_erlang";
-      version = "0.1.2";
+      version = "0.1.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk";
+        sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p";
       };
 
       beamDeps = [makeup];
@@ -884,12 +871,12 @@
 
     mime = buildMix rec {
       name = "mime";
-      version = "2.0.5";
+      version = "1.6.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0p50h0ki8ay5sraiqxiajgwy1829bvyagj65bj9wjny4cnin83fs";
+        sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i";
       };
 
       beamDeps = [];
@@ -923,12 +910,12 @@
 
     mock = buildMix rec {
       name = "mock";
-      version = "0.3.8";
+      version = "0.3.7";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z";
+        sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d";
       };
 
       beamDeps = [meck];
@@ -936,12 +923,12 @@
 
     mogrify = buildMix rec {
       name = "mogrify";
-      version = "0.9.3";
+      version = "0.9.2";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281";
+        sha256 = "17b9dy40rq3rwn7crjggjafibxz4ys4nqq81adcf486af3yi13f1";
       };
 
       beamDeps = [];
@@ -962,12 +949,12 @@
 
     nimble_options = buildMix rec {
       name = "nimble_options";
-      version = "1.0.2";
+      version = "0.5.2";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1f7ih1rnkvph0daf4lsv4rrp6dpccksjd7rh5bhnq0r143dsh4px";
+        sha256 = "1q6wa2ljprybfb9w2zg0gbppiwsnimgw5kcvakdp3z8mp42gk9sd";
       };
 
       beamDeps = [];
@@ -975,12 +962,12 @@
 
     nimble_parsec = buildMix rec {
       name = "nimble_parsec";
-      version = "1.3.1";
+      version = "1.2.3";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6";
+        sha256 = "1c3hnppmjkwnqrc9vvm72kpliav0mqyyk4cjp7vsqccikgiqkmy8";
       };
 
       beamDeps = [];
@@ -988,12 +975,12 @@
 
     nimble_pool = buildMix rec {
       name = "nimble_pool";
-      version = "1.0.0";
+      version = "0.2.6";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0ymn22kj8jkyx1xjh2ldz65s4lhr3f70g1v04n11hd9d5n43pgl0";
+        sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w";
       };
 
       beamDeps = [];
@@ -1001,12 +988,12 @@
 
     oban = buildMix rec {
       name = "oban";
-      version = "2.15.4";
+      version = "2.12.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1707222miq6di3605cqyfcgdy6i0wlb3326z928kxcgzvwgn3kjz";
+        sha256 = "0n6h8a6v9hzk6s5dhadfbrvwnx2nkl64n575ff5ph3afnz14864v";
       };
 
       beamDeps = [ecto_sql jason postgrex telemetry];
@@ -1014,12 +1001,12 @@
 
     open_api_spex = buildMix rec {
       name = "open_api_spex";
-      version = "3.17.3";
+      version = "3.16.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1zphp59dd3l4l8279pjmhbddskimbgrr123wivycz0yahldb4p8n";
+        sha256 = "1yyvvyzzi6k2l55fl4wijhrzzdjns95asxcbnikgh6hjmiwdfvzg";
       };
 
       beamDeps = [jason plug poison];
@@ -1040,25 +1027,25 @@
 
     phoenix = buildMix rec {
       name = "phoenix";
-      version = "1.7.7";
+      version = "1.6.16";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "119h8lcvarlm7xrlrb301wgrd3plwwmbvl3f3dckfpjy75ff2rl9";
+        sha256 = "0fdca3h6k9plv1qvch6zyl6wbnfhp8jisvggjmmsjw7n6kzqjng1";
       };
 
-      beamDeps = [castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter];
+      beamDeps = [castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry];
     };
 
     phoenix_ecto = buildMix rec {
       name = "phoenix_ecto";
-      version = "4.4.2";
+      version = "4.4.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h";
+        sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9";
       };
 
       beamDeps = [ecto phoenix_html plug];
@@ -1066,12 +1053,12 @@
 
     phoenix_html = buildMix rec {
       name = "phoenix_html";
-      version = "3.3.2";
+      version = "3.3.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "07d1x5nyk9qahqhyc7785774cyfwm07nnjr8kpxj073wcs7azba4";
+        sha256 = "1lyhagjpg4lran6431csgkvf28g50mdvh4mlsxgs21j9vmp91ldy";
       };
 
       beamDeps = [plug];
@@ -1092,12 +1079,12 @@
 
     phoenix_live_view = buildMix rec {
       name = "phoenix_live_view";
-      version = "0.18.18";
+      version = "0.18.17";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "052jv2kbc2nb4qs4ly4idcai6q8wyfkvv59adpg9w67kf820v0d5";
+        sha256 = "0f6f7m2naw85qgzh3bsrnwy7l1lwffsbmx3s7g4qv6x234773dgl";
       };
 
       beamDeps = [jason phoenix phoenix_html phoenix_template phoenix_view telemetry];
@@ -1105,12 +1092,12 @@
 
     phoenix_pubsub = buildMix rec {
       name = "phoenix_pubsub";
-      version = "2.1.3";
+      version = "2.1.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v";
+        sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1";
       };
 
       beamDeps = [];
@@ -1118,25 +1105,25 @@
 
     phoenix_swoosh = buildMix rec {
       name = "phoenix_swoosh";
-      version = "1.2.0";
+      version = "0.3.4";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8";
+        sha256 = "072pa2rnzkvw645f3jh15rmgsnzccbyqjx1wbsmj28138qc24w9r";
       };
 
-      beamDeps = [finch hackney phoenix phoenix_html phoenix_view swoosh];
+      beamDeps = [hackney phoenix phoenix_html swoosh];
     };
 
     phoenix_template = buildMix rec {
       name = "phoenix_template";
-      version = "1.0.3";
+      version = "1.0.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n";
+        sha256 = "1vlkd4z2bxinczwcysydidpnh49rpxjihb5k3k4k8qr2yrwc0z8m";
       };
 
       beamDeps = [phoenix_html];
@@ -1157,12 +1144,12 @@
 
     plug = buildMix rec {
       name = "plug";
-      version = "1.14.2";
+      version = "1.14.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "04wdyv6nma74bj1m49vkm2bc5mjf8zclfg957fng8g71hw0wabw4";
+        sha256 = "056wkb1b17mh5h9ncs2vbswvpjsm2iqc580nmyrvgznlqwr080mz";
       };
 
       beamDeps = [mime plug_crypto telemetry];
@@ -1170,12 +1157,12 @@
 
     plug_cowboy = buildMix rec {
       name = "plug_cowboy";
-      version = "2.6.1";
+      version = "2.6.0";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "04v6xc4v741dr2y38j66fmcc4xc037dnaxzkj2vih6j53yif2dny";
+        sha256 = "19jgv5dm53hv5aqgxxzr3fnrpgfll9ics199swp6iriwfl5z4g07";
       };
 
       beamDeps = [cowboy cowboy_telemetry plug];
@@ -1183,12 +1170,12 @@
 
     plug_crypto = buildMix rec {
       name = "plug_crypto";
-      version = "1.2.5";
+      version = "1.2.4";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0hnqgzc3zas7j7wycgnkkdhaji5farkqccy2n4p1gqj5ccfrlm16";
+        sha256 = "1k0sx7c64icxcvgvccnpcszqrjg9a75i535ym6flvjdf7zq1br2d";
       };
 
       beamDeps = [];
@@ -1235,15 +1222,15 @@
 
     postgrex = buildMix rec {
       name = "postgrex";
-      version = "0.17.2";
+      version = "0.16.5";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "036r3q250vrhj4nmyr4cc40krjgbyci18qkhppvkj7akx6liiac0";
+        sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd";
       };
 
-      beamDeps = [db_connection decimal jason];
+      beamDeps = [connection db_connection decimal jason];
     };
 
     pot = buildRebar3 rec {
@@ -1313,12 +1300,12 @@
 
     ssl_verify_fun = buildRebar3 rec {
       name = "ssl_verify_fun";
-      version = "1.1.7";
+      version = "1.1.6";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y";
+        sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x";
       };
 
       beamDeps = [];
@@ -1352,12 +1339,12 @@
 
     swoosh = buildMix rec {
       name = "swoosh";
-      version = "1.11.5";
+      version = "1.9.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0h00h0ml8s6ca72ihq1bn4dj4aqldpapc7p1pg9mcbwdsvf5gvi1";
+        sha256 = "07ipsrp34s18c9zd5kglqsdc8z7gxa9aadsrklj0zf6azzrzzpvn";
       };
 
       beamDeps = [cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry];
@@ -1391,12 +1378,12 @@
 
     telemetry = buildRebar3 rec {
       name = "telemetry";
-      version = "1.2.1";
+      version = "0.4.3";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs";
+        sha256 = "0hc0fr2bh97wah9ycpm7hb5jdqr5hnl1s3b2ibbbx9gxbwvbhwpb";
       };
 
       beamDeps = [];
@@ -1443,12 +1430,12 @@
 
     telemetry_poller = buildRebar3 rec {
       name = "telemetry_poller";
-      version = "1.0.0";
+      version = "0.5.1";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk";
+        sha256 = "1m1zcq65yz0wp1wx7mcy2iq37cyizbzrmv0c11x6xg0hj8375asc";
       };
 
       beamDeps = [telemetry];
@@ -1456,12 +1443,12 @@
 
     tesla = buildMix rec {
       name = "tesla";
-      version = "1.7.0";
+      version = "1.4.4";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f";
+        sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m";
       };
 
       beamDeps = [castore finch hackney jason mime mint poison telemetry];
@@ -1469,12 +1456,12 @@
 
     timex = buildMix rec {
       name = "timex";
-      version = "3.7.11";
+      version = "3.7.9";
 
       src = fetchHex {
         pkg = "${name}";
         version = "${version}";
-        sha256 = "1anijimbrb3ngdy6fdspr8c9hz6dip7nakx0gayzkfmsxzvj944b";
+        sha256 = "1q8chs28k5my6nzzm61rhc2l9wkhzfn0kiqzf87i71xvwn11asb4";
       };
 
       beamDeps = [combine gettext tzdata];
@@ -1571,32 +1558,6 @@
       beamDeps = [httpoison jose];
     };
 
-    websock = buildMix rec {
-      name = "websock";
-      version = "0.5.2";
-
-      src = fetchHex {
-        pkg = "${name}";
-        version = "${version}";
-        sha256 = "01gzcvz86x4hxk5d50qz38nkmi1fakyn5yw0m7gi6s6a5zi5spwj";
-      };
-
-      beamDeps = [];
-    };
-
-    websock_adapter = buildMix rec {
-      name = "websock_adapter";
-      version = "0.5.3";
-
-      src = fetchHex {
-        pkg = "${name}";
-        version = "${version}";
-        sha256 = "0g8djd6l1yq8s84y4r3938dczvjs6jgxjbdm0ah6wszqq4abirfb";
-      };
-
-      beamDeps = [plug plug_cowboy websock];
-    };
-
     websockex = buildMix rec {
       name = "websockex";
       version = "0.4.3";

akkoma/pleroma-fe/default.nix

@@ -18,15 +18,15 @@
     src = fetchFromGitea {
       domain = "akkoma.dev";
       owner = "AkkomaGang";
-      repo = "akkoma-fe";
+      repo = "pleroma-fe";
       inherit (source) rev sha256;
     };
-    patches = [./akkoma-fe.patch ./jxl-polyfill.patch];
+    patches = [./pleroma-fe.patch ./jxl-polyfill.patch];
   };
   nodeOptions = callPackage ../../lib/opensslLegacyProvider.nix {};
 in
   mkYarnPackage rec {
-    pname = "akkoma-fe";
+    pname = "pleroma-fe";
     version = source.date;
     inherit src;
     packageJSON = ./package.json;
@@ -61,18 +61,18 @@ in
       find $out -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \;
     '';
     passthru = {
-      updateScript = writeScript "update-akkoma-fe" ''
-        ${../../scripts/update-git.sh} https://akkoma.dev/AkkomaGang/akkoma-fe.git akkoma/akkoma-fe/source.json
-        if [ "$(git diff -- akkoma/akkoma-fe/source.json)" ]; then
+      updateScript = writeScript "update-pleroma-fe" ''
+        ${../../scripts/update-git.sh} https://akkoma.dev/AkkomaGang/pleroma-fe.git akkoma/pleroma-fe/source.json
+        if [ "$(git diff -- akkoma/pleroma-fe/source.json)" ]; then
           SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
-          ${../../scripts/update-yarn.sh} $SRC_PATH akkoma/akkoma-fe
+          ${../../scripts/update-yarn.sh} $SRC_PATH akkoma/pleroma-fe
         fi
       '';
     };
 
     meta = with lib; {
-      description = "Frontend for Akkoma and akkoma";
-      homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
+      description = "Frontend for Akkoma and Pleroma";
+      homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/";
       license = licenses.agpl3;
     };
   }

akkoma/pleroma-fe/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "3.10.0",
+  "version": "3.5.0",
   "description": "A frontend for Akkoma instances",
   "author": "Roger Braun <roger@rogerbraun.net>",
   "private": true,

akkoma/pleroma-fe/source.json

@@ -0,0 +1,11 @@
+{
+  "url": "https://akkoma.dev/AkkomaGang/pleroma-fe.git",
+  "rev": "7e1b1e79f48fea0b7af80b36948c767234ac80db",
+  "date": "2023-03-18T20:22:47+00:00",
+  "path": "/nix/store/vc5wfm24yhx37z9ziv54nrgaiah5s54g-pleroma-fe",
+  "sha256": "0vpc55n29kxhpdlm5lf9fjy4d8rhpcqdmgy5p0ygb357ja6wp6rd",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

akkoma/source.json

@@ -1,10 +1,9 @@
 {
   "url": "https://akkoma.dev/AkkomaGang/akkoma.git",
-  "rev": "d1af78aba11a20da17bbe2a7c0bf303bf30f6323",
-  "date": "2023-09-15T12:00:45+01:00",
-  "path": "/nix/store/5grs03rv9hrjr7q6r6yhsnrkh6xacnrf-akkoma",
-  "sha256": "1v6dmnbn7lr89klgqgfwdvx2qfjvxpn50slzihdgxaslnk5ydfql",
-  "hash": "sha256-FLvmy7RUq/4ajJ9qUOztWzos+m7cPfzoTCjTY5etzew=",
+  "rev": "281c4636fac4425a914ed70f975cea669acf6fe1",
+  "date": "2023-03-21T10:13:41+00:00",
+  "path": "/nix/store/kv5i4g63a0x4pf8mplqqr8569dcbb5gd-akkoma",
+  "sha256": "0j4n9nb8bld59kgdk7bp57qalpa9xrka8kj0pf7c79rxnjqyxj84",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

art/emoji/caro/default.nix

@@ -4,6 +4,7 @@
   imagemagick,
   lib,
   callPackage,
+  oxipng,
   pngquant,
 }: let
   source = builtins.fromJSON (builtins.readFile ./source.json);
@@ -18,6 +19,7 @@ in
     };
     nativeBuildInputs = [
       imagemagick
+      oxipng
       pngquant
     ];
     buildPhase = ''

art/emoji/caro/source.json

@@ -4,7 +4,6 @@
   "date": "2022-04-01T14:18:07+02:00",
   "path": "/nix/store/g7cq22k0q1fhv6jajzmy2k0sl1xmz7n5-CarolineStickers",
   "sha256": "14wgn1jdp698anbkgilf6x90vgkwgls4c17jaa9qqs3fxrj44ij3",
-  "hash": "sha256-Q0ZCZO5uaIyTUvIERjR9fL4NUjeOxjeXVSiZ22Swj5M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

art/emoji/lotte/default.nix

@@ -13,244 +13,76 @@
       src = lotte-art;
       nativeBuildInputs = [libjxl imagemagick];
       buildPhase = ''
-        convert $name.jxl -scale 256x256\> $name-scaled.png
+        djxl $name.jxl $name.png
+        convert $name.png -scale 256x256\> $name-scaled.png
       '';
       installPhase = ''
         cp $name-scaled.png $out
       '';
     };
-  lnEmojiScript = f: ''
+  lnEmojiScript = name: ''
     ln -s ${crushpng {
-      name = f.from;
-      src = resized f.from;
+      inherit name;
+      src = resized name;
       maxsize = 50000;
-    }} $out/${f.to}.png
+    }} $out/${name}.png
   '';
   emoji = [
-    {
-      from = "2019-10-05-dae-lotteheart";
-      to = "lotteheart";
-    }
-    {
-      from = "2019-10-05-dae-lottehearts";
-      to = "lottehearts";
-    }
-    {
-      from = "2019-10-05-dae-lottepet";
-      to = "lottepet";
-    }
-    {
-      from = "2019-11-17-workerq-lottetrash";
-      to = "lottetrashcan";
-    }
-    {
-      from = "2020-01-05-dae-lotteweary";
-      to = "lotteweary";
-    }
-    {
-      from = "2020-01-17-workerq-lotteblep";
-      to = "lotteblep";
-    }
-    {
-      from = "2020-01-17-workerq-lottecoffee";
-      to = "lottecoffee";
-    }
-    {
-      from = "2020-01-17-workerq-lottecookie";
-      to = "lottecookie";
-    }
-    {
-      from = "2020-01-17-workerq-lottehug";
-      to = "lottehug";
-    }
-    {
-      from = "2020-01-17-workerq-lottesmile";
-      to = "lottesmile";
-    }
-    {
-      from = "2021-03-23-sammythetanuki-lottegoodsalt";
-      to = "lottegoods";
-    }
-    {
-      from = "2021-03-26-zomlette-agender-screem-tp";
-      to = "lottescreem";
-    }
-    {
-      from = "2021-04-21-sammythetanuki-lottecoffeemachine";
-      to = "lottecoffeemachine";
-    }
-    {
-      from = "2021-05-03-sammythetanuki-lotteflatfuck";
-      to = "lotteflatfuck";
-    }
-    {
-      from = "2021-05-03-sammythetanuki-lottehug";
-      to = "lottehug2";
-    }
-    {
-      from = "2021-05-03-sammythetanuki-lottesnuggle";
-      to = "lottesnuggle";
-    }
-    {
-      from = "2021-05-03-sammythetanuki-lottetrash";
-      to = "lottetrashwave";
-    }
-    {
-      from = "2021-05-04-mizuki-lotteshocked-sticker";
-      to = "lotteshocked";
-    }
-    {
-      from = "2021-05-29-sammythetanuki-lottepizza";
-      to = "lottepizza";
-    }
-    {
-      from = "2021-07-02-sammythetanuki-lottegrab";
-      to = "lottegrab";
-    }
-    {
-      from = "2021-07-16-sammythetanuki-lottecarostacc";
-      to = "lottecarostacc";
-    }
-    {
-      from = "2021-08-03-sammythetanuki-everyonesproblem";
-      to = "lotteveryonesproblem";
-    }
-    {
-      from = "2021-08-20-mizuki-peekabu-sticker";
-      to = "lottepeekabu";
-    }
-    {
-      from = "2021-09-13-sammythetanuki-plushhug";
-      to = "lotteplushhug";
-    }
-    {
-      from = "2021-10-28-pulexart-me-climbTree";
-      to = "lotteclimbtree";
-    }
-    {
-      from = "2021-10-28-pulexart-me-dab";
-      to = "lottedab";
-    }
-    {
-      from = "2021-10-28-pulexart-me-eatingPopcorn";
-      to = "lotteeatingpopcorn";
-    }
-    {
-      from = "2021-10-28-pulexart-me-flirt";
-      to = "lotteflirt";
-    }
-    {
-      from = "2021-10-28-pulexart-me-garbage";
-      to = "lottegarbage";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartAce";
-      to = "lotteheartace";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartAgender";
-      to = "lotteheartagender";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartLGBT";
-      to = "lotteheartlgbt";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartNonbinary";
-      to = "lotteheartnonbinary";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartNormal";
-      to = "lotteheartnormal";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartRaccoongender";
-      to = "lotteheartraccoongender";
-    }
-    {
-      from = "2021-10-28-pulexart-me-heartTrans";
-      to = "lottehearttrans";
-    }
-    {
-      from = "2021-10-28-pulexart-me-money";
-      to = "lottemoney";
-    }
-    {
-      from = "2021-10-28-pulexart-me-noU";
-      to = "lottenou";
-    }
-    {
-      from = "2021-10-28-pulexart-me-plotting";
-      to = "lotteplotting";
-    }
-    {
-      from = "2021-10-28-pulexart-me-praise";
-      to = "lottepraise";
-    }
-    {
-      from = "2021-10-28-pulexart-me-robber";
-      to = "lotterobber";
-    }
-    {
-      from = "2021-10-28-pulexart-me-sleepy";
-      to = "lottesleepy";
-    }
-    {
-      from = "2021-10-28-pulexart-me-sneak";
-      to = "lottesneak";
-    }
-    {
-      from = "2021-10-28-pulexart-me-trash";
-      to = "lottetrashcan2";
-    }
-    {
-      from = "2021-10-28-pulexart-me-washingFood";
-      to = "lottewashingfood";
-    }
-    {
-      from = "2021-11-14-sammythetanuki-lottepat";
-      to = "lottepat";
-    }
-    {
-      from = "2021-12-18-sammythetanuki-lottecookies";
-      to = "lottecookies";
-    }
-    {
-      from = "2021-12-20-sammythetanuki-lottecrimmus";
-      to = "lottecrimmus";
-    }
-    {
-      from = "2022-01-08-sammythetanuki-lotteangry";
-      to = "lotteangry";
-    }
-    {
-      from = "2022-01-08-sammythetanuki-lottepleading";
-      to = "lottepleading";
-    }
-    {
-      from = "2022-02-20-sammythetanuki-lottehacking-notext";
-      to = "lottehacking";
-    }
-    {
-      from = "2022-05-05-sammythetanuki-lotteass";
-      to = "lotteass";
-    }
-    {
-      from = "2022-06-13-sammythetanuki-lotteplushnothoughts";
-      to = "lotteplushnothoughts";
-    }
-    {
-      from = "2022-07-14-sammythetanuki-maybecringe-transparent";
-      to = "lottemaybecringe";
-    }
-    {
-      from = "2022-11-06-pulexart-me-heartTherian";
-      to = "lottehearttherian";
-    }
-    {
-      from = "2022-11-10-mizuki-peekabu";
-      to = "lottepeekabudiaper";
-    }
+    "2019-10-05-dae-lotteheart"
+    "2019-10-05-dae-lottehearts"
+    "2019-10-05-dae-lottepet"
+    "2019-11-17-workerq-lottetrash"
+    "2020-01-05-dae-lotteweary"
+    "2020-01-17-workerq-lotteblep"
+    "2020-01-17-workerq-lottecoffee"
+    "2020-01-17-workerq-lottecookie"
+    "2020-01-17-workerq-lottehug"
+    "2020-01-17-workerq-lottesmile"
+    "2021-03-23-sammythetanuki-lottegoodsalt"
+    "2021-03-26-zomlette-agender-screem-tp"
+    "2021-04-21-sammythetanuki-lottecoffeemachine"
+    "2021-05-03-sammythetanuki-lotteflatfuck"
+    "2021-05-03-sammythetanuki-lottehug"
+    "2021-05-03-sammythetanuki-lottesnuggle"
+    "2021-05-03-sammythetanuki-lottetrash"
+    "2021-05-04-mizuki-lotteshocked-sticker"
+    "2021-05-29-sammythetanuki-lottepizza"
+    "2021-07-02-sammythetanuki-lottegrab"
+    "2021-07-16-sammythetanuki-lottecarostacc"
+    "2021-08-03-sammythetanuki-everyonesproblem"
+    "2021-08-20-mizuki-peekabu-sticker"
+    "2021-09-13-sammythetanuki-plushhug"
+    "2021-10-28-pulexart-me-climbTree"
+    "2021-10-28-pulexart-me-dab"
+    "2021-10-28-pulexart-me-eatingPopcorn"
+    "2021-10-28-pulexart-me-flirt"
+    "2021-10-28-pulexart-me-garbage"
+    "2021-10-28-pulexart-me-heartAce"
+    "2021-10-28-pulexart-me-heartAgender"
+    "2021-10-28-pulexart-me-heartLGBT"
+    "2021-10-28-pulexart-me-heartNonbinary"
+    "2021-10-28-pulexart-me-heartNormal"
+    "2021-10-28-pulexart-me-heartRaccoongender"
+    "2021-10-28-pulexart-me-heartTrans"
+    "2021-10-28-pulexart-me-money"
+    "2021-10-28-pulexart-me-noU"
+    "2021-10-28-pulexart-me-plotting"
+    "2021-10-28-pulexart-me-praise"
+    "2021-10-28-pulexart-me-robber"
+    "2021-10-28-pulexart-me-sleepy"
+    "2021-10-28-pulexart-me-sneak"
+    "2021-10-28-pulexart-me-trash"
+    "2021-10-28-pulexart-me-washingFood"
+    "2021-12-18-sammythetanuki-lottecookies"
+    "2021-12-20-sammythetanuki-lottecrimmus"
+    "2022-01-08-sammythetanuki-lotteangry"
+    "2022-01-08-sammythetanuki-lottepleading"
+    "2022-02-20-sammythetanuki-lottehacking-notext"
+    "2022-05-05-sammythetanuki-lotteass"
+    "2022-06-13-sammythetanuki-lotteplushnothoughts"
+    "2022-07-14-sammythetanuki-maybecringe-transparent"
+    "2022-11-06-pulexart-me-heartTherian"
+    "2022-11-10-mizuki-peekabu"
   ];
 in
   stdenvNoCC.mkDerivation {

art/emoji/volpeon/drgn.json

@@ -1,10 +1,10 @@
 {
   "drgn": {
-    "description": "Character by @volpeon@is-a.wyvern.rip",
+    "description": "Character by @volpeon@mk.vulpes.one",
     "files": "drgn.json",
     "homepage": "https://volpeon.ink/projects/emojis/drgn/",
     "src": "https://volpeon.ink/projects/emojis/drgn/drgn.zip",
-    "src_sha256": "2ad8d62e91bb8b10e5d3965535c98cbb5dedd120f692f5fa70e217fc9b619b0d",
+    "src_sha256": "d20291131147dcd3d3ca1dafbda9c9aa98352319a9046a53e1ee7ea8b7055ce5",
     "license": "CC BY-NC-SA 4.0"
   }
 }

art/emoji/volpeon/gphn.json

@@ -1,10 +1,10 @@
 {
   "gphn": {
-    "description": "Character by @volpeon@is-a.wyvern.rip",
+    "description": "Character by @volpeon@mk.vulpes.one",
     "files": "gphn.json",
     "homepage": "https://volpeon.ink/projects/emojis/gphn/",
     "src": "https://volpeon.ink/projects/emojis/gphn/gphn.zip",
-    "src_sha256": "810e5ce897918dd669c17a712276840562b901fc9f725383301175709442372a",
+    "src_sha256": "589050fa11ab9f631836e56a8bd5bfb309defee93fc3674d68b810c5e5b83aa2",
     "license": "CC BY-NC-SA 4.0"
   }
 }

art/emoji/volpeon/gphn.nix

@@ -2,9 +2,9 @@
 callPackage ../../../lib/mkPleromaEmoji.nix {} rec {
   name = "gphn";
   manifest = ./${name}.json;
-  passthru.updateScript = [
-    ../../../scripts/update-json.sh
-    "https://volpeon.ink/projects/emojis/${name}/manifest.json"
-    "art/emoji/volpeon/${name}.json"
-  ];
+  # passthru.updateScript = [
+  # ../../../scripts/update-json.sh
+  #"https://volpeon.ink/projects/emojis/${name}/manifest.json"
+  #"art/emoji/volpeon/${name}.json"
+  #];
 }

art/emoji/volpeon/neocat.json

@@ -1,10 +0,0 @@
-{
-  "neocat": {
-    "description": "Character by @volpeon@is-a.wyvern.rip",
-    "files": "neocat.json",
-    "homepage": "https://volpeon.ink/projects/emojis/neocat/",
-    "src": "https://volpeon.ink/projects/emojis/neocat/neocat.zip",
-    "src_sha256": "6cdf0831d614e27bc8719b67b0d0edc21288f6815dc6ce9254fc647c89a46b0f",
-    "license": "CC BY-NC-SA 4.0"
-  }
-}

art/emoji/volpeon/neocat.nix

@@ -1,10 +0,0 @@
-{callPackage}:
-callPackage ../../../lib/mkPleromaEmoji.nix {} rec {
-  name = "neocat";
-  manifest = ./${name}.json;
-  passthru.updateScript = [
-    ../../../scripts/update-json.sh
-    "https://volpeon.ink/projects/emojis/${name}/manifest.json"
-    "art/emoji/volpeon/${name}.json"
-  ];
-}

art/emoji/volpeon/neofox.json

@@ -1,10 +0,0 @@
-{
-  "neofox": {
-    "description": "Character by @volpeon@is-a.wyvern.rip",
-    "files": "neofox.json",
-    "homepage": "https://volpeon.ink/projects/emojis/neofox/",
-    "src": "https://volpeon.ink/projects/emojis/neofox/neofox.zip",
-    "src_sha256": "5b72752efc6b1c07716da21ea18dd4bafb41e5f4ba79b8eafda16d02ef5c8f30",
-    "license": "CC BY-NC-SA 4.0"
-  }
-}

art/emoji/volpeon/neofox.nix

@@ -1,10 +0,0 @@
-{callPackage}:
-callPackage ../../../lib/mkPleromaEmoji.nix {} rec {
-  name = "neofox";
-  manifest = ./${name}.json;
-  passthru.updateScript = [
-    ../../../scripts/update-json.sh
-    "https://volpeon.ink/projects/emojis/${name}/manifest.json"
-    "art/emoji/volpeon/${name}.json"
-  ];
-}

art/lotte/default.nix

@@ -14,7 +14,7 @@ in
     version = srcInfo.date;
     passthru.updateScript = [
       ../../scripts/update-git.sh
-      "https://git.chir.rs/DarkKirb/lotte-art"
+      "https://git.chir.rs/darkkirb/lotte-art"
       "art/lotte/source.json"
       "--fetch-lfs"
     ];

art/lotte/source.json

@@ -1,10 +1,9 @@
 {
-  "url": "https://git.chir.rs/DarkKirb/lotte-art",
-  "rev": "bbafdeaa46550a25939f9327fbd85ac8ad921bf4",
-  "date": "2023-09-14T16:19:10+01:00",
-  "path": "/nix/store/i26glgmlbz203x5zvshrj4fyb361f7hh-lotte-art",
-  "sha256": "1g4y9n8viayc3qs000cx09gah7rhbgfkjh4ifpw20inmq9jxkyvp",
-  "hash": "sha256-d/vZZcLVRiD4dZFAOd1bMB+oXgKdAQA0HsyruJFNnrw=",
+  "url": "https://git.chir.rs/darkkirb/lotte-art",
+  "rev": "3e40a969696b50a21a8cbf2fb8b3918b24508796",
+  "date": "2023-03-21T07:56:31+01:00",
+  "path": "/nix/store/l6r89w3744m7h97y7gn1ll7sdxk31r66-lotte-art",
+  "sha256": "0sqrh6ch7xbxayc9hsg0mlwxrngavhq2lmapgbmaycf9raz1cwxi",
   "fetchLFS": true,
   "fetchSubmodules": false,
   "deepClone": false,

attic/attic-client.nix

@@ -0,0 +1,11 @@
+{
+  callPackage,
+  lib,
+}:
+((callPackage ./common.nix {}).workspace.attic-client {}).overrideAttrs (super: {
+  meta = with lib; {
+    description = "nix cache server client";
+    homepage = "https://docs.attic.rs/";
+    license = licenses.asl20;
+  };
+})

attic/attic-server.nix

@@ -0,0 +1,21 @@
+{
+  callPackage,
+  lib,
+  writeScript,
+  jq,
+}:
+((callPackage ./common.nix {}).workspace.attic-server {}).overrideAttrs (super: {
+  meta = with lib; {
+    attic-client = pkgs.callPackage ./attic/attic-client.nix {};
+    description = "nix cache server";
+    homepage = "https://docs.attic.rs/";
+    license = licenses.asl20;
+  };
+  passthru.updateScript = writeScript "update-attic" ''
+    ${../scripts/update-git.sh} https://github.com/zhaofengli/attic attic/source.json
+    if [ "$(git diff -- attic/source.json)" ]; then
+      SRC_PATH=$(${jq} -r '.source' attic/source.json)
+      ${../scripts/update-cargo.sh} $SRC_PATH attic/
+    fi
+  '';
+})

attic/common.nix

@@ -0,0 +1,59 @@
+{
+  stdenvNoCC,
+  rustBuilder,
+  fetchFromGitHub,
+  fetchzip,
+}: let
+  sourceJson = builtins.fromJSON (builtins.readFile ./source.json);
+  source = stdenvNoCC.mkDerivation {
+    pname = "attic-source";
+    version = sourceJson.date;
+    src = fetchFromGitHub {
+      owner = "zhaofengli";
+      repo = "attic";
+      inherit (sourceJson) rev sha256;
+    };
+    buildPhase = "true";
+    installPhase = ''
+      cp -rv $src $out
+      chmod -R +w $out
+      cp ${./Cargo.lock} $out
+    '';
+  };
+
+  rustCxxHeader = stdenvNoCC.mkDerivation {
+    pname = "cxx-headers";
+    version = "1.0.93";
+    src = fetchzip {
+              extension = "tar.gz";
+              url = "https://crates.io/api/v1/crates/cxx/1.0.93/download";
+              sha256 = "sha256-YRmV+d9EwX5D68paAMgl+nUVPdLtoh2uiAlQB5idUy4=";
+            };
+    buildPhase = "";
+    installPhase = ''
+      mkdir -p $out/include/rust
+      cp include/cxx.h $out/include/rust
+    '';
+  };
+in
+  rustBuilder.makePackageSet {
+    rustChannel = "stable";
+    rustVersion = "latest";
+    packageOverrides = pkgs: pkgs.rustBuilder.overrides.all ++ [
+      (pkgs.rustBuilder.rustLib.makeOverride {
+        name = "attic";
+        overrideAttrs = drv: {
+          propagatedBuildInputs = drv.propagatedBuildInputs or [] ++ [
+            pkgs.nix.dev
+            pkgs.boost.dev
+            rustCxxHeader
+            pkgs.libclang.lib
+          ];
+          LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
+          BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.nix.dev}/include -I${pkgs.gcc-unwrapped}/include/c++/${pkgs.gcc.version} -I${pkgs.gcc-unwrapped}/include/c++/${pkgs.gcc.version}/${pkgs.targetPlatform.config} -I${pkgs.glibc.dev}/include -I${pkgs.boost.dev}/include -I${pkgs.nlohmann_json}/include -I${pkgs.gcc-unwrapped}/lib/gcc/${pkgs.targetPlatform.config}/${pkgs.gcc.version}/include -I${pkgs.gcc-unwrapped}/lib/gcc/${pkgs.targetPlatform.config}/${pkgs.gcc.version}/include-fixed";
+        };
+      })
+    ];
+    packageFun = import ./Cargo.nix;
+    workspaceSrc = source;
+  }

attic/source.json

@@ -0,0 +1,11 @@
+{
+  "url": "https://github.com/zhaofengli/attic",
+  "rev": "4d92e69fc1b279676f997e6b99d2cacc4d0a3e87",
+  "date": "2023-03-21T18:45:45-06:00",
+  "path": "/nix/store/wg5x0vm9vcqhxq01a4qll0nh03wb0ynm-attic",
+  "sha256": "1j3168hfrvblzfsgmn7vzaiah10bw7nghk375qk8kzj02hhm79si",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

ci/drone-runner-docker/default.nix

@@ -0,0 +1,44 @@
+{
+  fetchFromGitHub,
+  buildGoModule,
+  writeScript,
+}: let
+  source = builtins.fromJSON (builtins.readFile ./source.json);
+  src = fetchFromGitHub {
+    owner = "drone-runners";
+    repo = "drone-runner-docker";
+    inherit (source) rev sha256;
+  };
+in
+  buildGoModule rec {
+    pname = "drone-runner-docker";
+    version = source.date;
+    inherit src;
+    vendorSha256 = builtins.readFile ./goVendor.hash;
+    proxyVendor = true;
+    meta = {
+      description = "Docker executor for drone";
+      license = [
+        {
+          free = false;
+          fullName = "PolyForm Small Business License 1.0.0";
+          redistributable = true;
+          spdxId = "PolyForm-Small-Business-1.0.0";
+          url = "https://spdx.org/licenses/PolyForm-Small-Business-1.0.0.html";
+        }
+        {
+          free = false;
+          fullName = "PolyForm Free Trial License 1.0.0";
+          redistributable = true;
+          url = "https://polyformproject.org/licenses/free-trial/1.0.0/";
+        }
+      ];
+    };
+    passthru.updateScript = writeScript "update-matrix-media-repo" ''
+      ${../../scripts/update-git.sh} "https://github.com/drone-runners/drone-runner-docker" ci/drone-runner-docker/source.json
+      if [ "$(git diff -- ci/drone-runner-docker/source.json)" ]; then
+        SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
+        ${../../scripts/update-go.sh} ./ci/drone-runner-docker ci/drone-runner-docker/goVendor.hash
+      fi
+    '';
+  }

ci/drone-runner-docker/goVendor.hash

@@ -0,0 +1 @@
+sha256-E4VV1sM408eXtOFCewOWG275rbqbomlVFw8nZI6uN0E=

ci/drone-runner-docker/source.json

@@ -0,0 +1,11 @@
+{
+  "url": "https://github.com/drone-runners/drone-runner-docker",
+  "rev": "7e9969423c0883c0300c974bbb7583e3d9ece875",
+  "date": "2023-01-31T11:26:39+00:00",
+  "path": "/nix/store/di6ahlqfjgpac2s2y8xcxz0a8nhghxnz-drone-runner-docker",
+  "sha256": "0k28w2s8ck0k37wajp0370gijzyjp88fgn6n8ywnyda9fba0q8yw",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

ci/hydra/add-gitea-push-hook.patch

@@ -1,84 +0,0 @@
-diff --git a/doc/manual/src/webhooks.md b/doc/manual/src/webhooks.md
-index 2b26cd61..674e1064 100644
---- a/doc/manual/src/webhooks.md
-+++ b/doc/manual/src/webhooks.md
-@@ -1,9 +1,12 @@
- # Webhooks
- 
--Hydra can be notified by github's webhook to trigger a new evaluation when a
-+Hydra can be notified by github or gitea with webhooks to trigger a new evaluation when a
- jobset has a github repo in its input.
--To set up a github webhook go to `https://github.com/<yourhandle>/<yourrepo>/settings` and in the `Webhooks` tab
--click on `Add webhook`.
-+
-+## GitHub
-+
-+To set up a webhook for a GitHub repository go to `https://github.com/<yourhandle>/<yourrepo>/settings`
-+and in the `Webhooks` tab click on `Add webhook`.
- 
- - In `Payload URL` fill in `https://<your-hydra-domain>/api/push-github`.
- - In `Content type` switch to `application/json`.
-@@ -11,3 +14,14 @@ click on `Add webhook`.
- - For `Which events would you like to trigger this webhook?` keep the default option for events on `Just the push event.`.
- 
- Then add the hook with `Add webhook`.
-+
-+## Gitea
-+
-+To set up a webhook for a Gitea repository go to the settings of the repository in your Gitea instance
-+and in the `Webhooks` tab click on `Add Webhook` and choose `Gitea` in the drop down.
-+
-+- In `Target URL` fill in `https://<your-hydra-domain>/api/push-gitea`.
-+- Keep HTTP method `POST`, POST Content Type `application/json` and Trigger On `Push Events`.
-+- Change the branch filter to match the git branch hydra builds.
-+
-+Then add the hook with `Add webhook`.
-diff --git a/src/lib/Hydra/Controller/API.pm b/src/lib/Hydra/Controller/API.pm
-index 8ebed599..06f35d4b 100644
---- a/src/lib/Hydra/Controller/API.pm
-+++ b/src/lib/Hydra/Controller/API.pm
-@@ -285,6 +285,23 @@ sub push_github : Chained('api') PathPart('push-github') Args(0) {
-     $c->response->body("");
- }
- 
-+sub push_gitea : Chained('api') PathPart('push-gitea') Args(0) {
-+    my ($self, $c) = @_;
-+
-+    $c->{stash}->{json}->{jobsetsTriggered} = [];
-+
-+    my $in = $c->request->{data};
-+    my $url = $in->{repository}->{clone_url} or die;
-+    $url =~ s/.git$//;
-+    print STDERR "got push from Gitea repository $url\n";
-+
-+    triggerJobset($self, $c, $_, 0) foreach $c->model('DB::Jobsets')->search(
-+        { 'project.enabled' => 1, 'me.enabled' => 1 },
-+        { join => 'project'
-+        , where => \ [ 'me.flake like ? or exists (select 1 from JobsetInputAlts where project = me.project and jobset = me.name and value like ?)', [ 'flake', "%$url%"], [ 'value', "%$url%" ] ]
-+        });
-+    $c->response->body("");
-+}
- 
- 
- 1;
-diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
-index c6843d29..1b33db2a 100644
---- a/src/lib/Hydra/Controller/Root.pm
-+++ b/src/lib/Hydra/Controller/Root.pm
-@@ -32,6 +32,7 @@ sub noLoginNeeded {
- 
-   return $whitelisted ||
-          $c->request->path eq "api/push-github" ||
-+         $c->request->path eq "api/push-gitea" ||
-          $c->request->path eq "google-login" ||
-          $c->request->path eq "github-redirect" ||
-          $c->request->path eq "github-login" ||
-@@ -77,7 +78,7 @@ sub begin :Private {
-     $_->supportedInputTypes($c->stash->{inputTypes}) foreach @{$c->hydra_plugins};
- 
-     # XSRF protection: require POST requests to have the same origin.
--    if ($c->req->method eq "POST" && $c->req->path ne "api/push-github") {
-+    if ($c->req->method eq "POST" && $c->req->path ne "api/push-github" && $c->req->path ne "api/push-gitea") {
-         my $referer = $c->req->header('Referer');
-         $referer //= $c->req->header('Origin');
-         my $base = $c->req->base;

ci/hydra/jobset-inputs-for-flakes.patch

@@ -1,70 +0,0 @@
-diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
-index eeb4232a..b6e9519c 100644
---- a/src/lib/Hydra/Controller/Jobset.pm
-+++ b/src/lib/Hydra/Controller/Jobset.pm
-@@ -294,26 +294,24 @@ sub updateJobset {
-     # Set the inputs of this jobset.
-     $jobset->jobsetinputs->delete;
- 
--    if ($type == 0) {
--        foreach my $name (keys %{$c->stash->{params}->{inputs}}) {
--            my $inputData = $c->stash->{params}->{inputs}->{$name};
--            my $type = $inputData->{type};
--            my $value = $inputData->{value};
--            my $emailresponsible = defined $inputData->{emailresponsible} ? 1 : 0;
--            my $types = knownInputTypes($c);
--
--            badRequest($c, "Invalid input name ‘$name’.") unless $name =~ /^[[:alpha:]][\w-]*$/;
--            badRequest($c, "Invalid input type ‘$type’; valid types: $types.") unless defined $c->stash->{inputTypes}->{$type};
--
--            my $input = $jobset->jobsetinputs->create(
--                { name => $name,
--                  type => $type,
--                  emailresponsible => $emailresponsible
--                });
--
--            $value = checkInputValue($c, $name, $type, $value);
--            $input->jobsetinputalts->create({altnr => 0, value => $value});
--        }
-+    foreach my $name (keys %{$c->stash->{params}->{inputs}}) {
-+        my $inputData = $c->stash->{params}->{inputs}->{$name};
-+        my $type = $inputData->{type};
-+        my $value = $inputData->{value};
-+        my $emailresponsible = defined $inputData->{emailresponsible} ? 1 : 0;
-+        my $types = knownInputTypes($c);
-+
-+        badRequest($c, "Invalid input name ‘$name’.") unless $name =~ /^[[:alpha:]][\w-]*$/;
-+        badRequest($c, "Invalid input type ‘$type’; valid types: $types.") unless defined $c->stash->{inputTypes}->{$type};
-+
-+        my $input = $jobset->jobsetinputs->create(
-+            { name => $name,
-+              type => $type,
-+              emailresponsible => $emailresponsible
-+            });
-+
-+        $value = checkInputValue($c, $name, $type, $value);
-+        $input->jobsetinputalts->create({altnr => 0, value => $value});
-     }
- }
- 
-diff --git a/src/root/edit-jobset.tt b/src/root/edit-jobset.tt
-index 61e3636f..73f11a72 100644
---- a/src/root/edit-jobset.tt
-+++ b/src/root/edit-jobset.tt
-@@ -42,7 +42,15 @@
- [% END %]
- 
- [% BLOCK renderJobsetInputs %]
--  <table class="table table-striped table-condensed show-on-legacy">
-+  <div class="card show-on-flake border-danger">
-+    <div class="text-danger card-body">
-+      <h5 class="card-title">Jobset Inputs don't take any effect for flakes</h5>
-+      <p class="card-text">
-+        These are only available to configure Hydra plugins.
-+      </p>
-+    </div>
-+  </div>
-+  <table class="table table-striped table-condensed">
-     <thead>
-       <tr><th></th><th>Input name</th><th>Type</th><th style="width: 50%">Value</th><th>Notify committers</th></tr>
-     </thead>

ci/hydra/remove-hydra-size-limit.patch

@@ -1,16 +0,0 @@
-diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
-index 21a6c331..05380681 100644
---- a/src/hydra-queue-runner/build-remote.cc
-+++ b/src/hydra-queue-runner/build-remote.cc
-@@ -468,11 +468,6 @@ void State::buildRemote(ref<Store> destStore,
-                 infos.insert_or_assign(info.path, info);
-             }
- 
--            if (totalNarSize > maxOutputSize) {
--                result.stepStatus = bsNarSizeLimitExceeded;
--                return;
--            }
--
-             /* Copy each path. */
-             printMsg(lvlDebug, "copying outputs of ‘%s’ from ‘%s’ (%d bytes)",
-                 localStore->printStorePath(step->drvPath), machine->sshName, totalNarSize);

ci/woodpecker/agent.nix

@@ -1,24 +0,0 @@
-{
-  buildGoApplication,
-  callPackage,
-  go_1_21,
-}: let
-  common = callPackage ./common.nix {};
-in
-  buildGoApplication {
-    pname = "woodpecker-agent";
-    inherit (common) version src ldflags postBuild;
-    modules = ./gomod2nix.toml;
-
-    subPackages = "cmd/agent";
-
-    CGO_ENABLED = 0;
-
-    go = go_1_21;
-
-    meta =
-      common.meta
-      // {
-        description = "Woodpecker Continuous Integration agent";
-      };
-  }

ci/woodpecker/cli.nix

@@ -1,23 +0,0 @@
-{
-  buildGoApplication,
-  callPackage,
-  go_1_21,
-}: let
-  common = callPackage ./common.nix {};
-in
-  buildGoApplication {
-    pname = "woodpecker-cli";
-    inherit (common) version src ldflags postBuild;
-    modules = ./gomod2nix.toml;
-
-    subPackages = "cmd/cli";
-
-    CGO_ENABLED = 0;
-    go = go_1_21;
-
-    meta =
-      common.meta
-      // {
-        description = "Command line client for the Woodpecker Continuous Integration server";
-      };
-  }

ci/woodpecker/common.nix

@@ -1,34 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-}: let
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-in rec {
-  version = source.date;
-
-  src = fetchFromGitHub {
-    owner = "woodpecker-ci";
-    repo = "woodpecker";
-    inherit (source) rev sha256;
-  };
-
-  postBuild = ''
-    mkdir -p $GOPATH/bin
-    cd $GOPATH/bin
-    for f in *; do
-      mv -- "$f" "woodpecker-$f"
-    done
-    cd -
-  '';
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}"
-  ];
-
-  meta = with lib; {
-    homepage = "https://woodpecker-ci.org/";
-    license = licenses.asl20;
-  };
-}

ci/woodpecker/frontend.nix

@@ -1,49 +0,0 @@
-{
-  lib,
-  callPackage,
-  fetchFromGitHub,
-  fetchYarnDeps,
-  mkYarnPackage,
-}: let
-  common = callPackage ./common.nix {};
-in
-  mkYarnPackage {
-    pname = "woodpecker-frontend";
-    inherit (common) version;
-
-    src = "${common.src}/web";
-
-    packageJSON = ./package.json;
-    yarnLock = ./yarn.lock;
-    yarnNix = ./yarn.nix;
-
-    configurePhase = ''
-      cp -r $node_modules node_modules
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      yarn build
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      cp -R ./dist $out
-      echo "${common.version}" > "$out/version"
-
-      runHook postInstall
-    '';
-
-    # Do not attempt generating a tarball for woodpecker-frontend again.
-    doDist = false;
-
-    meta =
-      common.meta
-      // {
-        description = "Woodpecker Continuous Integration server frontend";
-      };
-  }

ci/woodpecker/gomod2nix.toml

@@ -1,456 +0,0 @@
-schema = 3
-
-[mod]
-  [mod."code.gitea.io/sdk/gitea"]
-    version = "v0.16.0"
-    hash = "sha256-KU+2V5zGARWR4GakAmXkl8JYPrtxXkjOKmAELePrcFI="
-  [mod."codeberg.org/6543/go-yaml2json"]
-    version = "v1.0.0"
-    hash = "sha256-R+N/ZOXbolCZiChdNytEgQEyurLYXVzwpd/MQc9OJno="
-  [mod."codeberg.org/6543/xyaml"]
-    version = "v1.1.0"
-    hash = "sha256-4FzQXxT8RQguwdOiIcHDTJQvEin22gmv2+0Yx8mkLYA="
-  [mod."github.com/6543/logfile-open"]
-    version = "v1.2.1"
-    hash = "sha256-HiX2GwYubPJklfaKB05uOV9+sB7TgO+4lJoTlAMoX7U="
-  [mod."github.com/Azure/go-ansiterm"]
-    version = "v0.0.0-20210617225240-d185dfc1b5a1"
-    hash = "sha256-rOhb0GMLPdnh1302vaxFjO20fM69hCT29hQD1F1YpPg="
-  [mod."github.com/KyleBanks/depth"]
-    version = "v1.2.1"
-    hash = "sha256-czR52MfeKA2FdStXCebTMQRKT8jaWQcbV214O3j49qU="
-  [mod."github.com/Microsoft/go-winio"]
-    version = "v0.6.1"
-    hash = "sha256-BL0BVaHtmPKQts/711W59AbHXjGKqFS4ZTal0RYnR9I="
-  [mod."github.com/alessio/shellescape"]
-    version = "v1.4.2"
-    hash = "sha256-TOlNouGwNdaCddRwABb1qXp0HTMt6+G4uatzfAg3XFc="
-  [mod."github.com/antonmedv/expr"]
-    version = "v1.15.3"
-    hash = "sha256-j6ZvAK4MgiyDnXw4TxnfjBYgxrde4P6kEYROzj10qxc="
-  [mod."github.com/beorn7/perks"]
-    version = "v1.0.1"
-    hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4="
-  [mod."github.com/bmatcuk/doublestar/v4"]
-    version = "v4.6.0"
-    hash = "sha256-0Azugw9q+RgQd7FR8cnpS4GpfWU9oAeLFmLOffMH5Iw="
-  [mod."github.com/bytedance/sonic"]
-    version = "v1.9.1"
-    hash = "sha256-u8fAQs/8St/jKxhnsDVh9eVZdN28S+S/hA1yqu/UQLs="
-  [mod."github.com/caddyserver/certmagic"]
-    version = "v0.19.2"
-    hash = "sha256-ruz2oG5E834tMjyL/HdFPaWlNuwBg/fxqVitZX3sQR0="
-  [mod."github.com/cenkalti/backoff/v4"]
-    version = "v4.2.1"
-    hash = "sha256-CKogmPe0pCcAdpztzPwr24rLTJZfq8QVZ9AUduwAcoA="
-  [mod."github.com/cespare/xxhash/v2"]
-    version = "v2.2.0"
-    hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4="
-  [mod."github.com/chenzhuoyu/base64x"]
-    version = "v0.0.0-20221115062448-fe3a3abad311"
-    hash = "sha256-xmONcYkIXgXomJYHR521Dr9F3XbbUM14bgf7KJ5FIFc="
-  [mod."github.com/cpuguy83/go-md2man/v2"]
-    version = "v2.0.2"
-    hash = "sha256-OvWCtDsVrYzM84SMQwOXPLBxnWnMC1hDm+KiI6zm3uk="
-  [mod."github.com/davecgh/go-spew"]
-    version = "v1.1.1"
-    hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="
-  [mod."github.com/davidmz/go-pageant"]
-    version = "v1.0.2"
-    hash = "sha256-gfwm6i0ZGQhX2c0lDRe7qVXyHkhoHeemYpaj+O0aYyw="
-  [mod."github.com/distribution/reference"]
-    version = "v0.5.0"
-    hash = "sha256-nTlqurp/J/xOZeR0JcJMmE4GUHMMd5I+EOR7huzYuok="
-  [mod."github.com/docker/cli"]
-    version = "v23.0.7+incompatible"
-    hash = "sha256-cN3/T46iQ/eMCg8IN6PZNin5S3UqF8So0B1Z2jfD1RA="
-  [mod."github.com/docker/distribution"]
-    version = "v2.8.3+incompatible"
-    hash = "sha256-XhRURCGNpJC83QZTtgCxHHFL76HaxIxjt70HwUa847E="
-  [mod."github.com/docker/docker"]
-    version = "v23.0.7+incompatible"
-    hash = "sha256-t8CI2LDatM2JV2sIETEe++EdbVYBjxy0dw49rZOdKS8="
-  [mod."github.com/docker/docker-credential-helpers"]
-    version = "v0.7.0"
-    hash = "sha256-Np+esoutU1psMWB0G1ayKwaWVn/XemIXxlVlooXphzg="
-  [mod."github.com/docker/go-connections"]
-    version = "v0.4.0"
-    hash = "sha256-GHNIjOuuNp5lFQ308+nDNwQPGESCVV7bCUxSW5ZxZlc="
-  [mod."github.com/docker/go-units"]
-    version = "v0.5.0"
-    hash = "sha256-iK/V/jJc+borzqMeqLY+38Qcts2KhywpsTk95++hImE="
-  [mod."github.com/drone/envsubst"]
-    version = "v1.0.3"
-    hash = "sha256-U5wi+PAdrawE1RafI1Cf6mQ5Br68xFQtgBO9b6uivpo="
-  [mod."github.com/emicklei/go-restful/v3"]
-    version = "v3.9.0"
-    hash = "sha256-qt0M3tryKAzQS4JbmTr/N5+47Ue63U0dpbWov2Me5Os="
-  [mod."github.com/fatih/color"]
-    version = "v1.13.0"
-    hash = "sha256-Xo0zFKLm/9NuChdHDhHoUFo8Oa7Mkb3ezZCu23SfOAk="
-  [mod."github.com/franela/goblin"]
-    version = "v0.0.0-20211003143422-0a4f594942bf"
-    hash = "sha256-ZYGrEKEROa1UrqscdI407z9MnDToU+yuUr2iyRG3rRo="
-  [mod."github.com/fsnotify/fsnotify"]
-    version = "v1.6.0"
-    hash = "sha256-DQesOCweQPEwmAn6s7DCP/Dwy8IypC+osbpfsvpkdP0="
-  [mod."github.com/gabriel-vasile/mimetype"]
-    version = "v1.4.2"
-    hash = "sha256-laV+IkgbnEG07h1eFfPISqp0ctnLXfzchz/CLR1lftk="
-  [mod."github.com/gin-contrib/sse"]
-    version = "v0.1.0"
-    hash = "sha256-zYbMTao+1F+385Lvsba9roLmmt9eYqr57sUWo0LCVhw="
-  [mod."github.com/gin-gonic/gin"]
-    version = "v1.9.1"
-    hash = "sha256-3FHywH5QuhTeQcdF8v06jt9vIkH0ON6ydpMYciAc8xQ="
-  [mod."github.com/go-ap/httpsig"]
-    version = "v0.0.0-20221203064646-3647b4d88fdf"
-    hash = "sha256-jeMZxW+El9W4jRKvo0HkTiKD40iebY19FQMfjPq8Tdg="
-  [mod."github.com/go-fed/httpsig"]
-    version = "v1.1.0"
-    hash = "sha256-ok0PEEvSR010nh6vB3nDCyKSSVvoB50/UjVvBKOYXsA="
-  [mod."github.com/go-logr/logr"]
-    version = "v1.2.4"
-    hash = "sha256-+FhzmqKsAnsra5p8LuxENXJBHSeuWjQG8Tzhpyd/ps4="
-  [mod."github.com/go-openapi/jsonpointer"]
-    version = "v0.19.6"
-    hash = "sha256-C/ICmPQu0faBiZ/qCHoy6Nzyy2FDO5QiahzlXSCwvIw="
-  [mod."github.com/go-openapi/jsonreference"]
-    version = "v0.20.2"
-    hash = "sha256-klWZKK7LZqSg3HMIrSkjh/NwaZTr+8kTW2ok2+JlioE="
-  [mod."github.com/go-openapi/spec"]
-    version = "v0.20.8"
-    hash = "sha256-1hj2wZBodG0yw86vEKL9+u1LGwHRXrhRVDzvGpM8o9M="
-  [mod."github.com/go-openapi/swag"]
-    version = "v0.22.3"
-    hash = "sha256-iUGFBMt9RobFG+Qsy2zKWEjFARi2xCSCaV2HRDL0vw4="
-  [mod."github.com/go-playground/locales"]
-    version = "v0.14.1"
-    hash = "sha256-BMJGAexq96waZn60DJXZfByRHb8zA/JP/i6f/YrW9oQ="
-  [mod."github.com/go-playground/universal-translator"]
-    version = "v0.18.1"
-    hash = "sha256-2/B2qP51zfiY+k8G0w0D03KXUc7XpWj6wKY7NjNP/9E="
-  [mod."github.com/go-playground/validator/v10"]
-    version = "v10.14.0"
-    hash = "sha256-9bZ6GTH3Lr7bYLgOIurHmMOyiZna4wW6QyuEP3dHX5g="
-  [mod."github.com/go-sql-driver/mysql"]
-    version = "v1.7.1"
-    hash = "sha256-3iKt+BKDz5FX2246Tg41weIuEDYd1YI40N6alJI9Bks="
-  [mod."github.com/goccy/go-json"]
-    version = "v0.10.2"
-    hash = "sha256-6fMD2/Rku8HT0zDdeA23pX0YxbohiIOC8OJNYbylJTQ="
-  [mod."github.com/gogo/protobuf"]
-    version = "v1.3.2"
-    hash = "sha256-pogILFrrk+cAtb0ulqn9+gRZJ7sGnnLLdtqITvxvG6c="
-  [mod."github.com/golang-jwt/jwt/v5"]
-    version = "v5.0.0"
-    hash = "sha256-eJhOeyjkEwQAN9cwwAIU4RqnbzHmbDYW27/EzcKgj9Q="
-  [mod."github.com/golang/protobuf"]
-    version = "v1.5.3"
-    hash = "sha256-svogITcP4orUIsJFjMtp+Uv1+fKJv2Q5Zwf2dMqnpOQ="
-  [mod."github.com/golang/snappy"]
-    version = "v0.0.4"
-    hash = "sha256-Umx+5xHAQCN/Gi4HbtMhnDCSPFAXSsjVbXd8n5LhjAA="
-  [mod."github.com/google/gnostic-models"]
-    version = "v0.6.8"
-    hash = "sha256-YzA/XpvPyfdplJtHmAUdQk9P+j0NBwHhW9nj1DaGaoQ="
-  [mod."github.com/google/go-cmp"]
-    version = "v0.5.9"
-    hash = "sha256-lQc4O00R3QSMGs9LP8Sy7A9kj0cqV5rrUdpnGeipIyg="
-  [mod."github.com/google/go-github/v56"]
-    version = "v56.0.0"
-    hash = "sha256-1b3x6aQMX3XtB6S3M0Gt2Ux3gM7vopXl89hyJ+RsW6I="
-  [mod."github.com/google/go-querystring"]
-    version = "v1.1.0"
-    hash = "sha256-itsKgKghuX26czU79cK6C2n+lc27jm5Dw1XbIRgwZJY="
-  [mod."github.com/google/gofuzz"]
-    version = "v1.2.0"
-    hash = "sha256-T6Gz741l45L3F6Dt7fiAuQvQQg59Qtap3zG05M2cfqU="
-  [mod."github.com/google/tink/go"]
-    version = "v1.7.0"
-    hash = "sha256-545LoMrptf9L51OvGMmINPKZAXWQHc9FdSGtSAwtQug="
-  [mod."github.com/google/uuid"]
-    version = "v1.3.1"
-    hash = "sha256-JxAEAB2bFlGPShFreyOWjUahjaGV3xYS5TpfUOikod0="
-  [mod."github.com/gorilla/securecookie"]
-    version = "v1.1.1"
-    hash = "sha256-IBBYWfdOuXvQsb01DaA8tBizCfAE1J2KLXIn3W+NeJk="
-  [mod."github.com/hashicorp/go-cleanhttp"]
-    version = "v0.5.2"
-    hash = "sha256-N9GOKYo7tK6XQUFhvhImtL7PZW/mr4C4Manx/yPVvcQ="
-  [mod."github.com/hashicorp/go-hclog"]
-    version = "v1.2.0"
-    hash = "sha256-XGIirpWp3lFLaBK5lHLVnNMwkVGCnnyt7Pqranb4amQ="
-  [mod."github.com/hashicorp/go-retryablehttp"]
-    version = "v0.7.4"
-    hash = "sha256-/Gz+M2TPdVW+9zL+Oh1oC8kLrla2Uvl1S16SMH4qYRw="
-  [mod."github.com/hashicorp/go-version"]
-    version = "v1.5.0"
-    hash = "sha256-nrV59GgQHrZ0i/pyighGahr0Or/x3jNeyS/TD67HCf4="
-  [mod."github.com/imdario/mergo"]
-    version = "v0.3.12"
-    hash = "sha256-IPGunEznxlUilS22LUU4p/QTA7f5+Goowf1Utg9ARpc="
-  [mod."github.com/jellydator/ttlcache/v3"]
-    version = "v3.1.0"
-    hash = "sha256-KWjdJrANQcgrRbao+PCCm2qyiBgedA5xNFxvWqqeoFQ="
-  [mod."github.com/joho/godotenv"]
-    version = "v1.5.1"
-    hash = "sha256-kA0osKfsc6Kp+nuGTRJyXZZlJt1D/kuEazKMWYCWcQ8="
-  [mod."github.com/josharian/intern"]
-    version = "v1.0.0"
-    hash = "sha256-LJR0QE2vOQ2/2shBbO5Yl8cVPq+NFrE3ers0vu9FRP0="
-  [mod."github.com/json-iterator/go"]
-    version = "v1.1.12"
-    hash = "sha256-To8A0h+lbfZ/6zM+2PpRpY3+L6725OPC66lffq6fUoM="
-  [mod."github.com/klauspost/cpuid/v2"]
-    version = "v2.2.5"
-    hash = "sha256-/M8CHNah2/EPr0va44r1Sx+3H6E+jN8bGFi5jQkLBrM="
-  [mod."github.com/kr/fs"]
-    version = "v0.1.0"
-    hash = "sha256-+Cjz0rGmdNIV1QL4z8h7JAjHATa5pKndwSnD1M0J74c="
-  [mod."github.com/leodido/go-urn"]
-    version = "v1.2.4"
-    hash = "sha256-N2HO7ChScxI79KGvXI9LxoIlr+lkBNdDZP9OPGwPRK0="
-  [mod."github.com/lib/pq"]
-    version = "v1.10.9"
-    hash = "sha256-Gl6dLtL+yk6UrTTWfas43aM4lP/pNa2l7+ITXnjQyKs="
-  [mod."github.com/libdns/libdns"]
-    version = "v0.2.1"
-    hash = "sha256-bxEY0wYu4Um0t7sakLyMwMPDXfv2x07gjckKSyAypsc="
-  [mod."github.com/mailru/easyjson"]
-    version = "v0.7.7"
-    hash = "sha256-NVCz8MURpxgOjHXqxOZExqV4bnpHggpeAOyZDArjcy4="
-  [mod."github.com/mattn/go-colorable"]
-    version = "v0.1.13"
-    hash = "sha256-qb3Qbo0CELGRIzvw7NVM1g/aayaz4Tguppk9MD2/OI8="
-  [mod."github.com/mattn/go-isatty"]
-    version = "v0.0.19"
-    hash = "sha256-wYQqGxeqV3Elkmn26Md8mKZ/viw598R4Ych3vtt72YE="
-  [mod."github.com/mattn/go-sqlite3"]
-    version = "v1.14.17"
-    hash = "sha256-ictf2uCW2AnQbykhI0kKPXwzHQlbHHZflZgvpqGFquY="
-  [mod."github.com/matttproud/golang_protobuf_extensions"]
-    version = "v1.0.4"
-    hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc="
-  [mod."github.com/melbahja/goph"]
-    version = "v1.4.0"
-    hash = "sha256-YIrRwgacGIcBCAnIW0XwMzTBwNmrOXCpAwbqNaqx2vA="
-  [mod."github.com/mholt/acmez"]
-    version = "v1.2.0"
-    hash = "sha256-zfj14WFQr1/AO64gYsbFk4a4T0dsMEs+W3uIa9968/M="
-  [mod."github.com/miekg/dns"]
-    version = "v1.1.55"
-    hash = "sha256-Jbii9veDSpqF7yIkdrzb/bEUM3wZG41mNEAYV3VEAJo="
-  [mod."github.com/moby/moby"]
-    version = "v23.0.7+incompatible"
-    hash = "sha256-t8CI2LDatM2JV2sIETEe++EdbVYBjxy0dw49rZOdKS8="
-  [mod."github.com/moby/term"]
-    version = "v0.5.0"
-    hash = "sha256-jy0kbkeUsr0KoiE33WLxNAgYXZIERKR2O5+saXBwdD8="
-  [mod."github.com/modern-go/concurrent"]
-    version = "v0.0.0-20180306012644-bacd9c7ef1dd"
-    hash = "sha256-OTySieAgPWR4oJnlohaFTeK1tRaVp/b0d1rYY8xKMzo="
-  [mod."github.com/modern-go/reflect2"]
-    version = "v1.0.2"
-    hash = "sha256-+W9EIW7okXIXjWEgOaMh58eLvBZ7OshW2EhaIpNLSBU="
-  [mod."github.com/morikuni/aec"]
-    version = "v1.0.0"
-    hash = "sha256-5zYgLeGr3K+uhGKlN3xv0PO67V+2Zw+cezjzNCmAWOE="
-  [mod."github.com/munnerz/goautoneg"]
-    version = "v0.0.0-20191010083416-a7dc8b61c822"
-    hash = "sha256-79URDDFenmGc9JZu+5AXHToMrtTREHb3BC84b/gym9Q="
-  [mod."github.com/oklog/ulid/v2"]
-    version = "v2.1.0"
-    hash = "sha256-/oQPgcO1xKbHXutxz0WPfIduShPrfH1l+7/mj8jLst8="
-  [mod."github.com/opencontainers/go-digest"]
-    version = "v1.0.0"
-    hash = "sha256-cfVDjHyWItmUGZ2dzQhCHgmOmou8v7N+itDkLZVkqkQ="
-  [mod."github.com/opencontainers/image-spec"]
-    version = "v1.0.2"
-    hash = "sha256-X7kZoMYZNOIDpx8ziK7V+5YM07qiYWOE4yJo+sTOjjU="
-  [mod."github.com/pelletier/go-toml/v2"]
-    version = "v2.0.8"
-    hash = "sha256-wWxswr/lTq+McYbScmJM1ECKQ6eNJ5m44SM7TmrHThM="
-  [mod."github.com/pkg/errors"]
-    version = "v0.9.1"
-    hash = "sha256-mNfQtcrQmu3sNg/7IwiieKWOgFQOVVe2yXgKBpe/wZw="
-  [mod."github.com/pkg/sftp"]
-    version = "v1.13.5"
-    hash = "sha256-z5AbvM8kGlpF1LQy0pQpij7KMR5bE+1HppvamBRt8F4="
-  [mod."github.com/pmezard/go-difflib"]
-    version = "v1.0.0"
-    hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
-  [mod."github.com/prometheus/client_golang"]
-    version = "v1.17.0"
-    hash = "sha256-FIIzCuNqHdVzpbyH7yAp7Tcu+1tPxEMS5g6KfsGQBGE="
-  [mod."github.com/prometheus/client_model"]
-    version = "v0.4.1-0.20230718164431-9a2bf3000d16"
-    hash = "sha256-t9LgImRW4h0XMSxfAazrGHqyDljDyl0YC5r9cYuXcKc="
-  [mod."github.com/prometheus/common"]
-    version = "v0.44.0"
-    hash = "sha256-8n3gSWKDSJtGfOQgxsiCGyTnUjb5hvSxJi/hPcrE5Oo="
-  [mod."github.com/prometheus/procfs"]
-    version = "v0.11.1"
-    hash = "sha256-yphZ7NZtYC/tb0HVag2T58SuN64Ial9sBo/TdCEQx6Q="
-  [mod."github.com/robfig/cron"]
-    version = "v1.2.0"
-    hash = "sha256-au+MD6DEjpVRAjXWmmJbZRB5IdFfcIqGm6kBkkYNY1s="
-  [mod."github.com/rs/zerolog"]
-    version = "v1.31.0"
-    hash = "sha256-OF4VM+Rv6M5EAaUVD2nOzcbZLQ4b7OAMteyyTqIoU0M="
-  [mod."github.com/russross/blackfriday/v2"]
-    version = "v2.1.0"
-    hash = "sha256-R+84l1si8az5yDqd5CYcFrTyNZ1eSYlpXKq6nFt4OTQ="
-  [mod."github.com/sirupsen/logrus"]
-    version = "v1.9.0"
-    hash = "sha256-xOwGFsYGIxNiurS8Zue8mhlFK/G7U1LVFFrv4vcr1GM="
-  [mod."github.com/spf13/pflag"]
-    version = "v1.0.5"
-    hash = "sha256-w9LLYzxxP74WHT4ouBspH/iQZXjuAh2WQCHsuvyEjAw="
-  [mod."github.com/stretchr/objx"]
-    version = "v0.5.0"
-    hash = "sha256-nY4mvP0f0Ry1IKMKQAYNuioA5h4red4mmQqeGZw6EF0="
-  [mod."github.com/stretchr/testify"]
-    version = "v1.8.4"
-    hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo="
-  [mod."github.com/swaggo/files"]
-    version = "v1.0.1"
-    hash = "sha256-bNBmpJaM7g1BNwd7VxNIRSdY35NKSXhYHGfnZsSEUZ8="
-  [mod."github.com/swaggo/gin-swagger"]
-    version = "v1.6.0"
-    hash = "sha256-hvX6co7b9Xmhl29ACMvTcD1TTRbI5178r+DRlabgMwY="
-  [mod."github.com/swaggo/swag"]
-    version = "v1.16.2"
-    hash = "sha256-KBC/L2/pIjhrhUbf0jGLVO7J+TKu/MNMXEEibf9iYkk="
-  [mod."github.com/syndtr/goleveldb"]
-    version = "v1.0.0"
-    hash = "sha256-rW7SW6nehede0oMZo4NBatM6Eizbnlb7xYoX/dcDUxA="
-  [mod."github.com/tevino/abool/v2"]
-    version = "v2.1.0"
-    hash = "sha256-rDKv4fnigKLzMAtSG5miExEtmfgOpOOm03Py11McX5k="
-  [mod."github.com/twitchyliquid64/golang-asm"]
-    version = "v0.15.1"
-    hash = "sha256-HLk6oUe7EoITrNvP0y8D6BtIgIcmDZYtb/xl/dufIoY="
-  [mod."github.com/ugorji/go/codec"]
-    version = "v1.2.11"
-    hash = "sha256-hfcj+YsznH6MeERSdIPjSrsM7gbDcIzH/TbgHzYbPww="
-  [mod."github.com/urfave/cli/v2"]
-    version = "v2.25.7"
-    hash = "sha256-/OPbU0DE+xsY6Erz0a3kmzjJPRAXH75FuevmvsaQtw8="
-  [mod."github.com/xanzy/go-gitlab"]
-    version = "v0.93.1"
-    hash = "sha256-tYKSuxkKNaNAkBIn3IaGDkPA0X7P8cG683Mb/FZ94W0="
-  [mod."github.com/xeipuuv/gojsonpointer"]
-    version = "v0.0.0-20180127040702-4e3ac2762d5f"
-    hash = "sha256-OEW9nOR3EeMzvqvqpdAgowpZlbXPLWM0JT+5bwWOxo8="
-  [mod."github.com/xeipuuv/gojsonreference"]
-    version = "v0.0.0-20180127040603-bd5ef7bd5415"
-    hash = "sha256-ZbXA+ASQrTgBQzasUKC9vznrOGpquYyWr+uwpm46fvU="
-  [mod."github.com/xeipuuv/gojsonschema"]
-    version = "v1.2.0"
-    hash = "sha256-1ERBEvxj3pvHkMS2mvmvmYRi8jgAaTquo5hwjDLAEdc="
-  [mod."github.com/xrash/smetrics"]
-    version = "v0.0.0-20201216005158-039620a65673"
-    hash = "sha256-WGHtW/OkLowkqOYIvXpDOpn9wqdH2+Dyx3+rYwpmvzI="
-  [mod."github.com/zeebo/blake3"]
-    version = "v0.2.3"
-    hash = "sha256-ZepnzkvOyicTGL078O1F84q0TzBAouJlB5AMmfsiOIg="
-  [mod."go.uber.org/atomic"]
-    version = "v1.11.0"
-    hash = "sha256-TyYws/cSPVqYNffFX0gbDml1bD4bBGcysrUWU7mHPIY="
-  [mod."go.uber.org/multierr"]
-    version = "v1.11.0"
-    hash = "sha256-Lb6rHHfR62Ozg2j2JZy3MKOMKdsfzd1IYTR57r3Mhp0="
-  [mod."go.uber.org/zap"]
-    version = "v1.24.0"
-    hash = "sha256-yLzjFbMWnc5b033gcPLGP0KY1xWPJ3sjnUG/RndmC3o="
-  [mod."golang.org/x/arch"]
-    version = "v0.3.0"
-    hash = "sha256-Gus5o3I0+arNjRFglTP5FfCi0NDwKAUT/N3WtdhnLMQ="
-  [mod."golang.org/x/crypto"]
-    version = "v0.14.0"
-    hash = "sha256-UUSt3X/i34r1K0mU+Y5IzljX5HYy07JcHh39Pm1MU+o="
-  [mod."golang.org/x/mod"]
-    version = "v0.13.0"
-    hash = "sha256-qh/YmxS0auZEiKzqdn+v84qs31SpkGIJn9rqKLjdKVU="
-  [mod."golang.org/x/net"]
-    version = "v0.17.0"
-    hash = "sha256-qRawHWLSsJ06QNbLhUWPXGVSO1eaioeC9xZlUEWN8J8="
-  [mod."golang.org/x/oauth2"]
-    version = "v0.13.0"
-    hash = "sha256-mEmRQrh6FMsenT7x406HbZCynBJCHJ4e9u0M3hpG3m4="
-  [mod."golang.org/x/sync"]
-    version = "v0.4.0"
-    hash = "sha256-VCl5IerUva6XZqGXHa0J/r/ewsbOIIP7EBqyh1JGsXY="
-  [mod."golang.org/x/sys"]
-    version = "v0.13.0"
-    hash = "sha256-/+RDZ0a0oEfJ0k304VqpJpdrl2ZXa3yFlOxy4mjW7w0="
-  [mod."golang.org/x/term"]
-    version = "v0.13.0"
-    hash = "sha256-sLN+cjSZN2tfg/Lm9Ae4vYzoXREclMumxfksYFokymQ="
-  [mod."golang.org/x/text"]
-    version = "v0.13.0"
-    hash = "sha256-J34dbc8UNVIdRJUZP7jPt11oxuwG8VvrOOylxE7V3oA="
-  [mod."golang.org/x/time"]
-    version = "v0.3.0"
-    hash = "sha256-/hmc9skIswMYbivxNS7R8A6vCTUF9k2/7tr/ACkcEaM="
-  [mod."golang.org/x/tools"]
-    version = "v0.14.0"
-    hash = "sha256-BC/AesMg7LpIg0/e4a7Ab37rfyP2KaWBFrsonIp+JbE="
-  [mod."google.golang.org/appengine"]
-    version = "v1.6.8"
-    hash = "sha256-decMa0MiWfW/Bzr8QPPzzpeya0YWGHhZAt4Cr/bD1wQ="
-  [mod."google.golang.org/genproto/googleapis/rpc"]
-    version = "v0.0.0-20230711160842-782d3b101e98"
-    hash = "sha256-VtrLmOh1SLOKKLRmKc/NKR6NR/9DSR4RSq+OXnwmgHY="
-  [mod."google.golang.org/grpc"]
-    version = "v1.58.3"
-    hash = "sha256-YxXO1UAc/+4E0bsSsGSiFNrY3yyR6AIml/1sVY2QJjQ="
-  [mod."google.golang.org/protobuf"]
-    version = "v1.31.0"
-    hash = "sha256-UdIk+xRaMfdhVICvKRk1THe3R1VU+lWD8hqoW/y8jT0="
-  [mod."gopkg.in/inf.v0"]
-    version = "v0.9.1"
-    hash = "sha256-z84XlyeWLcoYOvWLxPkPFgLkpjyb2Y4pdeGMyySOZQI="
-  [mod."gopkg.in/yaml.v2"]
-    version = "v2.4.0"
-    hash = "sha256-uVEGglIedjOIGZzHW4YwN1VoRSTK8o0eGZqzd+TNdd0="
-  [mod."gopkg.in/yaml.v3"]
-    version = "v3.0.1"
-    hash = "sha256-FqL9TKYJ0XkNwJFnq9j0VvJ5ZUU1RvH/52h/f5bkYAU="
-  [mod."gotest.tools/v3"]
-    version = "v3.4.0"
-    hash = "sha256-mohKBcuKT29Illk/Gm7Bu5E8QxhRYr6sEGPn/oux65k="
-  [mod."k8s.io/api"]
-    version = "v0.28.2"
-    hash = "sha256-FIplUrrQ0N1jE0NyGhdT4s2d/lvzNn2G/jv1WOFrgcw="
-  [mod."k8s.io/apimachinery"]
-    version = "v0.28.2"
-    hash = "sha256-kfXWigf/vzAPzReZNofH95QlxqmLDbz7Ml659ubn2d0="
-  [mod."k8s.io/client-go"]
-    version = "v0.28.2"
-    hash = "sha256-YDHLVTbAk2T9yF/9pRS/7YxvbE38wdcJLbNHKnWhfoM="
-  [mod."k8s.io/klog/v2"]
-    version = "v2.100.1"
-    hash = "sha256-0pf6/CrK6R6FjlKYjy9ybL3+KaAMNEaWUf0mUs6F5+c="
-  [mod."k8s.io/kube-openapi"]
-    version = "v0.0.0-20230717233707-2695361300d9"
-    hash = "sha256-3d/G/oRLbgBlFFzX8DBd5nQc0EE81rZ9xtHhrQrdA04="
-  [mod."k8s.io/utils"]
-    version = "v0.0.0-20230406110748-d93618cff8a2"
-    hash = "sha256-k++1zQ4f+zJW1DTNUhoPrPJtGszjXTnJFht6xR5YOng="
-  [mod."sigs.k8s.io/json"]
-    version = "v0.0.0-20221116044647-bc3834ca7abd"
-    hash = "sha256-XDBMN2o450IHiAwEpBVsvo9e7tYZa+EXWrifUNTdNMU="
-  [mod."sigs.k8s.io/structured-merge-diff/v4"]
-    version = "v4.2.3"
-    hash = "sha256-v6u6ZqnrEeQ2c7BYkltPKuBFL7+939OT1EbWw0mUE7U="
-  [mod."sigs.k8s.io/yaml"]
-    version = "v1.3.0"
-    hash = "sha256-RVp8vca2wxg8pcBDYospG7Z1dujoH7zXNu2rgZ1kky0="
-  [mod."xorm.io/builder"]
-    version = "v0.3.13"
-    hash = "sha256-nsZZc36EmrjugMWwuw5G3lVvooi50YumFr4OmysrFs4="
-  [mod."xorm.io/xorm"]
-    version = "v1.3.3"
-    hash = "sha256-zO+W4ejFZ90tIzK5BaFBJ9ggRT4RIqbfJszO0z2zdWQ="

ci/woodpecker/package.json

@@ -1,77 +0,0 @@
-{
-  "name": "woodpecker-ci",
-  "author": "Woodpecker CI",
-  "version": "0.0.0",
-  "license": "Apache-2.0",
-  "engines": {
-    "node": ">=14"
-  },
-  "scripts": {
-    "start": "vite",
-    "build": "vite build --base=/BASE_PATH",
-    "serve": "vite preview",
-    "lint": "eslint --max-warnings 0 --ext .js,.ts,.vue,.json .",
-    "format": "prettier --write .",
-    "format:check": "prettier -c .",
-    "typecheck": "vue-tsc --noEmit",
-    "test": "echo 'No tests configured' && exit 0"
-  },
-  "dependencies": {
-    "@intlify/unplugin-vue-i18n": "^1.0.0",
-    "@kyvg/vue3-notification": "^3.0.0",
-    "@vueuse/components": "^10.4.0",
-    "@vueuse/core": "^10.0.0",
-    "ansi_up": "^6.0.0",
-    "dayjs": "^1.11.9",
-    "fuse.js": "^6.6.2",
-    "humanize-duration": "^3.28.0",
-    "javascript-time-ago": "^2.5.9",
-    "lodash": "^4.17.21",
-    "node-emoji": "^2.0.0",
-    "pinia": "^2.1.4",
-    "prismjs": "^1.29.0",
-    "vue": "^3.3.4",
-    "vue-i18n": "^9.2.2",
-    "vue-router": "^4.2.2"
-  },
-  "devDependencies": {
-    "@iconify/json": "^2.2.85",
-    "@types/humanize-duration": "^3.27.1",
-    "@types/javascript-time-ago": "^2.0.3",
-    "@types/lodash": "^4.14.195",
-    "@types/node": "^18.16.19",
-    "@types/node-emoji": "^1.8.2",
-    "@types/prismjs": "^1.26.0",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vue/compiler-sfc": "^3.3.4",
-    "eslint": "^8.44.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-vue": "^9.15.1",
-    "eslint-plugin-vue-scoped-css": "^2.5.0",
-    "prettier": "^3.0.0",
-    "tinycolor2": "^1.6.0",
-    "typescript": "5.2.2",
-    "unplugin-icons": "^0.17.0",
-    "unplugin-vue-components": "^0.25.0",
-    "vite": "^4.3.9",
-    "vite-plugin-prismjs": "^0.0.8",
-    "vite-plugin-windicss": "^1.9.0",
-    "vite-svg-loader": "^4.0.0",
-    "vue-eslint-parser": "^9.3.1",
-    "vue-tsc": "^1.8.3",
-    "windicss": "^3.5.6"
-  },
-  "pnpm": {
-    "overrides": {
-      "semver@<7.5.2": ">=7.5.2"
-    }
-  }
-}

ci/woodpecker/server.nix

@@ -1,45 +0,0 @@
-{
-  buildGoApplication,
-  callPackage,
-  writeScript,
-  go_1_21,
-}: let
-  woodpecker-frontend = callPackage ./frontend.nix {};
-  common = callPackage ./common.nix {};
-in
-  buildGoApplication rec {
-    pname = "woodpecker-server";
-    inherit (common) version src ldflags postBuild;
-    modules = ./gomod2nix.toml;
-
-    postPatch = ''
-      cp -r ${woodpecker-frontend} web/dist
-    '';
-
-    subPackages = "cmd/server";
-
-    CGO_ENABLED = 1;
-
-    go = go_1_21;
-
-    patches = [./unlimited-matrix.patch];
-
-    passthru = {
-      inherit woodpecker-frontend;
-
-      updateScript = writeScript "update-woodpecker" ''
-        ${../../scripts/update-git.sh} https://github.com/woodpecker-ci/woodpecker ci/woodpecker/source.json
-        if [ "$(git diff -- ci/woodpecker/source.json)" ]; then
-          SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
-          ${../../scripts/update-yarn.sh} $SRC_PATH/web ci/woodpecker
-          ${../../scripts/update-go.sh} $SRC_PATH ci/woodpecker/
-        fi
-      '';
-    };
-
-    meta =
-      common.meta
-      // {
-        description = "Woodpecker Continuous Integration server";
-      };
-  }

ci/woodpecker/source.json

@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/woodpecker-ci/woodpecker",
-  "rev": "e451d9f3d10c85ab60162010961c20b230677ea1",
-  "date": "2023-10-17T07:36:27+02:00",
-  "path": "/nix/store/x6lwxvd2bg5hgjqa83ycb4v6cfc6dxww-woodpecker",
-  "sha256": "0dxdqh2xm0qmgj5cjcg95z29qygj8aha05z67y0s21pdkidxdv10",
-  "hash": "sha256-IOzWW5ztBqGBP+YXoKBC8nmcxC/pMcmKfBWD2gXErTc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

ci/woodpecker/unlimited-matrix.patch

@@ -1,43 +0,0 @@
-diff --git a/pipeline/frontend/yaml/matrix/matrix.go b/pipeline/frontend/yaml/matrix/matrix.go
-index da5e9f24..c3fe9896 100644
---- a/pipeline/frontend/yaml/matrix/matrix.go
-+++ b/pipeline/frontend/yaml/matrix/matrix.go
-@@ -22,11 +22,6 @@ import (
- 	"gopkg.in/yaml.v3"
- )
- 
--const (
--	limitTags = 10
--	limitAxis = 25
--)
--
- // Matrix represents the pipeline matrix.
- type Matrix map[string][]string
- 
-@@ -87,25 +82,15 @@ func calc(matrix Matrix) []Axis {
- 	for p := 0; p < perm; p++ {
- 		axis := map[string]string{}
- 		decr := perm
--		for i, tag := range tags {
-+		for _, tag := range tags {
- 			elems := matrix[tag]
- 			decr = decr / len(elems)
- 			elem := p / decr % len(elems)
- 			axis[tag] = elems[elem]
--
--			// enforce a maximum number of tags in the pipeline matrix.
--			if i > limitTags {
--				break
--			}
- 		}
- 
- 		// append to the list of axis.
- 		axisList = append(axisList, axis)
--
--		// enforce a maximum number of axis that should be calculated.
--		if p > limitAxis {
--			break
--		}
- 	}
- 
- 	return axisList

compiler/asar/default.nix

@@ -1,20 +0,0 @@
-{
-  fetchFromGitHub,
-  cmake,
-  ninja,
-  stdenv,
-}: let
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-in
-  stdenv.mkDerivation {
-    pname = "asar";
-    version = source.date;
-    src = fetchFromGitHub {
-      owner = "RPGHacker";
-      repo = "asar";
-      inherit (source) rev sha256;
-    };
-    nativeBuildInputs = [cmake ninja];
-    cmakeDir = "../src";
-    passthru.updateScript = [../../scripts/update-git.sh "https://github.com/RPGHacker/asar" "compiler/asar/source.json"];
-  }

compiler/asar/source.json

@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/RPGHacker/asar",
-  "rev": "cb78f31f890460f83a066a114e9c64bc3a15708a",
-  "date": "2023-07-18T09:27:42+02:00",
-  "path": "/nix/store/jdydjx2am9rd2m584x6db98h4daww40j-asar",
-  "sha256": "00rk52mba49ixpgy6dcinln473pa9326xk9s0rc6ck7ck9wc2a3f",
-  "hash": "sha256-bijBeJrsTGZYBjrNbsRI6o5DLLWRNePf7TERtaooMwM=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

default.nix

@@ -8,90 +8,9 @@
 {pkgs ? import <nixpkgs> {}}: let
   lib = import ./lib {inherit pkgs;}; # functions
   flake = (lib.importFlake {inherit (pkgs) system;}).defaultNix;
-  pkgsWithOverlay = pkgs.appendOverlays [(import ./overlay.nix pkgs.system)];
 in
   {
     # The `lib`, `modules`, and `overlay` names are special
     inherit (flake) lib modules overlays;
   }
-  // {
-    inherit
-      (pkgsWithOverlay)
-      akkoma
-      akkoma-fe
-      admin-fe
-      emoji-lotte
-      emoji-volpeon-blobfox
-      emoji-volpeon-blobfox-flip
-      emoji-volpeon-bunhd
-      emoji-volpeon-bunhd-flip
-      emoji-volpeon-drgn
-      emoji-volpeon-fox
-      emoji-volpeon-gphn
-      emoji-volpeon-raccoon
-      emoji-volpeon-vlpn
-      emoji-volpeon-neofox
-      emoji-volpeon-neocat
-      emoji-caro
-      lotte-art
-      alco-sans
-      constructium
-      fairfax
-      fairfax-hd
-      kreative-square
-      nasin-nanpa
-      matrix-media-repo
-      mautrix-discord
-      mautrix-whatsapp
-      mautrix-signal
-      mautrix-telegram
-      python-mautrix
-      python-tulir-telethon
-      papermc
-      python-plover-stroke
-      python-rtf-tokenize
-      plover
-      plover-plugins-manager
-      python-simplefuzzyset
-      plover-plugin-emoji
-      plover-plugin-tapey-tape
-      plover-plugin-yaml-dictionary
-      plover-plugin-machine-hid
-      plover-plugin-rkb1-hid
-      plover-dict-didoesdigital
-      miifox-net
-      old-homepage
-      python-instagram
-      element-web
-      mautrix-cleanup
-      woodpecker-agent
-      woodpecker-cli
-      woodpecker-frontend
-      woodpecker-server
-      hydra
-      hydra-unstable
-      wordpress-plugins
-      wordpress-themes
-      kubo
-      plover-plugin-python-dictionary
-      plover-plugin-stenotype-extended
-      plover-plugin-dotool-output
-      asar-asm
-      bsnes-plus
-      sliding-sync
-      ;
-  }
-  // (
-    if pkgs.system == "riscv64-linux"
-    then {
-      inherit (pkgsWithOverlay) vf2Kernel valgrind;
-    }
-    else {}
-  )
-  // (
-    if pkgs.system == "x86_64-linux"
-    then {
-      inherit (pkgsWithOverlay) linux-bcachefs bcachefs-tools;
-    }
-    else {}
-  )
+  // (flake.packages.${pkgs.system})

emulator/bsnes-plus/default.nix

@@ -1,34 +0,0 @@
-{
-  fetchFromGitHub,
-  stdenv,
-  qtbase,
-  wrapQtAppsHook,
-  pkg-config,
-  SDL,
-  libXv,
-  libao,
-  openal,
-}: let
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-in
-  stdenv.mkDerivation {
-    pname = "bsnes-plus";
-    version = source.date;
-    src = fetchFromGitHub {
-      owner = "devinacker";
-      repo = "bsnes-plus";
-      inherit (source) rev sha256;
-    };
-    makeFlags = ["-C" "bsnes" "out=bsnes"];
-    buildInputs = [qtbase SDL libXv libao openal];
-    nativeBuildInputs = [wrapQtAppsHook pkg-config];
-    passthru.updateScript = [../../scripts/update-git.sh "https://github.com/devinacker/bsnes-plus" "emulator/bsnes-plus/source.json"];
-    preInstall = ''
-      export HOME=$(mktemp -d)
-      export prefix=$out
-    '';
-    preFixup = ''
-      qtWrapperArgs+=("--unset" "WAYLAND_DISPLAY")
-    '';
-    enableParallelBuilding = true;
-  }

emulator/bsnes-plus/source.json

@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/devinacker/bsnes-plus",
-  "rev": "14e00375ba15cd605bf716117cd66ddaf5d93914",
-  "date": "2023-06-05T20:56:09-04:00",
-  "path": "/nix/store/pn7q6xy2hpd57s2a29j4zp3lk06sf462-bsnes-plus",
-  "sha256": "0g7djccmshidqjcpgm0w8mvi4wy1w2v3zfvl1sv5caarch6kdswv",
-  "hash": "sha256-m+s2DWRZKVa2DnS7P7bgwXMSd0Uc1HeZxC1CXRmT7Tw=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

flake.lock

@@ -1,19 +1,62 @@
 {
   "nodes": {
+    "cargo2nix": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1678094756,
+        "narHash": "sha256-FoVmeU9ITOhKO/wQt76JMZsIDxfNmzgkqHud6hrHB18=",
+        "owner": "DarkKirb",
+        "repo": "cargo2nix",
+        "rev": "a2c22af726db8fca367865d6631b3f321eadc647",
+        "type": "github"
+      },
+      "original": {
+        "owner": "DarkKirb",
+        "ref": "release-0.11.0",
+        "repo": "cargo2nix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696267196,
-        "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85",
         "type": "github"
       }
     },
@@ -32,68 +75,6 @@
         "type": "github"
       }
     },
-    "gomod2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": [
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1692555015,
-        "narHash": "sha256-QS7fNVS9ToprIt93R/S+BVerAttNkYI3/SVQI3jciLs=",
-        "owner": "DarkKirb",
-        "repo": "gomod2nix",
-        "rev": "de2e02108ef1e6ab52a71676f7735a3fc1bea741",
-        "type": "github"
-      },
-      "original": {
-        "owner": "DarkKirb",
-        "repo": "gomod2nix",
-        "type": "github"
-      }
-    },
-    "hydra": {
-      "inputs": {
-        "nix": "nix",
-        "nixpkgs": [
-          "hydra",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1685431783,
-        "narHash": "sha256-NriQMCsRiB7fYJ9v+3Tw3/jshB8y/tNsHwgqz24cxO4=",
-        "ref": "refs/heads/master",
-        "rev": "51c2319f653df748adfbc7a5fa7440205ad884df",
-        "revCount": 4066,
-        "type": "git",
-        "url": "https://git.chir.rs/darkkirb/hydra"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.chir.rs/darkkirb/hydra"
-      }
-    },
-    "lowdown-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1633514407,
-        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
     "mautrix-cleanup": {
       "inputs": {
         "flake-utils": [
@@ -117,66 +98,13 @@
         "type": "github"
       }
     },
-    "nix": {
-      "inputs": {
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1677045134,
-        "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "2.13.3",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1670461440,
-        "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
+        "lastModified": 1679425154,
+        "narHash": "sha256-Q5nRtuIT/IlEUGshmHe5PYbc9H72aps5HzP/ae8ehpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1697518372,
-        "narHash": "sha256-EMDQddQwSKa6Feq8pz5rhpb+s3f4Lff8CekgO/v5vF8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "57b4f546d5ec6b285563186a3d50250da83d14c2",
+        "rev": "e400f93529cb4ad6e095e42b17b303f5003f6f26",
         "type": "github"
       },
       "original": {
@@ -187,12 +115,35 @@
     },
     "root": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "cargo2nix": "cargo2nix",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils",
-        "gomod2nix": "gomod2nix",
-        "hydra": "hydra",
         "mautrix-cleanup": "mautrix-cleanup",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1679624450,
+        "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -2,10 +2,15 @@
   description = "Lotte’s nix packages";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    cargo2nix = {
+      url = "github:DarkKirb/cargo2nix/release-0.11.0";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.rust-overlay.follows = "rust-overlay";
+    };
     flake-utils.url = "github:DarkKirb/flake-utils";
     flake-compat = {
-      url = "github:edolstra/flake-compat/4f910c9827911b1ec2bf26b5a062cd09f8d89f85";
+      url = "github:edolstra/flake-compat";
       flake = false;
     };
     mautrix-cleanup = {
@@ -13,13 +18,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-    gomod2nix = {
-      url = "github:DarkKirb/gomod2nix";
+    nixpkgs.url = "github:NixOS/nixpkgs";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.utils.follows = "flake-utils";
-    };
-    hydra = {
-      url = "git+https://git.chir.rs/darkkirb/hydra";
+      inputs.flake-utils.follows = "flake-utils";
     };
   };
 
@@ -28,22 +31,19 @@
     nixpkgs,
     flake-utils,
     ...
-  }:
+  } @ inputs:
     flake-utils.lib.eachSystem ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" "riscv64-linux"] (
       system: let
         pkgs = import nixpkgs {
           inherit system;
           config.allowUnfree = true;
           config.allowUnsupportedSystem = true;
-          overlays = [
-            self.overlays.${system}.default
-          ];
+          overlays = [inputs.cargo2nix.overlays.default];
         };
+        inherit (pkgs) lib;
       in rec {
         formatter = pkgs.alejandra;
 
-        overlays.default = import ./overlay.nix system;
-
         devShells.default = pkgs.mkShell {
           nativeBuildInputs = with pkgs; [
             statix
@@ -53,93 +53,74 @@
 
         packages =
           {
-            inherit
-              (pkgs)
-              akkoma
-              akkoma-fe
-              admin-fe
-              emoji-lotte
-              emoji-volpeon-blobfox
-              emoji-volpeon-blobfox-flip
-              emoji-volpeon-bunhd
-              emoji-volpeon-bunhd-flip
-              emoji-volpeon-drgn
-              emoji-volpeon-fox
-              emoji-volpeon-gphn
-              emoji-volpeon-raccoon
-              emoji-volpeon-vlpn
-              emoji-volpeon-neofox
-              emoji-volpeon-neocat
-              emoji-caro
-              lotte-art
-              alco-sans
-              constructium
-              fairfax
-              fairfax-hd
-              kreative-square
-              nasin-nanpa
-              matrix-media-repo
-              mautrix-discord
-              mautrix-whatsapp
-              mautrix-signal
-              mautrix-telegram
-              python-mautrix
-              python-tulir-telethon
-              papermc
-              python-plover-stroke
-              python-rtf-tokenize
-              plover
-              plover-plugins-manager
-              python-simplefuzzyset
-              plover-plugin-emoji
-              plover-plugin-tapey-tape
-              plover-plugin-yaml-dictionary
-              plover-plugin-machine-hid
-              plover-plugin-rkb1-hid
-              plover-plugin-dotool-output
-              plover-dict-didoesdigital
-              miifox-net
-              old-homepage
-              python-instagram
-              element-web
-              mautrix-cleanup
-              woodpecker-agent
-              woodpecker-cli
-              woodpecker-frontend
-              woodpecker-server
-              wordpress-plugins
-              wordpress-themes
-              kubo
-              hydra
-              hydra-unstable
-              plover-plugin-python-dictionary
-              plover-plugin-stenotype-extended
-              asar-asm
-              bsnes-plus
-              sliding-sync
-              ;
+            akkoma = pkgs.callPackage ./akkoma {};
+            pleroma-fe = pkgs.callPackage ./akkoma/pleroma-fe {};
+            admin-fe = pkgs.callPackage ./akkoma/admin-fe {};
+            emoji-lotte = pkgs.callPackage ./art/emoji/lotte {};
+            emoji-volpeon-blobfox = pkgs.callPackage ./art/emoji/volpeon/blobfox.nix {};
+            emoji-volpeon-blobfox-flip = pkgs.callPackage ./art/emoji/volpeon/blobfox_flip.nix {};
+            emoji-volpeon-bunhd = pkgs.callPackage ./art/emoji/volpeon/bunhd.nix {};
+            emoji-volpeon-bunhd-flip = pkgs.callPackage ./art/emoji/volpeon/bunhd_flip.nix {};
+            emoji-volpeon-drgn = pkgs.callPackage ./art/emoji/volpeon/drgn.nix {};
+            emoji-volpeon-fox = pkgs.callPackage ./art/emoji/volpeon/fox.nix {};
+            emoji-volpeon-gphn = pkgs.callPackage ./art/emoji/volpeon/gphn.nix {};
+            emoji-volpeon-raccoon = pkgs.callPackage ./art/emoji/volpeon/raccoon.nix {};
+            emoji-volpeon-vlpn = pkgs.callPackage ./art/emoji/volpeon/vlpn.nix {};
+            emoji-caro = pkgs.callPackage ./art/emoji/caro {};
+            lotte-art = pkgs.callPackage ./art/lotte {};
+            drone-runner-docker = pkgs.callPackage ./ci/drone-runner-docker {};
+            alco-sans = pkgs.callPackage ./fonts/kreative/alco-sans.nix {};
+            constructium = pkgs.callPackage ./fonts/kreative/constructium.nix {};
+            fairfax = pkgs.callPackage ./fonts/kreative/fairfax.nix {};
+            fairfax-hd = pkgs.callPackage ./fonts/kreative/fairfax-hd.nix {};
+            kreative-square = pkgs.callPackage ./fonts/kreative/kreative-square.nix {};
+            nasin-nanpa = pkgs.callPackage ./fonts/nasin-nanpa {};
+            matrix-media-repo = pkgs.callPackage ./matrix/matrix-media-repo {};
+            mautrix-discord = pkgs.callPackage ./matrix/mautrix-discord {};
+            mautrix-whatsapp = pkgs.callPackage ./matrix/mautrix-whatsapp {};
+            mautrix-signal = pkgs.callPackage ./matrix/mautrix-signal {};
+            mautrix-telegram = pkgs.callPackage ./matrix/mautrix-telegram {};
+            python-mautrix = pkgs.python3Packages.callPackage ./python/mautrix.nix {};
+            python-tulir-telethon = pkgs.python3Packages.callPackage ./python/tulir-telethon.nix {};
+            papermc = pkgs.callPackage ./minecraft/papermc {};
+            python-plover-stroke = pkgs.python3Packages.callPackage ./plover/plover-stroke.nix {};
+            python-rtf-tokenize = pkgs.python3Packages.callPackage ./python/rtf-tokenize.nix {};
+            plover = pkgs.python3Packages.callPackage ./plover/plover {};
+            plover-plugins-manager = pkgs.python3Packages.callPackage ./plover/plover-plugins-manager.nix {};
+            python-simplefuzzyset = pkgs.python3Packages.callPackage ./python/simplefuzzyset.nix {};
+            plover-plugin-emoji = pkgs.python3Packages.callPackage ./plover/plover-emoji.nix {};
+            plover-plugin-tapey-tape = pkgs.python3Packages.callPackage ./plover/plover-tapey-tape.nix {};
+            plover-plugin-yaml-dictionary = pkgs.python3Packages.callPackage ./plover/plover-yaml-dictionary.nix {};
+            plover-plugin-machine-hid = pkgs.python3Packages.callPackage ./plover/plover-machine-hid.nix {};
+            plover-plugin-rkb1-hid = pkgs.python3Packages.callPackage ./plover/plover-rkb1-hid.nix {};
+            plover-dict-didoesdigital = pkgs.callPackage ./plover/didoesdigital-dictionary.nix {};
+            miifox-net = pkgs.python3Packages.callPackage ./web/miifox-net.nix {};
+            old-homepage = pkgs.callPackage ./web/old-homepage.nix {};
+            python-instagram = pkgs.python3Packages.callPackage ./python/instagram.nix {};
+            attic-client = pkgs.callPackage ./attic/attic-client.nix {};
+            attic-server = pkgs.callPackage ./attic/attic-server.nix {};
+            element-web = pkgs.callPackage ./matrix/element-web {};
+            mautrix-cleanup = inputs.mautrix-cleanup.packages.${pkgs.system}.default;
           }
           // (
             if system == "riscv64-linux"
-            then {
-              inherit (pkgs) vf2Kernel valgrind;
-            }
-            else {}
-          )
-          // (
-            if system == "x86_64-linux"
-            then {
-              inherit (pkgs) linux-bcachefs bcachefs-tools;
+            then rec {
+              vf2Kernel = pkgs.callPackage ./linux/vf2 {kernelPatches = [];};
+              vf2KernelPackages = pkgs.linuxPackagesFor vf2Kernel;
             }
             else {}
           );
 
+        overlays = import ./overlays;
         modules = import ./modules;
         lib = import ./lib {inherit pkgs;};
 
-        hydraJobs = {
-          inherit packages devShells formatter;
-        };
+        hydraJobs =
+          if (system == "x86_64-linux") || (system == "aarch64-linux")
+          then {
+            inherit packages devShells formatter;
+          }
+          else {};
       }
     );
 }

fonts/kreative/fairfax-hd.nix

@@ -22,7 +22,7 @@ in
     };
     passthru.updateScript = [
       ../../scripts/update-git.sh
-      "https://github.com/kreativekorp/open-relay.git"
+      "https://gitlab.com/kreativekorp/open-relay.git"
       "fonts/kreative/source.json"
     ];
   }

fonts/kreative/source.json

@@ -1,10 +1,9 @@
 {
-  "url": "https://github.com/kreativekorp/open-relay.git",
-  "rev": "19389264f6e82c99d283fd999efef3520d12a70c",
-  "date": "2023-09-24T15:51:56-07:00",
-  "path": "/nix/store/c9jb05z98j6bqsm7v4dxfax11icb4va6-open-relay",
-  "sha256": "0crjx238b3gvj5sfghpsrfplc59skzwignw44zsyba601i4kf4b4",
-  "hash": "sha256-ZBE3SQzAqOX1J4TbF/mfOhVGr8v6wud0kfuNhYboMjM=",
+  "url": "https://gitlab.com/kreativekorp/open-relay.git",
+  "rev": "6e0d49e586b44862a5c87da6d6caf2ed4f286178",
+  "date": "2022-10-20T06:08:47-07:00",
+  "path": "/nix/store/2kbzlxqxpyrr3mqwfyn4mk2qc6hjb7v8-open-relay",
+  "sha256": "02w7i6mrf5rdi9ksymykrcf0giyzrhrd68h1ncxhkvgg8cc7rkj6",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

fonts/kreative/source.nix

@@ -1,7 +1,7 @@
-{fetchFromGitHub}: let
+{fetchFromGitLab}: let
   source = builtins.fromJSON (builtins.readFile ./source.json);
 in
-  fetchFromGitHub {
+  fetchFromGitLab {
     owner = "kreativekorp";
     repo = "open-relay";
     inherit (source) rev sha256;

fonts/nasin-nanpa/source.json

@@ -1,10 +1,9 @@
 {
   "url": "https://github.com/ETBCOR/nasin-nanpa",
-  "rev": "1e9fd5533b28c475ac1d387db298ff1cfc7f5804",
-  "date": "2023-08-25T13:20:05-07:00",
-  "path": "/nix/store/fhrgy9wmwn3z7gscpwk6j29a01lzspnp-nasin-nanpa",
-  "sha256": "17gjg9bwv95bvkmcdvgxqnf4wk3irzmirny7r1bm5h53wqivv4pw",
-  "hash": "sha256-/JK9I+ajwFJXyMfbHOvPcUxOnMX97cbq3KukzVd68p0=",
+  "rev": "e58194a93c3d86b13e95aaf2b055eab5ddc87d36",
+  "date": "2022-10-30T12:16:27-07:00",
+  "path": "/nix/store/3djr1550vasald6y2d4w8b8rvmyn6is7-nasin-nanpa",
+  "sha256": "13jqf838vxv1g3v4k7pvivi1j0bhfl8v1p50x1azzhxlk8p6gvvy",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

fonts/nasin-nanpa/version.json

@@ -1 +1 @@
-{"major": "2.7", "minor": "2.7.01"}
+{"major": "2.6", "minor": "2.6.04"}

hydra/jobsets.nix

@@ -4,20 +4,22 @@
 }: let
   pkgs = import nixpkgs {};
   prs = builtins.fromJSON (builtins.readFile prsJSON);
-  systems = ["x86_64-linux" "aarch64-linux" "riscv64-linux"];
+  systems = ["x86_64-linux" "aarch64-linux"];
   nixpkgs_version = ["master"];
   mkJobsets = system: version:
-    (builtins.listToAttrs (
-      map (
-        info: {
-          name = "${system}-${version}-pr${toString info.number}";
+    (pkgs.lib.mapAttrs' (
+        num: info: {
+          name = "${system}-${version}-pr${num}";
           value = {
-            enabled = info.state == "open";
-            hidden = info.state != "open";
-            description = "PR ${toString info.number} (${system}-${version}): ${info.title}";
+            enabled = 1;
+            hidden = false;
+            description = "PR ${num} (${system}-${version}): ${info.title}";
             nixexprinput = "nix-packages";
             nixexprpath = "hydra/default.nix";
-            checkinterval = 3600;
+            checkinterval =
+              if info.head.repo.owner.login == "darkkirb" && info.head.repo.name == "nix-packages" # Don’t need to manually check
+              then 0
+              else 300;
             schedulingshares = 100;
             enableemail = false;
             emailoverride = "";
@@ -25,7 +27,7 @@
             inputs = {
               nix-packages = {
                 type = "git";
-                value = "${info.head.repo.clone_url} ${info.head.ref}";
+                value = "https://github.com/${info.head.repo.owner.login}/${info.head.repo.name}.git ${info.head.ref}";
                 emailresponsible = false;
               };
               nixpkgs = {
@@ -37,27 +39,11 @@
                 type = "string";
                 value = system;
               };
-              gitea_status_repo = {
-                type = "string";
-                value = "nix-packages";
-                emailresponsible = false;
-              };
-              gitea_repo_owner = {
-                type = "string";
-                value = "${info.head.repo.owner.login}";
-                emailresponsible = false;
-              };
-              gitea_repo_name = {
-                type = "string";
-                value = "${info.head.repo.name}";
-                emailresponsible = false;
-              };
             };
           };
         }
       )
-      prs
-    ))
+      prs)
     // {
       "${system}-${version}" = {
         enabled = 1;
@@ -73,7 +59,7 @@
         inputs = {
           nix-packages = {
             type = "git";
-            value = "https://git.chir.rs/darkkirb/nix-packages main";
+            value = "https://github.com/DarkKirb/nix-packages.git main";
             emailresponsible = false;
           };
           nixpkgs = {
@@ -85,26 +71,33 @@
             type = "string";
             value = system;
           };
-          gitea_status_repo = {
-            type = "string";
-            value = "nix-packages";
-            emailresponsible = false;
-          };
-          gitea_repo_owner = {
-            type = "string";
-            value = "darkkirb";
-            emailresponsible = false;
-          };
-          gitea_repo_name = {
-            type = "string";
-            value = "nix-packages";
+        };
+      };
+    };
+
+  concatAttrs = pkgs.lib.foldr (a: b: a // b) {};
+
+  jobsets =
+    (concatAttrs (pkgs.lib.concatMap (system: map (version: mkJobsets system version) nixpkgs_version) systems))
+    // {
+      nix-packages-flake = {
+        enabled = 1;
+        hidden = false;
+        description = "nix-packages flake";
+        nixexprinput = "nix-packages";
+        nixexprpath = "hydra/parse-flake.nix";
+        checkinterval = 0;
+        schedulingshares = 100;
+        enableemail = false;
+        emailoverride = "";
+        keepnr = 1;
+        inputs = {
+          flake = {
+            type = "git";
+            value = "https://github.com/DarkKirb/nix-packages.git main";
             emailresponsible = false;
           };
         };
       };
     };
-  concatAttrs = pkgs.lib.foldr (a: b: a // b) {};
-
-  jobsets =
-    concatAttrs (pkgs.lib.concatMap (system: map (version: mkJobsets system version) nixpkgs_version) systems);
 in {jobsets = pkgs.writeText "jobsets.json" (builtins.toJSON jobsets);}

hydra/spec.json

@@ -12,7 +12,7 @@
     "inputs": {
         "nix-packages": {
             "type": "git",
-            "value": "https://git.chir.rs/darkkirb/nix-packages.git main",
+            "value": "https://github.com/DarkKirb/nix-packages.git main",
             "emailresponsible": false
         },
         "nixpkgs": {
@@ -21,8 +21,8 @@
             "emailresponsible": false
         },
         "prsJSON": {
-            "type": "path",
-            "value": "https://git.chir.rs/api/v1/repos/darkkirb/nix-packages/pulls",
+            "type": "githubpulls",
+            "value": "DarkKirb nix-packages",
             "emailresponsible": false
         }
     }

ipfs/kubo/default.nix

@@ -1,77 +0,0 @@
-{
-  buildGoApplication,
-  fetchFromGitHub,
-  gnumake,
-  stdenv,
-  openssl,
-  pkg-config,
-  writeScript,
-}: let
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-  src = stdenv.mkDerivation {
-    pname = "kubo-source";
-    version = source.date;
-    src = fetchFromGitHub {
-      owner = "ipfs";
-      repo = "kubo";
-      inherit (source) rev sha256;
-    };
-    buildPhase = "";
-    installPhase = ''
-      cp -r $src $out
-      chmod -R +w $out
-      cd $out
-      cp ${./go.mod} go.mod
-      cp ${./go.sum} go.sum
-      echo -e "\nstorjds storj.io/ipfs-go-ds-storj/plugin 0" >> plugin/loader/preload_list
-      patchShebangs .
-    '';
-  };
-in
-  buildGoApplication rec {
-    pname = "kubo";
-    version = source.date;
-    inherit src;
-    modules = ./gomod2nix.toml;
-    buildInputs = [openssl];
-    nativeBuildInputs = [gnumake pkg-config];
-    subPackages = ["cmd/ipfs"];
-    tags = ["openssl"];
-    postPatch = ''
-      substituteInPlace 'misc/systemd/ipfs.service' \
-      --replace '/usr/bin/ipfs' "$out/bin/ipfs"
-      substituteInPlace 'misc/systemd/ipfs-hardened.service' \
-      --replace '/usr/bin/ipfs' "$out/bin/ipfs"
-    '';
-
-    outputs = ["out" "systemd_unit" "systemd_unit_hardened"];
-
-    buildPhase = ''
-      make build
-    '';
-
-    installPhase = ''
-        GOBIN=$out/bin make install
-      install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit/etc/systemd/system/ipfs-api.socket"
-      install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit/etc/systemd/system/ipfs-gateway.socket"
-      install --mode=444 -D 'misc/systemd/ipfs.service' "$systemd_unit/etc/systemd/system/ipfs.service"
-
-      install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket"
-      install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket"
-      install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service"
-    '';
-    postConfigure = ''
-      chmod -R +w vendor/
-      for f in $(find vendor/github.com/ipfs/boxo/gateway/assets -type l) vendor/github.com/ipfs/go-graphsync/message/ipldbind/*.ipldsch; do
-          cp -v --remove-destination -f `readlink $f` $f
-      done
-    '';
-    passthru.updateScript' = writeScript "update-matrix-media-repo" ''
-      ${../../scripts/update-git.sh} "https://github.com/ipfs/kubo" ipfs/kubo/source.json
-      if [ "$(git diff -- ipfs/kubo/source.json)" ]; then
-        SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
-        ${../../scripts/add-go-module.sh} $SRC_PATH ipfs/kubo "storj.io/ipfs-go-ds-storj/plugin@latest"
-      fi
-    '';
-    passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version
-  }

ipfs/kubo/go.mod

@@ -1,265 +0,0 @@
-module github.com/ipfs/kubo
-
-require (
-	bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc
-	contrib.go.opencensus.io/exporter/prometheus v0.4.2
-	github.com/benbjohnson/clock v1.3.0
-	github.com/blang/semver/v4 v4.0.0
-	github.com/cenkalti/backoff/v4 v4.2.0
-	github.com/ceramicnetwork/go-dag-jose v0.1.0
-	github.com/cheggaaa/pb v1.0.29
-	github.com/coreos/go-systemd/v22 v22.5.0
-	github.com/dustin/go-humanize v1.0.1
-	github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302
-	github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
-	github.com/fsnotify/fsnotify v1.6.0
-	github.com/gogo/protobuf v1.3.2
-	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-multierror v1.1.1
-	github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866
-	github.com/ipfs/go-block-format v0.1.2
-	github.com/ipfs/go-cid v0.4.1
-	github.com/ipfs/go-cidutil v0.1.0
-	github.com/ipfs/go-datastore v0.6.0
-	github.com/ipfs/go-delegated-routing v0.8.0
-	github.com/ipfs/go-detect-race v0.0.1
-	github.com/ipfs/go-ds-badger v0.3.0
-	github.com/ipfs/go-ds-flatfs v0.5.1
-	github.com/ipfs/go-ds-leveldb v0.5.0
-	github.com/ipfs/go-ds-measure v0.2.0
-	github.com/ipfs/go-fs-lock v0.0.7
-	github.com/ipfs/go-graphsync v0.14.4
-	github.com/ipfs/go-ipfs-cmds v0.9.0
-	github.com/ipfs/go-ipld-format v0.4.0
-	github.com/ipfs/go-ipld-git v0.1.1
-	github.com/ipfs/go-ipld-legacy v0.1.1
-	github.com/ipfs/go-log v1.0.5
-	github.com/ipfs/go-log/v2 v2.5.1
-	github.com/ipfs/go-metrics-interface v0.0.1
-	github.com/ipfs/go-metrics-prometheus v0.0.2
-	github.com/ipfs/go-unixfsnode v1.6.0
-	github.com/ipld/go-codec-dagpb v1.6.0
-	github.com/ipld/go-ipld-prime v0.20.0
-	github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
-	github.com/jbenet/go-temp-err-catcher v0.1.0
-	github.com/jbenet/goprocess v0.1.4
-	github.com/julienschmidt/httprouter v1.3.0
-	github.com/libp2p/go-doh-resolver v0.4.0
-	github.com/libp2p/go-libp2p v0.27.3
-	github.com/libp2p/go-libp2p-http v0.5.0
-	github.com/libp2p/go-libp2p-kad-dht v0.23.0
-	github.com/libp2p/go-libp2p-kbucket v0.5.0
-	github.com/libp2p/go-libp2p-pubsub v0.9.3
-	github.com/libp2p/go-libp2p-pubsub-router v0.6.0
-	github.com/libp2p/go-libp2p-record v0.2.0
-	github.com/libp2p/go-libp2p-routing-helpers v0.6.2
-	github.com/libp2p/go-libp2p-testing v0.12.0
-	github.com/libp2p/go-socket-activation v0.1.0
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/multiformats/go-multiaddr v0.9.0
-	github.com/multiformats/go-multiaddr-dns v0.3.1
-	github.com/multiformats/go-multibase v0.2.0
-	github.com/multiformats/go-multicodec v0.8.1
-	github.com/multiformats/go-multihash v0.2.1
-	github.com/opentracing/opentracing-go v1.2.0
-	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
-	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.14.0
-	github.com/stretchr/testify v1.8.2
-	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
-	github.com/tidwall/gjson v1.14.4
-	github.com/tidwall/sjson v1.2.5
-	github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1
-	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
-	go.opencensus.io v0.24.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0
-	go.opentelemetry.io/contrib/propagators/autoprop v0.40.0
-	go.opentelemetry.io/otel v1.14.0
-	go.opentelemetry.io/otel/sdk v1.14.0
-	go.opentelemetry.io/otel/trace v1.14.0
-	go.uber.org/dig v1.16.1
-	go.uber.org/fx v1.19.2
-	go.uber.org/zap v1.24.0
-	golang.org/x/crypto v0.7.0
-	golang.org/x/mod v0.10.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.7.0
-)
-
-require (
-	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
-	github.com/Kubuxu/go-os-helper v0.0.1 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
-	github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/calebcase/tmpfile v1.0.3 // indirect
-	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/cgroups v1.1.0 // indirect
-	github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
-	github.com/cskr/pubsub v1.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
-	github.com/dgraph-io/badger v1.6.2 // indirect
-	github.com/dgraph-io/ristretto v0.0.2 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/elastic/gosigar v0.14.2 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/flynn/noise v1.0.0 // indirect
-	github.com/francoispqt/gojay v1.2.13 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.1 // indirect
-	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/gopacket v1.1.19 // indirect
-	github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
-	github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
-	github.com/huin/goupnp v1.1.0 // indirect
-	github.com/ipfs/bbloom v0.0.4 // indirect
-	github.com/ipfs/go-bitfield v1.1.0 // indirect
-	github.com/ipfs/go-ipfs-blockstore v1.3.0 // indirect
-	github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
-	github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
-	github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
-	github.com/ipfs/go-ipfs-redirects-file v0.1.1 // indirect
-	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
-	github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
-	github.com/ipfs/go-libipfs v0.7.0 // indirect
-	github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
-	github.com/ipld/edelweiss v0.2.0 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.11.0 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.2.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.10.0 // indirect
-	github.com/jackc/pgx/v4 v4.15.0 // indirect
-	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
-	github.com/jtolds/tracetagger/v2 v2.0.0-rc5 // indirect
-	github.com/jtolio/eventkit v0.0.0-20221007130042-690145affff8 // indirect
-	github.com/jtolio/noiseconn v0.0.0-20230111204749-d7ec1a08b0b8 // indirect
-	github.com/klauspost/compress v1.16.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/koron/go-ssdp v0.0.4 // indirect
-	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-cidranger v1.1.0 // indirect
-	github.com/libp2p/go-flow-metrics v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
-	github.com/libp2p/go-libp2p-gostream v0.6.0 // indirect
-	github.com/libp2p/go-libp2p-xor v0.1.0 // indirect
-	github.com/libp2p/go-mplex v0.7.0 // indirect
-	github.com/libp2p/go-msgio v0.3.0 // indirect
-	github.com/libp2p/go-nat v0.1.0 // indirect
-	github.com/libp2p/go-netroute v0.2.1 // indirect
-	github.com/libp2p/go-reuseport v0.2.0 // indirect
-	github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
-	github.com/libp2p/zeroconf/v2 v2.2.0 // indirect
-	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
-	github.com/mattn/go-colorable v0.1.6 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
-	github.com/mattn/go-runewidth v0.0.4 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
-	github.com/miekg/dns v1.1.53 // indirect
-	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
-	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
-	github.com/minio/sha256-simd v1.0.0 // indirect
-	github.com/mr-tron/base58 v1.2.0 // indirect
-	github.com/multiformats/go-base32 v0.1.0 // indirect
-	github.com/multiformats/go-base36 v0.2.0 // indirect
-	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
-	github.com/multiformats/go-multistream v0.4.1 // indirect
-	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.2 // indirect
-	github.com/opencontainers/runtime-spec v1.0.2 // indirect
-	github.com/openzipkin/zipkin-go v0.4.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/polydawn/refmt v0.89.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
-	github.com/prometheus/statsd_exporter v0.22.7 // indirect
-	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-	github.com/quic-go/quic-go v0.33.0 // indirect
-	github.com/quic-go/webtransport-go v0.5.2 // indirect
-	github.com/raulk/go-watchdog v1.3.0 // indirect
-	github.com/rs/cors v1.7.0 // indirect
-	github.com/samber/lo v1.36.0 // indirect
-	github.com/spacemonkeygo/monkit/v3 v3.0.20-0.20230227152157-d00b379de191 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb // indirect
-	github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3 // indirect
-	github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc // indirect
-	github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa // indirect
-	github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
-	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
-	github.com/zeebo/admission/v3 v3.0.3 // indirect
-	github.com/zeebo/blake3 v0.2.3 // indirect
-	github.com/zeebo/errs v1.3.0 // indirect
-	github.com/zeebo/errs/v2 v2.0.3 // indirect
-	github.com/zeebo/float16 v0.1.0 // indirect
-	github.com/zeebo/incenc v0.0.0-20180505221441-0d92902eec54 // indirect
-	go.opentelemetry.io/contrib/propagators/aws v1.15.0 // indirect
-	go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
-	go.opentelemetry.io/contrib/propagators/jaeger v1.15.0 // indirect
-	go.opentelemetry.io/contrib/propagators/ot v1.15.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.14.0 // indirect
-	go.opentelemetry.io/otel/metric v0.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	gonum.org/v1/gonum v0.11.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
-	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.1.7 // indirect
-	nhooyr.io/websocket v1.8.7 // indirect
-	storj.io/common v0.0.0-20230317142710-ffea9ac03387 // indirect
-	storj.io/drpc v0.0.33-0.20230224050324-1fd05d3459f8 // indirect
-	storj.io/ipfs-go-ds-storj v0.6.0 // indirect
-	storj.io/picobuf v0.0.1 // indirect
-	storj.io/private v0.0.0-20230131204204-956b2ac10aba // indirect
-	storj.io/uplink v1.10.1-0.20230317162227-f9e94287ad79 // indirect
-	storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 // indirect
-)
-
-go 1.18

ipfs/kubo/gomod2nix.toml

@@ -1,771 +0,0 @@
-schema = 3
-
-[mod]
-  [mod."bazil.org/fuse"]
-    version = "v0.0.0-20200117225306-7b5117fecadc"
-    hash = "sha256-SJHNNHVMhSopYQcUILj+IyZ8vuWH5eIs7WhR4+dyzhw="
-  [mod."contrib.go.opencensus.io/exporter/prometheus"]
-    version = "v0.4.2"
-    hash = "sha256-t/lO5fWfENCTMu5onILingeoHa415upn/ExUhPvhwQA="
-  [mod."github.com/AndreasBriese/bbloom"]
-    version = "v0.0.0-20190825152654-46b345b51c96"
-    hash = "sha256-ydIJ4QKvQsDSAook9y0doDaTeXpyQUy1T+ySfOgFLAg="
-  [mod."github.com/Kubuxu/go-os-helper"]
-    version = "v0.0.1"
-    hash = "sha256-2bcGwJ8PbjHIdsZ0XVb89zIrHCbpXpFxg8XsDalHaCM="
-  [mod."github.com/alecthomas/units"]
-    version = "v0.0.0-20211218093645-b94a6e3cc137"
-    hash = "sha256-uriYmwxT69xbmWKO/5OAyeMa2lFBOJDrU2KtQh/+ZjY="
-  [mod."github.com/alexbrainman/goissue34681"]
-    version = "v0.0.0-20191006012335-3fc7a47baff5"
-    hash = "sha256-TFISoXWlKMawUevo8376o98R6MPG0FBZv5Gdo7TISAM="
-  [mod."github.com/benbjohnson/clock"]
-    version = "v1.3.0"
-    hash = "sha256-8ukpOZJpT682sQKQMfFEBumEwi6KBzC17cLC0N9bWuA="
-  [mod."github.com/beorn7/perks"]
-    version = "v1.0.1"
-    hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4="
-  [mod."github.com/blang/semver"]
-    version = "v3.5.1+incompatible"
-    hash = "sha256-vmoIH5J0esVFmLDT2ecwtalvJqRRoLwomysyvlIRmo8="
-  [mod."github.com/blang/semver/v4"]
-    version = "v4.0.0"
-    hash = "sha256-dJC22MjnfT5WqJ7x7Tc3Bvpw9tFnBn9HqfWFiM57JVc="
-  [mod."github.com/calebcase/tmpfile"]
-    version = "v1.0.3"
-    hash = "sha256-yI8CzRdznK8N0BZ+FJZNLOzZroBBrZ3PV/TTn33fK2A="
-  [mod."github.com/cenkalti/backoff"]
-    version = "v2.2.1+incompatible"
-    hash = "sha256-aMpsIH8tC5An/Ldb4yTweEbi/4e5gi7InGitPKimxNU="
-  [mod."github.com/cenkalti/backoff/v4"]
-    version = "v4.2.0"
-    hash = "sha256-hDbaLGOYH+oy45uCdM/ICPp+ib5QONwB/t29W2GZzCw="
-  [mod."github.com/ceramicnetwork/go-dag-jose"]
-    version = "v0.1.0"
-    hash = "sha256-E2OFWfH40+xkOp1ymTIvZplnqsBAJM8gOa4jKPzw7TU="
-  [mod."github.com/cespare/xxhash"]
-    version = "v1.1.0"
-    hash = "sha256-nVDTtXH9PC3yJ0THaQZEN243UP9xgLi/clt5xRqj3+M="
-  [mod."github.com/cespare/xxhash/v2"]
-    version = "v2.2.0"
-    hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4="
-  [mod."github.com/cheggaaa/pb"]
-    version = "v1.0.29"
-    hash = "sha256-G0LynvELyT0XBFH/Xp4OcTr10OKsV3/K6sHNEyz4gn8="
-  [mod."github.com/containerd/cgroups"]
-    version = "v1.1.0"
-    hash = "sha256-86t3du0TVwGMDIX6XMX9VPTho4h00nBepdm1wPVGNK4="
-  [mod."github.com/coreos/go-systemd/v22"]
-    version = "v22.5.0"
-    hash = "sha256-E2zXikbmIQImghstLUWuey1YgA0Folu3F+fi5k4hCxA="
-  [mod."github.com/crackcomm/go-gitignore"]
-    version = "v0.0.0-20170627025303-887ab5e44cc3"
-    hash = "sha256-dPLTmVoRFY2nk6IhuXMQaTzEmYoDDrXccA0MgKBBfs0="
-  [mod."github.com/cskr/pubsub"]
-    version = "v1.0.2"
-    hash = "sha256-Lsk/IM8XCyErOhwfhiDCqcdy58Yt5TFeT5/mrspjKHM="
-  [mod."github.com/davecgh/go-spew"]
-    version = "v1.1.1"
-    hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="
-  [mod."github.com/davidlazar/go-crypto"]
-    version = "v0.0.0-20200604182044-b73af7476f6c"
-    hash = "sha256-aDgsk+QsLgtbUHDuq44fDDcA8DNxqyX+4xqiqRWCi4I="
-  [mod."github.com/decred/dcrd/dcrec/secp256k1/v4"]
-    version = "v4.1.0"
-    hash = "sha256-cS4ZrKz1B4G7+vqih6B7C/WNkcMvRKmvR6S8aw7PotY="
-  [mod."github.com/dgraph-io/badger"]
-    version = "v1.6.2"
-    hash = "sha256-D/iXyiNZ8/7tBtA9msk10vVWfohWEPqFdobzRwKlvQQ="
-  [mod."github.com/dgraph-io/ristretto"]
-    version = "v0.0.2"
-    hash = "sha256-iDVBuJDNQbLlSjPQfife1j0Lv0IYIejkCX8h5Sse6Eo="
-  [mod."github.com/docker/go-units"]
-    version = "v0.5.0"
-    hash = "sha256-iK/V/jJc+borzqMeqLY+38Qcts2KhywpsTk95++hImE="
-  [mod."github.com/dustin/go-humanize"]
-    version = "v1.0.1"
-    hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc="
-  [mod."github.com/elastic/gosigar"]
-    version = "v0.14.2"
-    hash = "sha256-zIrTrgtCRJP2tqW71EJan+JdLqPCANtumWTEURPMbjw="
-  [mod."github.com/elgris/jsondiff"]
-    version = "v0.0.0-20160530203242-765b5c24c302"
-    hash = "sha256-mDTyEvoTjsvxp/xOeBUhVvtfr4MXS9QbnhWGUTTAoUo="
-  [mod."github.com/facebookgo/atomicfile"]
-    version = "v0.0.0-20151019160806-2de1f203e7d5"
-    hash = "sha256-Zgu5YTeVIz1wgKi13l07A4Rd8l26Iobl7jIA4002Xe8="
-  [mod."github.com/felixge/httpsnoop"]
-    version = "v1.0.3"
-    hash = "sha256-qV3UPYKKBQDTzAUzzsTpfdbGhFnkmTO/r5ylPL1SyfA="
-  [mod."github.com/flynn/noise"]
-    version = "v1.0.0"
-    hash = "sha256-3jgUjFlOYLPdcSKOy7A5uqA7nUnGxis7ZtyAjn2H18g="
-  [mod."github.com/francoispqt/gojay"]
-    version = "v1.2.13"
-    hash = "sha256-BrRZd2lEF5CQVmUTLW9AwQ0DY5ZbFJ8c7NVJ5Rsuqcc="
-  [mod."github.com/fsnotify/fsnotify"]
-    version = "v1.6.0"
-    hash = "sha256-DQesOCweQPEwmAn6s7DCP/Dwy8IypC+osbpfsvpkdP0="
-  [mod."github.com/gabriel-vasile/mimetype"]
-    version = "v1.4.1"
-    hash = "sha256-4Dt7xI9RsygeJdjxBy78H5GMMZONOGwgCosjUgfAi4I="
-  [mod."github.com/go-kit/log"]
-    version = "v0.2.1"
-    hash = "sha256-puLJ+up45X2j9E3lXvBPKqHPKOA/sFAhfCqGxsITW/Y="
-  [mod."github.com/go-logfmt/logfmt"]
-    version = "v0.5.1"
-    hash = "sha256-t50m9ffvW8PiGvO+2svnLI+N/XaWaBS+ZlhwrEQn2gU="
-  [mod."github.com/go-logr/logr"]
-    version = "v1.2.3"
-    hash = "sha256-2L7k6GfrcW3GXXYr1FYIu20aZBjIF0cTKdte6D4riH8="
-  [mod."github.com/go-logr/stdr"]
-    version = "v1.2.2"
-    hash = "sha256-rRweAP7XIb4egtT1f2gkz4sYOu7LDHmcJ5iNsJUd0sE="
-  [mod."github.com/go-task/slim-sprig"]
-    version = "v0.0.0-20230315185526-52ccab3ef572"
-    hash = "sha256-D6NjCQbcYC53NdwzyAm4i9M1OjTJIVu4EIt3AD/Vxfg="
-  [mod."github.com/godbus/dbus/v5"]
-    version = "v5.1.0"
-    hash = "sha256-xOCMJpQK3KTmHTPn/CdqI4j0eENCtMmJDgAIoYqYOEY="
-  [mod."github.com/gogo/protobuf"]
-    version = "v1.3.2"
-    hash = "sha256-pogILFrrk+cAtb0ulqn9+gRZJ7sGnnLLdtqITvxvG6c="
-  [mod."github.com/golang/groupcache"]
-    version = "v0.0.0-20210331224755-41bb18bfe9da"
-    hash = "sha256-7Gs7CS9gEYZkbu5P4hqPGBpeGZWC64VDwraSKFF+VR0="
-  [mod."github.com/golang/mock"]
-    version = "v1.6.0"
-    hash = "sha256-fWdnMQisRbiRzGT3ISrUHovquzLRHWvcv1JEsJFZRno="
-  [mod."github.com/golang/protobuf"]
-    version = "v1.5.3"
-    hash = "sha256-svogITcP4orUIsJFjMtp+Uv1+fKJv2Q5Zwf2dMqnpOQ="
-  [mod."github.com/golang/snappy"]
-    version = "v0.0.4"
-    hash = "sha256-Umx+5xHAQCN/Gi4HbtMhnDCSPFAXSsjVbXd8n5LhjAA="
-  [mod."github.com/google/gopacket"]
-    version = "v1.1.19"
-    hash = "sha256-EueA6b+c7SWJjII3HiFnMMKj3mIbAdzboJo6HBZnkkc="
-  [mod."github.com/google/pprof"]
-    version = "v0.0.0-20230405160723-4a4c7d95572b"
-    hash = "sha256-eGN0CIcpsfOTW6vf5G09a7ShMfOdGvUhlr8iMu5GZMI="
-  [mod."github.com/google/uuid"]
-    version = "v1.3.0"
-    hash = "sha256-QoR55eBtA94T2tBszyxfDtO7/pjZZSGb5vm7U0Xhs0Y="
-  [mod."github.com/gorilla/mux"]
-    version = "v1.8.0"
-    hash = "sha256-s905hpzMH9bOLue09E2JmzPXfIS4HhAlgT7g13HCwKE="
-  [mod."github.com/grpc-ecosystem/grpc-gateway/v2"]
-    version = "v2.7.0"
-    hash = "sha256-A/+ccwjMyY16xWZ6YkClIFtzck8zTEaLMZ8ttCtx7E4="
-  [mod."github.com/hannahhoward/go-pubsub"]
-    version = "v0.0.0-20200423002714-8d62886cc36e"
-    hash = "sha256-JqoDIaztUDEl23C53r2+4RwmDvkosdzbJp/Lz+KLL5o="
-  [mod."github.com/hashicorp/errwrap"]
-    version = "v1.1.0"
-    hash = "sha256-6lwuMQOfBq+McrViN3maJTIeh4f8jbEqvLy2c9FvvFw="
-  [mod."github.com/hashicorp/go-multierror"]
-    version = "v1.1.1"
-    hash = "sha256-ANzPEUJIZIlToxR89Mn7Db73d9LGI51ssy7eNnUgmlA="
-  [mod."github.com/hashicorp/golang-lru"]
-    version = "v0.5.4"
-    hash = "sha256-1skUMZX+iIf66J1TBVYGWO1OWwQcaoXut3mne331q+k="
-  [mod."github.com/hashicorp/golang-lru/v2"]
-    version = "v2.0.2"
-    hash = "sha256-onQzRd7OJq6bWaKOUSRBEf18FyKwRf7z9xwoWtBTXoc="
-  [mod."github.com/huin/goupnp"]
-    version = "v1.1.0"
-    hash = "sha256-H6w9CBUvpdB2Who7L/PdhQ15fwJrw4Vc09hwyjROhNE="
-  [mod."github.com/ipfs/bbloom"]
-    version = "v0.0.4"
-    hash = "sha256-4k778kBlNul2Rc4xuNQ9WA4kT0V7x5X9odZrT+2xjTU="
-  [mod."github.com/ipfs/boxo"]
-    version = "v0.8.2-0.20230503105907-8059f183d866"
-    hash = "sha256-ZGEh4C/XHgQW54qbzX2oE5ZKW8/xgI8mheLtO2flBAk="
-  [mod."github.com/ipfs/go-bitfield"]
-    version = "v1.1.0"
-    hash = "sha256-wxiN3ajYwH6VvYGiz9QVrVGe+QW34LQgmPDHKV7jD/4="
-  [mod."github.com/ipfs/go-block-format"]
-    version = "v0.1.2"
-    hash = "sha256-VHqAj1KQ8aun3JYR6ELSoSbxIkYDzQY6TnQLE+YPYBo="
-  [mod."github.com/ipfs/go-cid"]
-    version = "v0.4.1"
-    hash = "sha256-QygRTLQBk8tPQVs3k1m5koinkZtTRKWyakJCDV4rzT0="
-  [mod."github.com/ipfs/go-cidutil"]
-    version = "v0.1.0"
-    hash = "sha256-NtS7YelOiBeLN5SnZcjbj3cst9RyNekEzLm7LIjjKEg="
-  [mod."github.com/ipfs/go-datastore"]
-    version = "v0.6.0"
-    hash = "sha256-78/VQtKeA0AAvABAiAp0OTD5t6mn4kPlCdhJZoBy7/o="
-  [mod."github.com/ipfs/go-delegated-routing"]
-    version = "v0.8.0"
-    hash = "sha256-lpTu8eQtenc71xd5C5snmHF5Ootetlwq8W/G4FfScMA="
-  [mod."github.com/ipfs/go-detect-race"]
-    version = "v0.0.1"
-    hash = "sha256-ymK+c8hVHVR6JY8EwAlhKJnfigCZwlqkKOifZgwGC2c="
-  [mod."github.com/ipfs/go-ds-badger"]
-    version = "v0.3.0"
-    hash = "sha256-cCgrfiR3Rx5m9i4VEyUqn+PFNUo23quXfhnTHFU6Fho="
-  [mod."github.com/ipfs/go-ds-flatfs"]
-    version = "v0.5.1"
-    hash = "sha256-Q3qlh/nH3huvCenaDS9HFeaFfse7+3bdJ41gqqehL9c="
-  [mod."github.com/ipfs/go-ds-leveldb"]
-    version = "v0.5.0"
-    hash = "sha256-A7ez2DcfZBovyH+W72JDkkgc385oGODYBwD+f2XdJ8I="
-  [mod."github.com/ipfs/go-ds-measure"]
-    version = "v0.2.0"
-    hash = "sha256-ixSXKBlH/bMHe1Vtlts4LXtx/H6WLj47DgiGpQMy45I="
-  [mod."github.com/ipfs/go-fs-lock"]
-    version = "v0.0.7"
-    hash = "sha256-/1nNpdeZB0N5L0BVC15cAl5U/SsQNU584zcVeTATxf0="
-  [mod."github.com/ipfs/go-graphsync"]
-    version = "v0.14.4"
-    hash = "sha256-2tb5HSMt4BDnoIwwZg2tT48RGHQ0MIYz2L8IPLL3bdo="
-  [mod."github.com/ipfs/go-ipfs-blockstore"]
-    version = "v1.3.0"
-    hash = "sha256-QQ793vSR6VuhPA7YyK/0yioZZxdPQL9Ewo8FqOYesZY="
-  [mod."github.com/ipfs/go-ipfs-cmds"]
-    version = "v0.9.0"
-    hash = "sha256-I2wryc8RAwovivJLqre998rtlRyHaGEP6d15qIpIsqc="
-  [mod."github.com/ipfs/go-ipfs-delay"]
-    version = "v0.0.1"
-    hash = "sha256-PO6LIwGMEIITpBxY1YLX1iBIlK8jIWhXhGFqIYxkqig="
-  [mod."github.com/ipfs/go-ipfs-ds-help"]
-    version = "v1.1.0"
-    hash = "sha256-mIoT+VT8Mo3Yff4JvwGiyQtvCsAHvuvkqTbcNOWewiQ="
-  [mod."github.com/ipfs/go-ipfs-pq"]
-    version = "v0.0.3"
-    hash = "sha256-BG0QN1TCxVjbl2H5EGWUu4tMOOse0HTVF8447ek5IX4="
-  [mod."github.com/ipfs/go-ipfs-redirects-file"]
-    version = "v0.1.1"
-    hash = "sha256-/2JQ+K0iQZuIdFm7EdI4v07AX3TcfVnQsyraJUvTkZo="
-  [mod."github.com/ipfs/go-ipfs-util"]
-    version = "v0.0.2"
-    hash = "sha256-8b4gun6mgUiAReBYbrFjBHAyvdKkg41d1/JmwZhg9LQ="
-  [mod."github.com/ipfs/go-ipld-cbor"]
-    version = "v0.0.6"
-    hash = "sha256-bb7jO2s1Wy0V9Uu9U3jON9E1BJh6IKYbEEfB/oglvpU="
-  [mod."github.com/ipfs/go-ipld-format"]
-    version = "v0.4.0"
-    hash = "sha256-uG9vhhXspIkNyzKsy9iKSecRzTnrmkRQ1qKHZdGGz1w="
-  [mod."github.com/ipfs/go-ipld-git"]
-    version = "v0.1.1"
-    hash = "sha256-J8gSlii21Zx76+412/qG6Sg5zSzwhLRKaGEp71JiWRk="
-  [mod."github.com/ipfs/go-ipld-legacy"]
-    version = "v0.1.1"
-    hash = "sha256-/ndug5BsfTJfod7mgCBgzOSGhQGnEW/8YbkzCMutCQw="
-  [mod."github.com/ipfs/go-libipfs"]
-    version = "v0.7.0"
-    hash = "sha256-7poQe7kNdfyWcS5TNDtOkZ2cyqVvyebASL07a4lfLBI="
-  [mod."github.com/ipfs/go-log"]
-    version = "v1.0.5"
-    hash = "sha256-WQarHZo2y/rH6ixLsOlN5fFZeLUqsOTMnvdxszP2Qj4="
-  [mod."github.com/ipfs/go-log/v2"]
-    version = "v2.5.1"
-    hash = "sha256-CqujRB8/Cf0N7GwEtpxp0kI+UuA4I4ggMcNfOxHXA/o="
-  [mod."github.com/ipfs/go-metrics-interface"]
-    version = "v0.0.1"
-    hash = "sha256-/vXCR/eiNvPMB0ToDWN6atmnpDGAr/kjxdbpckI4rCc="
-  [mod."github.com/ipfs/go-metrics-prometheus"]
-    version = "v0.0.2"
-    hash = "sha256-1007Mm1hDyVAP35PLcfFus7xD51pFZGJ/v4NBaTkP/w="
-  [mod."github.com/ipfs/go-peertaskqueue"]
-    version = "v0.8.1"
-    hash = "sha256-+A1W45/HLhPyEvbdPLQ5cEKkJrlcxdbDmyNJo0EzJOw="
-  [mod."github.com/ipfs/go-unixfsnode"]
-    version = "v1.6.0"
-    hash = "sha256-EpMW09eVngA40rv5Kthlouz+oi958d3YBCMpH+iNBZ4="
-  [mod."github.com/ipld/edelweiss"]
-    version = "v0.2.0"
-    hash = "sha256-/wQajtzf4mEDsjTbZh62O0+xKkfDUMzy842jzgxGTF0="
-  [mod."github.com/ipld/go-codec-dagpb"]
-    version = "v1.6.0"
-    hash = "sha256-eO6F8o2g1JXYwQ3ejaZRUjNQhlzUtVdS1FwIkd/ieck="
-  [mod."github.com/ipld/go-ipld-prime"]
-    version = "v0.20.0"
-    hash = "sha256-xx/UefVKKden8UFTsH7Pv/Stfwsvnivyk4kQ9bd9JQY="
-  [mod."github.com/jackc/chunkreader/v2"]
-    version = "v2.0.1"
-    hash = "sha256-LNAEmbsxWOVPtcQ1fE1JC1yTaqyvZGa/k4zocWFBRTo="
-  [mod."github.com/jackc/pgconn"]
-    version = "v1.11.0"
-    hash = "sha256-C5bz7645ERBPkmeQAUIeOW02qS9PnQyV0VQL/OW6t/g="
-  [mod."github.com/jackc/pgio"]
-    version = "v1.0.0"
-    hash = "sha256-4W0PGZlkbBZcSJmPyXi9v1gAJIK9ujVLlcbxEOx9J1A="
-  [mod."github.com/jackc/pgpassfile"]
-    version = "v1.0.0"
-    hash = "sha256-H0nFbC34/3pZUFnuiQk9W7yvAMh6qJDrqvHp+akBPLM="
-  [mod."github.com/jackc/pgproto3/v2"]
-    version = "v2.2.0"
-    hash = "sha256-f7MKCvqPFa+xcAsUOiIs9mQUWOyHeUu7EqXvdU2apOI="
-  [mod."github.com/jackc/pgservicefile"]
-    version = "v0.0.0-20200714003250-2b9c44734f2b"
-    hash = "sha256-sNfMMlmdlb5P4a4EgIHaHOcHD9N6IflYHjWj0hSI640="
-  [mod."github.com/jackc/pgtype"]
-    version = "v1.10.0"
-    hash = "sha256-uDQIuEU9cC+wuAbTHG7h5hXL5gWTW91V1KgLYsMF2w8="
-  [mod."github.com/jackc/pgx/v4"]
-    version = "v4.15.0"
-    hash = "sha256-ThYxJk1fz+1lw0B5bi5p4b9Fy0ltotXw+NJkAYiSK2I="
-  [mod."github.com/jackpal/go-nat-pmp"]
-    version = "v1.0.2"
-    hash = "sha256-L1D4Yoxnzihs795GZ+Q3AZsFP5c4iqyjTeyrudzPXtw="
-  [mod."github.com/jbenet/go-random"]
-    version = "v0.0.0-20190219211222-123a90aedc0c"
-    hash = "sha256-gys4okqErwSnPP7jM3oLO7KmbpDGI41srNmci2oK/U0="
-  [mod."github.com/jbenet/go-temp-err-catcher"]
-    version = "v0.1.0"
-    hash = "sha256-+SSoW7g/ADswuIS4AyVEp3+cH8KzByHlIJhLA6EUiFg="
-  [mod."github.com/jbenet/goprocess"]
-    version = "v0.1.4"
-    hash = "sha256-U8K2bPDD8xkc+EcDMRpTaCcHN/jfsHvEYQLO1Kcuivw="
-  [mod."github.com/jtolds/tracetagger/v2"]
-    version = "v2.0.0-rc5"
-    hash = "sha256-7b8j99Gvu0srO2Edq6sF1VbPhJJ9NG/nb3bVGQexh/Q="
-  [mod."github.com/jtolio/eventkit"]
-    version = "v0.0.0-20221007130042-690145affff8"
-    hash = "sha256-wYWvypHQaejki9+GVa4nnIHMMw/FrV0Nw6SWEs0gE1g="
-  [mod."github.com/jtolio/noiseconn"]
-    version = "v0.0.0-20230111204749-d7ec1a08b0b8"
-    hash = "sha256-fthvEpHx6goIMZhoL845bNu5RrhI/U77dMaWT4n5W4Y="
-  [mod."github.com/julienschmidt/httprouter"]
-    version = "v1.3.0"
-    hash = "sha256-YVbnyFLVZX1mtqcwM1SStQdhcQsPHyi1ltpOrD3w2qg="
-  [mod."github.com/klauspost/compress"]
-    version = "v1.16.4"
-    hash = "sha256-nvSTPjVUHefNjhI8rMixsmmnh9L8tTomQgLHIwCITOw="
-  [mod."github.com/klauspost/cpuid/v2"]
-    version = "v2.2.4"
-    hash = "sha256-EjWkW6py3nYOut+YY9waTI2OegIFQWuJRS1hZ+F+obU="
-  [mod."github.com/koron/go-ssdp"]
-    version = "v0.0.4"
-    hash = "sha256-jjh1CnkjEgFju//kJwAFrsIX9sGS667N5A/azenv/yk="
-  [mod."github.com/libp2p/go-buffer-pool"]
-    version = "v0.1.0"
-    hash = "sha256-wQqGTtRWsfR9n0O/SXHVgECebbnNmHddxJIbG63OJBQ="
-  [mod."github.com/libp2p/go-cidranger"]
-    version = "v1.1.0"
-    hash = "sha256-aqk225oAthKAvCbtsLNH8CwMcmYBj2x/URafDsukHxY="
-  [mod."github.com/libp2p/go-doh-resolver"]
-    version = "v0.4.0"
-    hash = "sha256-xhj+VPNNeICXhnNyV99l5fj0IcMupY+dXMW0N9yJVis="
-  [mod."github.com/libp2p/go-flow-metrics"]
-    version = "v0.1.0"
-    hash = "sha256-0AhjqJHOawVHURHguVLyhnYHbzsBSllBbF9Yljcyy48="
-  [mod."github.com/libp2p/go-libp2p"]
-    version = "v0.27.3"
-    hash = "sha256-Om4IOGaUUxxSvgvNO+KYODz4FPZUBz+GnglETwuZu5Y="
-  [mod."github.com/libp2p/go-libp2p-asn-util"]
-    version = "v0.3.0"
-    hash = "sha256-oN7SWvEHzpVO0xnH5uXy9h3aiOrQmwMrlt8CiNYPGds="
-  [mod."github.com/libp2p/go-libp2p-gostream"]
-    version = "v0.6.0"
-    hash = "sha256-vAYpYReeFt0d+PFD8i263cXkaMQ+cv4C+wqkIiXcBf8="
-  [mod."github.com/libp2p/go-libp2p-http"]
-    version = "v0.5.0"
-    hash = "sha256-9s+fYwP7+YjV/qKi1gKfPtdoGLNvR8zdSv1KGqTsxWw="
-  [mod."github.com/libp2p/go-libp2p-kad-dht"]
-    version = "v0.23.0"
-    hash = "sha256-snzo6TRrbphFWLkbSqD1+3q67gHCOUesnqi2tE1KONg="
-  [mod."github.com/libp2p/go-libp2p-kbucket"]
-    version = "v0.5.0"
-    hash = "sha256-zkR9Vgmm7BTsx2BCkn1EX0EZ6LoWykrvWbegHLzmZwI="
-  [mod."github.com/libp2p/go-libp2p-pubsub"]
-    version = "v0.9.3"
-    hash = "sha256-k+07AU3prX9SKb+/aDIjJN5CW0YlzXeBWVMSPifi6lE="
-  [mod."github.com/libp2p/go-libp2p-pubsub-router"]
-    version = "v0.6.0"
-    hash = "sha256-pNPrFEFbIWs6Z/nAzeyrmC9aCFnYo+e8bdHXEx9avQY="
-  [mod."github.com/libp2p/go-libp2p-record"]
-    version = "v0.2.0"
-    hash = "sha256-5KJawe6Q8JOzH8/qq6vt1DEJQ3vHk6AgxLd5sFADVn4="
-  [mod."github.com/libp2p/go-libp2p-routing-helpers"]
-    version = "v0.6.2"
-    hash = "sha256-oR2LSc9QapCXcqrTeG7sjm30ArOuyAuSAc1DF64/ST4="
-  [mod."github.com/libp2p/go-libp2p-testing"]
-    version = "v0.12.0"
-    hash = "sha256-adxkTBPuWZnDVQsVVwpDLTn9w+SjaE4NjUW2qXE9wSI="
-  [mod."github.com/libp2p/go-libp2p-xor"]
-    version = "v0.1.0"
-    hash = "sha256-c2O3MTePgc/Obkj0s8bvzn7Agb8VEqDDRXJ9gMHnlVw="
-  [mod."github.com/libp2p/go-mplex"]
-    version = "v0.7.0"
-    hash = "sha256-4LOgCcyvSHGY4pnWx0nSKahryV7tzk99mS/HBYs6I/A="
-  [mod."github.com/libp2p/go-msgio"]
-    version = "v0.3.0"
-    hash = "sha256-SYDQsX0WWRHSiytL6JDCPcbi6/edo0OQo9jpx2ZtrAA="
-  [mod."github.com/libp2p/go-nat"]
-    version = "v0.1.0"
-    hash = "sha256-s0N8jDoSHtzdL3GveOgUfKs58MS/uJI8lN5z4/McLhs="
-  [mod."github.com/libp2p/go-netroute"]
-    version = "v0.2.1"
-    hash = "sha256-D4mSx3t5l7Cg3Xddrss4u7aqp73iu+CecLY0N4xE5ho="
-  [mod."github.com/libp2p/go-reuseport"]
-    version = "v0.2.0"
-    hash = "sha256-R/c+VfLcYM6EqfUSXgZJCxsB1TQwBsSiQ1QnxzZ4G3M="
-  [mod."github.com/libp2p/go-socket-activation"]
-    version = "v0.1.0"
-    hash = "sha256-urxrLF/1v1+NIJQHSXnLisWk/YvzAO1iRwOd52T9HbM="
-  [mod."github.com/libp2p/go-yamux/v4"]
-    version = "v4.0.0"
-    hash = "sha256-KROG77qF4qY7SfKoMj/qUcNIFEbLYeT/sdi4IMsw4hk="
-  [mod."github.com/libp2p/zeroconf/v2"]
-    version = "v2.2.0"
-    hash = "sha256-eUAVvGcgQZs2yrQPcU5W0a4dQSH/HfiHSSYJpE9sOHc="
-  [mod."github.com/marten-seemann/tcp"]
-    version = "v0.0.0-20210406111302-dfbc87cc63fd"
-    hash = "sha256-/RfByluusNJhQBF560EP9URdoW6Mfvz0CsTI0vehA1A="
-  [mod."github.com/mattn/go-colorable"]
-    version = "v0.1.6"
-    hash = "sha256-B8caVsDZKpUB6XirL/gukpZaug5VfFzEeuEEeWWsOSU="
-  [mod."github.com/mattn/go-isatty"]
-    version = "v0.0.18"
-    hash = "sha256-QpIn0DSggtBn2ocyj0RlXDKLK5F5KZG1/ogzrqBCjF8="
-  [mod."github.com/mattn/go-runewidth"]
-    version = "v0.0.4"
-    hash = "sha256-+mPQ6NV//R4RTAv65UM9bMyRu2VcfFLmsBRHfqrWYwE="
-  [mod."github.com/matttproud/golang_protobuf_extensions"]
-    version = "v1.0.4"
-    hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc="
-  [mod."github.com/mgutz/ansi"]
-    version = "v0.0.0-20170206155736-9520e82c474b"
-    hash = "sha256-MnBed2XD418sSMjuE2hVrqWWvCQYuMDNOEZIEoYQfwE="
-  [mod."github.com/miekg/dns"]
-    version = "v1.1.53"
-    hash = "sha256-qjYbgXOVzsePX/ksJw6rLO2XYMKLJ+29yf2bSteH6kc="
-  [mod."github.com/mikioh/tcpinfo"]
-    version = "v0.0.0-20190314235526-30a79bb1804b"
-    hash = "sha256-7qDEv/9S7shWXzqbrZoIF1sXG45fwi08PRVCrujmbRQ="
-  [mod."github.com/mikioh/tcpopt"]
-    version = "v0.0.0-20190314235656-172688c1accc"
-    hash = "sha256-Euf1BdkoiYc37obpR66425I1Xjn4wvO+cRz4mOsGueE="
-  [mod."github.com/minio/sha256-simd"]
-    version = "v1.0.0"
-    hash = "sha256-oEo/BoMqSLdwSjrhHTiFjl5Om4MVLNQXDJINk6Z110Y="
-  [mod."github.com/mitchellh/go-homedir"]
-    version = "v1.1.0"
-    hash = "sha256-oduBKXHAQG8X6aqLEpqZHs5DOKe84u6WkBwi4W6cv3k="
-  [mod."github.com/mr-tron/base58"]
-    version = "v1.2.0"
-    hash = "sha256-8FzMu3kHUbBX10pUdtGf59Ag7BNupx8ZHeUaodR1/Vk="
-  [mod."github.com/multiformats/go-base32"]
-    version = "v0.1.0"
-    hash = "sha256-O2IM7FB+Y9MkDdZztyQL5F8oEnmON2Yew7XkotQziio="
-  [mod."github.com/multiformats/go-base36"]
-    version = "v0.2.0"
-    hash = "sha256-GKNnAGA0Lb39BDGYBm1ieKdXmho8Pu7ouyfVPXvV0PE="
-  [mod."github.com/multiformats/go-multiaddr"]
-    version = "v0.9.0"
-    hash = "sha256-rbgerTRVl8GbsI9T0jOkILHZvuWLwWgyesAelU/1Orw="
-  [mod."github.com/multiformats/go-multiaddr-dns"]
-    version = "v0.3.1"
-    hash = "sha256-mQhP3i8eHPkNaSqrCZ7gydhPGIyFLiVt4ybKSvtjF58="
-  [mod."github.com/multiformats/go-multiaddr-fmt"]
-    version = "v0.1.0"
-    hash = "sha256-1SbQXGliO7tAaFoBD8mROaffxNaaKiRIjWmxD23GOIU="
-  [mod."github.com/multiformats/go-multibase"]
-    version = "v0.2.0"
-    hash = "sha256-w+hp6u5bWyd34qe0CX+bq487ADqq6SgRR/JuqRB578s="
-  [mod."github.com/multiformats/go-multicodec"]
-    version = "v0.8.1"
-    hash = "sha256-Xf5boDdLraDWEplvwdMp//yo1wl3exxrUGz7NI7sq8A="
-  [mod."github.com/multiformats/go-multihash"]
-    version = "v0.2.1"
-    hash = "sha256-RWyw05s4Wnz44J2YzPkJAK/A4l5V4ZGk/c2I4lW18wc="
-  [mod."github.com/multiformats/go-multistream"]
-    version = "v0.4.1"
-    hash = "sha256-+LAWKIPe/9ukQnHTyGFan9cUkwWy23qwfmnPgydhJNg="
-  [mod."github.com/multiformats/go-varint"]
-    version = "v0.0.7"
-    hash = "sha256-To3Uuv7uSUJEr5OTwxE1LEIpA62xY3M/KKMNlscHmlA="
-  [mod."github.com/onsi/ginkgo/v2"]
-    version = "v2.9.2"
-    hash = "sha256-+BCysb26cGinBvJkZZ9mW2BsbhpGvDXw4jJapcNuwaU="
-  [mod."github.com/opencontainers/runtime-spec"]
-    version = "v1.0.2"
-    hash = "sha256-70dGXS8kvVr8FRX3LewJ/6PllelgGOChuLS0ynZAiac="
-  [mod."github.com/opentracing/opentracing-go"]
-    version = "v1.2.0"
-    hash = "sha256-kKTKFGXOsCF6QdVzI++GgaRzv2W+kWq5uDXOJChvLxM="
-  [mod."github.com/openzipkin/zipkin-go"]
-    version = "v0.4.1"
-    hash = "sha256-+DQu856GMfkiEHZStTdDcZpwrhUpcLrSjkwGK6CuGQ4="
-  [mod."github.com/pbnjay/memory"]
-    version = "v0.0.0-20210728143218-7b4eea64cf58"
-    hash = "sha256-QI+F1oPLOOtwNp8+m45OOoSfYFs3QVjGzE0rFdpF/IA="
-  [mod."github.com/pkg/errors"]
-    version = "v0.9.1"
-    hash = "sha256-mNfQtcrQmu3sNg/7IwiieKWOgFQOVVe2yXgKBpe/wZw="
-  [mod."github.com/pmezard/go-difflib"]
-    version = "v1.0.0"
-    hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
-  [mod."github.com/polydawn/refmt"]
-    version = "v0.89.0"
-    hash = "sha256-Lz82pJSiSTu8jfhub0xaSYJ/s0Rt/mGujIcPqpITCAk="
-  [mod."github.com/prometheus/client_golang"]
-    version = "v1.14.0"
-    hash = "sha256-dpgGV8C30ZCn7b9mQ+Ye2AfPXTIuHLQbl2olMKzJKxA="
-  [mod."github.com/prometheus/client_model"]
-    version = "v0.3.0"
-    hash = "sha256-vP+miJfsoK5UG9eug8z/bhAMj3bwg66T2vIh8WHoOKU="
-  [mod."github.com/prometheus/common"]
-    version = "v0.42.0"
-    hash = "sha256-dJqoPZKtY2umWFWwMeRYY9I2JaFlpcMX4atkEcN5+hs="
-  [mod."github.com/prometheus/procfs"]
-    version = "v0.9.0"
-    hash = "sha256-imZN+1HRpMvgmrot2V+AK5ueYLmsp49vZfHtx2N6Wek="
-  [mod."github.com/prometheus/statsd_exporter"]
-    version = "v0.22.7"
-    hash = "sha256-hkzgLjxFczqKKJHdVfCKPqMXVFShlS5lZoX8NA27u90="
-  [mod."github.com/quic-go/qpack"]
-    version = "v0.4.0"
-    hash = "sha256-QWIumzmHD94DlNp9G3AQf9QCtF+Kv0pShT1+FH7/I/c="
-  [mod."github.com/quic-go/qtls-go1-19"]
-    version = "v0.3.2"
-    hash = "sha256-705tQnFnbhzwNFqzxq+/+7m0ppPs0VcdlnvwYC/40e4="
-  [mod."github.com/quic-go/qtls-go1-20"]
-    version = "v0.2.2"
-    hash = "sha256-USx3Pybwhqgpd8eLtciTv/mQnPboHW1uTHw4op3u4zQ="
-  [mod."github.com/quic-go/quic-go"]
-    version = "v0.33.0"
-    hash = "sha256-wat+dGCALgzLQT1+Wi/gBsERQ9OJocUdxjnmHCTyt5A="
-  [mod."github.com/quic-go/webtransport-go"]
-    version = "v0.5.2"
-    hash = "sha256-maIN1KStSIIn812GW42CjnSeR6dVYd3JKhev4S1dgmo="
-  [mod."github.com/raulk/go-watchdog"]
-    version = "v1.3.0"
-    hash = "sha256-H1D+t3cAdQVQm/YG9NjtXtSLwtTRD2XMt6x2GDG8+9Y="
-  [mod."github.com/rs/cors"]
-    version = "v1.7.0"
-    hash = "sha256-8fmvap36M+KvxjBDBrQhbF4t45QqffY05wyuc7s0f6k="
-  [mod."github.com/samber/lo"]
-    version = "v1.36.0"
-    hash = "sha256-OmozxXZNiWibxJPrb3LUbsJt5sGNoRmR5Mgbxdmdr9k="
-  [mod."github.com/spacemonkeygo/monkit/v3"]
-    version = "v3.0.20-0.20230227152157-d00b379de191"
-    hash = "sha256-dfaexnwzRNwjQduChP9q6s3IxqdSvwGfRtp9y7GMcNs="
-  [mod."github.com/spaolacci/murmur3"]
-    version = "v1.1.0"
-    hash = "sha256-RWD4PPrlAsZZ8Xy356MBxpj+/NZI7w2XOU14Ob7/Y9M="
-  [mod."github.com/stretchr/testify"]
-    version = "v1.8.2"
-    hash = "sha256-n32PGyJL6VLtwOGEbS0lFchxunNU9nlol7OSEZlrKUM="
-  [mod."github.com/syndtr/goleveldb"]
-    version = "v1.0.1-0.20210819022825-2ae1ddf74ef7"
-    hash = "sha256-36a4hgVQfwtS2zhylKpQuFhrjdc/Y8pF0dxc26jcZIU="
-  [mod."github.com/texttheater/golang-levenshtein"]
-    version = "v0.0.0-20180516184445-d188e65d659e"
-    hash = "sha256-LIlCO9LMoWFVJqg+tAdWVwEjPmdXLg9D2aJv8XntqjY="
-  [mod."github.com/tidwall/gjson"]
-    version = "v1.14.4"
-    hash = "sha256-3DS2YNL95wG0qSajgRtIABD32J+oblaKVk8LIw+KSOc="
-  [mod."github.com/tidwall/match"]
-    version = "v1.1.1"
-    hash = "sha256-M2klhPId3Q3T3VGkSbOkYl/2nLHnsG+yMbXkPkyrRdg="
-  [mod."github.com/tidwall/pretty"]
-    version = "v1.2.0"
-    hash = "sha256-esRQGsn2Ee/CiySlwyuOICSLdqUkH4P7u8qXszos8Yc="
-  [mod."github.com/tidwall/sjson"]
-    version = "v1.2.5"
-    hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps="
-  [mod."github.com/ucarion/urlpath"]
-    version = "v0.0.0-20200424170820-7ccc79b76bbb"
-    hash = "sha256-XV2//Zc1nQX6niqVc+4HscWq54MceHLbU8aU3zBN2oo="
-  [mod."github.com/vivint/infectious"]
-    version = "v0.0.0-20200605153912-25a574ae18a3"
-    hash = "sha256-aklWSc6gwhX6E+RbvtUsk/G0pdWDiiXKw/nriXKkSRw="
-  [mod."github.com/whyrusleeping/base32"]
-    version = "v0.0.0-20170828182744-c30ac30633cc"
-    hash = "sha256-DlJl5zgWr2EY3OkGu30ekC3fWvpOnr0PqaPanCSSEhg="
-  [mod."github.com/whyrusleeping/cbor-gen"]
-    version = "v0.0.0-20230126041949-52956bd4c9aa"
-    hash = "sha256-SoWfnLP/jmFwlBIdj8luDK4Lg2lvvi8lNe4iiXNuJhQ="
-  [mod."github.com/whyrusleeping/chunker"]
-    version = "v0.0.0-20181014151217-fe64bd25879f"
-    hash = "sha256-IkucTGx1aVXB2xQLUYfLIxxBoEEnK/wjiJ7zmC51BI8="
-  [mod."github.com/whyrusleeping/go-keyspace"]
-    version = "v0.0.0-20160322163242-5b898ac5add1"
-    hash = "sha256-a2V0vuPSQh6d9yoxz07JNJllo1Gm1iDMC3/xjk88czo="
-  [mod."github.com/whyrusleeping/go-sysinfo"]
-    version = "v0.0.0-20190219211824-4a357d4b90b1"
-    hash = "sha256-OMo0PoyOZKA8SDTBLiTaVjEI8B5DvbV4OoUxG9OV3mg="
-  [mod."github.com/whyrusleeping/multiaddr-filter"]
-    version = "v0.0.0-20160516205228-e903e4adabd7"
-    hash = "sha256-gBiRLiZAbneTwjcwbx0AyUUkG+VfZVjh3e0Ace1GTU8="
-  [mod."github.com/zeebo/admission/v3"]
-    version = "v3.0.3"
-    hash = "sha256-3fDS0v5OHKgFCB/4OpkKjRfwr8mri/pfwVfF8227b1M="
-  [mod."github.com/zeebo/blake3"]
-    version = "v0.2.3"
-    hash = "sha256-ZepnzkvOyicTGL078O1F84q0TzBAouJlB5AMmfsiOIg="
-  [mod."github.com/zeebo/errs"]
-    version = "v1.3.0"
-    hash = "sha256-bn76C+CeFpETlLqitKjhe4K7HyqDEBRxoynFXFdpvVA="
-  [mod."github.com/zeebo/errs/v2"]
-    version = "v2.0.3"
-    hash = "sha256-YHrQw3G0q2JQlQRw/6uEB41OnD0A6dwssrDd/NlC24Q="
-  [mod."github.com/zeebo/float16"]
-    version = "v0.1.0"
-    hash = "sha256-1Fvl76MyDwT40ej/AatOim4nXaX24Ik6FUGVCpkbEBs="
-  [mod."github.com/zeebo/incenc"]
-    version = "v0.0.0-20180505221441-0d92902eec54"
-    hash = "sha256-onERR8Lc34Y0xwnlvyqpU2WVPyMt4vVqRosWwx/L/vs="
-  [mod."go.opencensus.io"]
-    version = "v0.24.0"
-    hash = "sha256-4H+mGZgG2c9I1y0m8avF4qmt8LUKxxVsTqR8mKgP4yo="
-  [mod."go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"]
-    version = "v0.40.0"
-    hash = "sha256-NJA3b0lkQjUhotbovGPkA1VQ0hZJRES5CH5OpJoiRtw="
-  [mod."go.opentelemetry.io/contrib/propagators/autoprop"]
-    version = "v0.40.0"
-    hash = "sha256-cyu2UWceFnYhiqCF5DPYyqtvYn97KfiTo5RhWItuqtg="
-  [mod."go.opentelemetry.io/contrib/propagators/aws"]
-    version = "v1.15.0"
-    hash = "sha256-4UgPiI4P+CEJvqb1JEdJhhAGSWbTBrOPln4W2P+wA7k="
-  [mod."go.opentelemetry.io/contrib/propagators/b3"]
-    version = "v1.15.0"
-    hash = "sha256-Zh64jP5ecjlE21bEa1yiZ5SQPJyrd/+mLix98G+fMgw="
-  [mod."go.opentelemetry.io/contrib/propagators/jaeger"]
-    version = "v1.15.0"
-    hash = "sha256-6jTFjR1lNJOZ5rQAE6Adr83VmWitlynMmIFICyYfYQI="
-  [mod."go.opentelemetry.io/contrib/propagators/ot"]
-    version = "v1.15.0"
-    hash = "sha256-8odlSgBFpbg8AXmZzxRCqwk3kldOKNQmVF54k14RNCA="
-  [mod."go.opentelemetry.io/otel"]
-    version = "v1.14.0"
-    hash = "sha256-3tPDcC/d16Mqy1492D6n/v+zJgNey/osb8MqVnHBt3E="
-  [mod."go.opentelemetry.io/otel/exporters/jaeger"]
-    version = "v1.14.0"
-    hash = "sha256-6qwK/M52am2UYegdhhg+/nRIbGHJg+60A2ltub/zW0E="
-  [mod."go.opentelemetry.io/otel/exporters/otlp/internal/retry"]
-    version = "v1.14.0"
-    hash = "sha256-iMLsWS6U8eMOJciQl15RHGF8bR8rUEgI6Hd27FAIJNA="
-  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace"]
-    version = "v1.14.0"
-    hash = "sha256-nZyZnZvpzlQOn1AiXnXY0DW3bDlKdOGL3+f6YmN2zaY="
-  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"]
-    version = "v1.14.0"
-    hash = "sha256-8v5JIejP+XVr8r1Ru9hKPZyEIFZR1BRfV0i0yMBjLiU="
-  [mod."go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"]
-    version = "v1.14.0"
-    hash = "sha256-pugayPDhoSFe/r1T5IgkljZ3aScd6I9TQnscDma61SM="
-  [mod."go.opentelemetry.io/otel/exporters/stdout/stdouttrace"]
-    version = "v1.14.0"
-    hash = "sha256-Nu03x+AxP5e6lidNYHdWzk3YLuER5teJ+XSC48mmRek="
-  [mod."go.opentelemetry.io/otel/exporters/zipkin"]
-    version = "v1.14.0"
-    hash = "sha256-qvwjAgBPdfP/xiImVwmyClD4K1uDZ6oGrUxQUYCgu1Q="
-  [mod."go.opentelemetry.io/otel/metric"]
-    version = "v0.37.0"
-    hash = "sha256-mDDOD7OjWbEAej8Gnt0Uu41sJj+4xleOTHrDYHD0v6A="
-  [mod."go.opentelemetry.io/otel/sdk"]
-    version = "v1.14.0"
-    hash = "sha256-qJ+bVbJY1MWK3sJ+bCOdX5+C/DPI2/M7xZzO+mFGE7Q="
-  [mod."go.opentelemetry.io/otel/trace"]
-    version = "v1.14.0"
-    hash = "sha256-7irzeGUT47p52t68fHjuPA9LId/CmtRy3eLKqSEjQZU="
-  [mod."go.opentelemetry.io/proto/otlp"]
-    version = "v0.19.0"
-    hash = "sha256-yOixDEwd/ZdmT3XcCBGqDc4n0+4bwT7zsXc+ISbFOkI="
-  [mod."go.uber.org/atomic"]
-    version = "v1.10.0"
-    hash = "sha256-E6UEDc1eh/cLUFd+J86cDesQ0B8wEv/DdaAVKb+x2t8="
-  [mod."go.uber.org/dig"]
-    version = "v1.16.1"
-    hash = "sha256-FfEARfB4JUxT7t5mI77PR6eECiOvn8R6+lWQHoA/Iv0="
-  [mod."go.uber.org/fx"]
-    version = "v1.19.2"
-    hash = "sha256-GKw0PGhdBQvQbA2//Ph5ESBzddVinoQfh8D/nbY5yJw="
-  [mod."go.uber.org/multierr"]
-    version = "v1.11.0"
-    hash = "sha256-Lb6rHHfR62Ozg2j2JZy3MKOMKdsfzd1IYTR57r3Mhp0="
-  [mod."go.uber.org/zap"]
-    version = "v1.24.0"
-    hash = "sha256-yLzjFbMWnc5b033gcPLGP0KY1xWPJ3sjnUG/RndmC3o="
-  [mod."go4.org"]
-    version = "v0.0.0-20230225012048-214862532bf5"
-    hash = "sha256-8y7krSESdxZfxTzo16EDqmF8USRzGmLPYr3iKuVYzzE="
-  [mod."golang.org/x/crypto"]
-    version = "v0.7.0"
-    hash = "sha256-Yc4casCQyfOgIr48FV+NI9qhanhBuYnkph5iI7rDyZE="
-  [mod."golang.org/x/exp"]
-    version = "v0.0.0-20230321023759-10a507213a29"
-    hash = "sha256-+ffOmn9qW3OSSYvNZExjSOMHjw4CndHOQlavYZnVco4="
-  [mod."golang.org/x/mod"]
-    version = "v0.10.0"
-    hash = "sha256-g0T2wz+K0nhPWdVQJRGGqEqzlTHMBahv+9C3y090eIM="
-  [mod."golang.org/x/net"]
-    version = "v0.8.0"
-    hash = "sha256-2cOtqa7aJ5mn64kZ+8+PVjJ4uGbhpXTpC1vm/+iaZzM="
-  [mod."golang.org/x/oauth2"]
-    version = "v0.5.0"
-    hash = "sha256-+ns+lPELOJdb1YpIxQRBVQeSEsn0VhnKPnHg5Q0NOH4="
-  [mod."golang.org/x/sync"]
-    version = "v0.1.0"
-    hash = "sha256-Hygjq9euZ0qz6TvHYQwOZEjNiTbTh1nSLRAWZ6KFGR8="
-  [mod."golang.org/x/sys"]
-    version = "v0.7.0"
-    hash = "sha256-GotRHJaas/q3L+tFam0q3oQ1rc8GDStt7wnz9h8MTEU="
-  [mod."golang.org/x/term"]
-    version = "v0.6.0"
-    hash = "sha256-Ao0yXpwY8GyG+/23dVfJUYrfEfNUTES3RF45v1VhUAk="
-  [mod."golang.org/x/text"]
-    version = "v0.8.0"
-    hash = "sha256-hgWFnT01DRmywBEXKYEVaOee7i6z8Ydz7zGbjcWwOgI="
-  [mod."golang.org/x/tools"]
-    version = "v0.7.0"
-    hash = "sha256-ZEjfFulQd6U9r4mEJ5RZOnW49NZnQnrCFLMKCgLg7go="
-  [mod."golang.org/x/xerrors"]
-    version = "v0.0.0-20220907171357-04be3eba64a2"
-    hash = "sha256-6+zueutgefIYmgXinOflz8qGDDDj0Zhv+2OkGhBTKno="
-  [mod."gonum.org/v1/gonum"]
-    version = "v0.11.0"
-    hash = "sha256-rNbsRiSCX/L9DW5V6If2hw5wK1sPVD6zhtE+d+Xe15I="
-  [mod."google.golang.org/appengine"]
-    version = "v1.6.7"
-    hash = "sha256-zIxGRHiq4QBvRqkrhMGMGCaVL4iM4TtlYpAi/hrivS4="
-  [mod."google.golang.org/genproto"]
-    version = "v0.0.0-20230110181048-76db0878b65f"
-    hash = "sha256-Jc90F9KU+ZKI0ynF/p3Vwl7TJPb7/MxDFs0ebagty2s="
-  [mod."google.golang.org/grpc"]
-    version = "v1.53.0"
-    hash = "sha256-LkB13k1JaQ7e4nGpCoEA9q4T8oIV0KvkFIDZmHhDr08="
-  [mod."google.golang.org/protobuf"]
-    version = "v1.30.0"
-    hash = "sha256-Y07NKhSuJQ2w7F7MAINQyBf+/hdMHOrxwA3B4ljQQKs="
-  [mod."gopkg.in/square/go-jose.v2"]
-    version = "v2.5.1"
-    hash = "sha256-lqj+3lvCQi0O+fKg/q/QXS68Jk9FWB/9lHZ7X1ZdEHw="
-  [mod."gopkg.in/yaml.v2"]
-    version = "v2.4.0"
-    hash = "sha256-uVEGglIedjOIGZzHW4YwN1VoRSTK8o0eGZqzd+TNdd0="
-  [mod."gopkg.in/yaml.v3"]
-    version = "v3.0.1"
-    hash = "sha256-FqL9TKYJ0XkNwJFnq9j0VvJ5ZUU1RvH/52h/f5bkYAU="
-  [mod."lukechampine.com/blake3"]
-    version = "v1.1.7"
-    hash = "sha256-iAysW2prUQa7ieT4KASyIOsihyo0o9T7t6qBTKSnMn0="
-  [mod."nhooyr.io/websocket"]
-    version = "v1.8.7"
-    hash = "sha256-6pQ35gFvbyMhNo0gv4bPxYDUrwDF/ok1GMA+BHfsRRM="
-  [mod."storj.io/common"]
-    version = "v0.0.0-20230317142710-ffea9ac03387"
-    hash = "sha256-xCBSVLxZl3lQJIS57+Fkq0/mcyjJaGynzJq84+J/FhE="
-  [mod."storj.io/drpc"]
-    version = "v0.0.33-0.20230224050324-1fd05d3459f8"
-    hash = "sha256-muJlIeCTuqfTWYuh/hGoaaHa78kb96STqBLI6Cjcc1g="
-  [mod."storj.io/ipfs-go-ds-storj"]
-    version = "v0.6.0"
-    hash = "sha256-SAd9iUecHLDjhXgs9gHfuuCOF8MIKz5+RR2PGcVpaXs="
-  [mod."storj.io/picobuf"]
-    version = "v0.0.1"
-    hash = "sha256-6dA/E/tQem34zHKNn7KVlznx1uXrx5oDdhMeSGFIUMY="
-  [mod."storj.io/private"]
-    version = "v0.0.0-20230131204204-956b2ac10aba"
-    hash = "sha256-ByRny0G+JGH0POQNVbe1ydkYqgYIElS/1c14HX+ks3o="
-  [mod."storj.io/uplink"]
-    version = "v1.10.1-0.20230317162227-f9e94287ad79"
-    hash = "sha256-vuIKxef6u/9bUFE7F8yID9UAN7PtzmNxBpHxR92mAD8="
-  [mod."storj.io/zipper"]
-    version = "v0.0.0-20220124122551-2ac2d53a46f6"
-    hash = "sha256-TlrN+10I8Cpklsgkojg1zbCsStmcEejkZ2MDUhdTtGw="

ipfs/kubo/source.json

@@ -1,11 +0,0 @@
-{
-  "url": "https://github.com/ipfs/kubo",
-  "rev": "b27da1cc871ad98862409c3ceb1bfbca9e8f9bd5", 
-  "date": "2023-05-09T15:05:35+02:00",
-  "path": "/nix/store/yvgn9bbpq1401la8vymrbyygy5gbi9ya-kubo",
-  "sha256": "1ffs4bzmazpxzazgkx14vn61dfpw1y4f6rvcavjy6ncf3a5vm61x",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

lib/crushpng.nix

@@ -1,5 +1,6 @@
 {
   stdenvNoCC,
+  oxipng,
   pngquant,
 }: {
   name,
@@ -9,7 +10,7 @@
 stdenvNoCC.mkDerivation {
   dontUnpack = true;
   inherit (args) name src maxsize;
-  nativeBuildInputs = [pngquant];
+  nativeBuildInputs = [oxipng pngquant];
   buildPhase = ''
     ${./crushpng.sh} $src $out $maxsize
   '';

lib/crushpng.sh

@@ -2,13 +2,11 @@
 
 set -ex
 
-if [ "$(wc -c $1 | awk '{print $1}')" -le $3 ]; then
-    cp $1 $2
-    exit 0
-fi
+oxipng -o 4 --strip safe -Z $1 --out $2
+[ "$(wc -c $2 | awk '{print $1}')" -le $3 ] && exit 0
 
 for i in $(seq 100 -1 0); do
-  cat $1 | pngquant --quality 0-$i - > $2
+  cat $1 | pngquant --quality 0-$i - | oxipng -o 4 --strip safe -Z - --out $2
   [ "$(wc -c $2 | awk '{print $1}')" -le $3 ] && exit 0
 done
 

lib/mkPleromaEmoji.nix

@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchurl,
+  oxipng,
   pngquant,
   lib,
   libarchive,
@@ -23,6 +24,7 @@ in
   stdenv.mkDerivation ({
       inherit name src;
       nativeBuildInputs = [
+        oxipng
         pngquant
         libarchive
       ];
@@ -30,7 +32,7 @@ in
         bsdtar -xf $src
       '';
       buildPhase = ''
-        find . -type f -name '*.png' -print0 | xargs -0 -n 1 -P $NIX_BUILD_CORES sh -c '${./crushpng.sh} $0 $0.new 50000'
+        find . -type f -name '*.png' -execdir ${./crushpng.sh} {} {}.new 50000 \;
         for f in $(find . -type f -name '*.new'); do
           mv $f ${"$"}{f%.new}
         done
@@ -39,7 +41,7 @@ in
         mkdir $out
         cp -r *.png $out
       '';
-      meta = {
+      meta = with lib; {
         inherit (manifestData) description homepage;
         license = fixLicense manifestData.license;
       };

linux/bcachefs-tools/Cargo.lock

@@ -1,998 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bcachefs-rust"
-version = "0.3.1"
-dependencies = [
- "anyhow",
- "atty",
- "bch_bindgen",
- "byteorder",
- "chrono",
- "clap",
- "colored",
- "either",
- "errno",
- "gag",
- "getset",
- "itertools",
- "libc",
- "log",
- "parse-display",
- "rpassword",
- "udev",
- "uuid",
-]
-
-[[package]]
-name = "bch_bindgen"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bindgen",
- "bitfield",
- "bitflags",
- "byteorder",
- "chrono",
- "colored",
- "gag",
- "libc",
- "memoffset",
- "paste",
- "pkg-config",
- "udev",
- "uuid",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.64.0"
-source = "git+https://evilpiepirate.org/git/rust-bindgen.git#f773267b090bf16b9e8375fcbdcd8ba5e88806a8"
-dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn",
-]
-
-[[package]]
-name = "bitfield"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bumpalo"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "time",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
-dependencies = [
- "glob",
- "libc",
-]
-
-[[package]]
-name = "clap"
-version = "4.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
- "terminal_size",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "colored"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cxx"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "filedescriptor"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
-dependencies = [
- "libc",
- "thiserror",
- "winapi",
-]
-
-[[package]]
-name = "gag"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972"
-dependencies = [
- "filedescriptor",
- "tempfile",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
-dependencies = [
- "hermit-abi 0.2.6",
- "io-lifetimes",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.139"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
-
-[[package]]
-name = "libudev-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
-[[package]]
-name = "parse-display"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd87725635cbae7fe960f91f55a114ed104e637790317cc8d9197ea16b058010"
-dependencies = [
- "lazy_static",
- "parse-display-derive",
- "regex",
-]
-
-[[package]]
-name = "parse-display-derive"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc52b391380aa8550348736a356bf028f5469391d580533a566e97543f55e813"
-dependencies = [
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex",
- "regex-syntax",
- "syn",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "rpassword"
-version = "4.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustix"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
-[[package]]
-name = "shlex"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "1.0.107"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
-dependencies = [
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi",
- "winapi",
-]
-
-[[package]]
-name = "udev"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a"
-dependencies = [
- "libc",
- "libudev-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "uuid"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"

linux/bcachefs-tools/default.nix

@@ -1,108 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  libuuid,
-  libsodium,
-  keyutils,
-  liburcu,
-  zlib,
-  libaio,
-  zstd,
-  lz4,
-  attr,
-  udev,
-  valgrind,
-  nixosTests,
-  fuse3,
-  cargo,
-  rustc,
-  coreutils,
-  rustPlatform,
-  makeWrapper,
-  fuseSupport ? false,
-  writeScript,
-}: let
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-in
-  stdenv.mkDerivation {
-    pname = "bcachefs-tools";
-    version = source.date;
-
-    src = fetchFromGitHub {
-      owner = "koverstreet";
-      repo = "bcachefs-tools";
-      inherit (source) rev sha256;
-    };
-
-    nativeBuildInputs = [
-      pkg-config
-      cargo
-      rustc
-      rustPlatform.cargoSetupHook
-      rustPlatform.bindgenHook
-      makeWrapper
-    ];
-
-    cargoRoot = "rust-src";
-    cargoDeps = rustPlatform.importCargoLock {
-      lockFile = ./Cargo.lock;
-      outputHashes = {
-        "bindgen-0.64.0" = "sha256-GNG8as33HLRYJGYe0nw6qBzq86aHiGonyynEM7gaEE4=";
-      };
-    };
-
-    buildInputs =
-      [
-        libaio
-        keyutils
-        lz4
-
-        libsodium
-        liburcu
-        libuuid
-        zstd
-        zlib
-        attr
-        udev
-      ]
-      ++ lib.optional fuseSupport fuse3;
-
-    doCheck = false; # needs bcachefs module loaded on builder
-    checkFlags = ["BCACHEFS_TEST_USE_VALGRIND=no"];
-    nativeCheckInputs = [valgrind];
-
-    makeFlags = [
-      "PREFIX=${placeholder "out"}"
-      "VERSION=${lib.strings.substring 0 7 source.rev}"
-      "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
-    ];
-
-    preCheck = lib.optionalString fuseSupport ''
-      rm tests/test_fuse.py
-    '';
-
-    passthru.updateScript = writeScript "update-bcachefs" ''
-      ${../../scripts/update-git.sh} https://github.com/koverstreet/bcachefs-tools linux/bcachefs-tools/source.json
-      if [ "$(git diff -- linux/bcachefs-tools/source.json)" ]; then
-        SRC_PATH=$(nix-build -E '(import ./. {}).bcachefs-tools.src')
-        cp $SRC_PATH/rust-src/Cargo.lock linux/bcachefs-tools
-      fi
-    '';
-
-    postFixup = ''
-      wrapProgram $out/bin/mount.bcachefs \
-        --prefix PATH : ${lib.makeBinPath [coreutils]}
-    '';
-
-    enableParallelBuilding = true;
-
-    meta = with lib; {
-      description = "Tool for managing bcachefs filesystems";
-      homepage = "https://bcachefs.org/";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [davidak Madouura];
-      platforms = platforms.linux;
-    };
-  }

linux/bcachefs-tools/source.json

@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/koverstreet/bcachefs-tools",
-  "rev": "9f98746bfcd5159307237f7a491fd79db02d8bf3",
-  "date": "2023-10-08T21:06:07-04:00",
-  "path": "/nix/store/admnhvm9xivca39f1v5p1k1aj8rdmc1l-bcachefs-tools",
-  "sha256": "1x2xqqpfjyf90z8czqzxxrqxp3cqh0jx1dwlcr52yg73hrpwpipv",
-  "hash": "sha256-+8bLb4bjPC9KZpS30CWAmI3bce7948/QB8l56S7GXfQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

linux/bcachefs/default.nix

@@ -1,28 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildLinux,
-  ...
-} @ args: let
-  modDirVersion = "6.5.0";
-  source = builtins.fromJSON (builtins.readFile ./source.json);
-in
-  buildLinux (args
-    // {
-      inherit modDirVersion;
-      version = "6.5.0+${source.rev}";
-      src = fetchFromGitHub {
-        owner = "koverstreet";
-        repo = "bcachefs";
-        inherit (source) rev sha256;
-      };
-      structuredExtraConfig = with lib.kernel; {
-        BCACHEFS_FS = module;
-        BCACHEFS_DEBUG = yes;
-        KALLSYMS = yes;
-        KALLSYMS_ALL = yes;
-        DEBUG_FS = yes;
-        DYNAMIC_FTRACE = yes;
-        FTRACE = yes;
-      };
-    })

linux/bcachefs/source.json

@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/koverstreet/bcachefs",
-  "rev": "7bf1ac0d46ebede68561e0476f7af9c07ac21de8",
-  "date": "2023-10-08T20:49:10-04:00",
-  "path": "/nix/store/5np2sh5f8pj5f4ryrrcr4y9skwk6p6ns-bcachefs-7bf1ac0",
-  "sha256": "00czx7hzaac9ls3q6an3sd33zl12xl9l8q8nazz2da0b7gv5dbdi",
-  "hash": "sha256-sa1W9jsLqCb+VxZhRBPtItA/RtPDKoOHpokp9eHpnwE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

linux/vf2/default.nix

@@ -2,47 +2,268 @@
 {
   lib,
   fetchFromGitHub,
-  linuxManualConfig,
+  buildLinux,
   fetchpatch,
-  applyPatches,
   ...
 } @ args: let
-  modDirVersion = "6.4.0";
+  modDirVersion = "5.15.0";
   source = builtins.fromJSON (builtins.readFile ./source.json);
 in
-  linuxManualConfig ({
+  buildLinux (args
+    // {
       inherit modDirVersion;
       version = "${modDirVersion}-vf2";
 
-      src = applyPatches {
-        src = fetchFromGitHub {
-          owner = "starfive-tech";
-          repo = "linux";
-          inherit (source) rev sha256;
-        };
-        patches = [
-          (fetchpatch {
-            name = "axp15060-1.patch";
-            url = "https://lore.kernel.org/all/20230524000012.15028-2-andre.przywara@arm.com/raw";
-            hash = "sha256-kj4vQaT4CV29EHv8MtuTgM/semIPDdv2dmveo/X27vU=";
-          })
-          (fetchpatch {
-            name = "axp15060-2.patch";
-            url = "https://lore.kernel.org/all/20230524000012.15028-3-andre.przywara@arm.com/raw";
-            hash = "sha256-QCPQyKqoapMtqEDB9QgAuXA7n8e1OtG+YlIgeSQBxXM=";
-          })
-          (fetchpatch {
-            name = "axp15060-3.patch";
-            url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw";
-            hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM=";
-          })
-        ];
+      src = fetchFromGitHub {
+        owner = "DarkKirb";
+        repo = "linux";
+        inherit (source) rev sha256;
       };
 
-      configfile = ./vf2.config;
+      defconfig = "starfive_visionfive2_defconfig";
+
+      autoModules = false;
+      kernelPreferBuiltin = true;
+
+      structuredExtraConfig = with lib.kernel; {
+        SOC_STARFIVE = yes;
+        SOC_STARFIVE_JH7110 = yes;
+        CLK_STARFIVE_JH7110_SYS = yes;
+        RESET_STARFIVE_JH7110 = yes;
+        PINCTRL_STARFIVE_JH7110 = yes;
+        SERIAL_8250_DW = yes;
+
+        # Doesn't work as module
+        SPI_PL022 = yes;
+        SPI_PL022_STARFIVE = yes;
+        RTC_DRV_STARFIVE = yes;
+
+        # USB Wifi
+        RT2800USB_RT53XX = yes;
+        RT2800USB = module;
+        RT2800USB_RT3573 = yes;
+
+        # This module hangs apparently, on VF1
+        PTP_1588_CLOCK = yes;
+        STMMAC_ETH = yes;
+        STMMAC_PCI = yes;
+
+        # Broken stuff.
+        CRYPTO_DEV_CCREE = no;
+        CRYPTO_SM4 = no;
+        CRYPTO_RMD128 = no;
+        CRYPTO_RMD160 = yes;
+        CRYPTO_RMD256 = no;
+        CRYPTO_RMD320 = no;
+        CRYPTO_TGR192 = no;
+        CRYPTO_SALSA20 = no;
+        STARFIVE_DSI = no;
+        VIDEO_HDPVR = no;
+        VIDEO_PVRUSB2_DVB = no;
+        DRM_IMG = no; # gpu module doesn't compile at this time
+        DRM_IMG_ROGUE = no;
+        DRM_VERISILICON = no;
+        DRM_PANEL_JADARD_JD9365DA_H3 = no;
+        VERISILICON_DW_MIPI_DSI = no;
+        VGA_ARB = no;
+
+        USB_WIFI_ECR6600U = no;
+        VIN_SENSOR_IMX219 = no;
+        VIDEO_IMX219 = no;
+        VIN_SENSOR_OV5640 = no;
+        VIDEO_OV5640 = no;
+        SND_SOC_WM8960 = no;
+
+        DEBUG_INFO_BTF = lib.mkForce no;
+        DEBUG_INFO_BTF_MODULES = lib.mkForce no;
+
+        # Compile errors regarding virtio_pci
+        VIRTIO_MENU = yes;
+        VIRTIO = module;
+        VIRTIO_PCI_LIB = module;
+        VIRTIO_PCI = module;
+
+        # Disable DRM
+        CEC_CORE = no;
+        CEC_NOTIFIER = no;
+        DRM = no;
+        DRM_MIPI_DBI = no;
+        DRM_MIPI_DSI = no;
+        DRM_DP_AUX_BUS = no;
+        DRM_DP_AUX_CHARDEV = lib.mkForce no;
+        DRM_KMS_HELPER = no;
+        DRM_FBDEV_EMULATION = no;
+        DRM_LOAD_EDID_FIRMWARE = lib.mkForce no;
+        DRM_TTM = no;
+        DRM_VRAM_HELPER = no;
+        DRM_TTM_HELPER = no;
+        DRM_GEM_CMA_HELPER = no;
+        DRM_KMS_CMA_HELPER = no;
+        DRM_GEM_SHMEM_HELPER = no;
+        DRM_SCHED = no;
+        DRM_I2C_CH7006 = no;
+        DRM_I2C_SIL164 = no;
+        DRM_I2C_NXP_TDA998X = no;
+        DRM_I2C_NXP_TDA9950 = no;
+        DRM_KOMEDA = no;
+        DRM_RADEON = no;
+        DRM_AMDGPU = no;
+        DRM_AMDGPU_SI = lib.mkForce no;
+        DRM_AMDGPU_CIK = lib.mkForce no;
+        DRM_AMDGPU_USERPTR = lib.mkForce no;
+        DRM_AMD_DC = no;
+        DRM_AMD_DC_HDCP = lib.mkForce no;
+        DRM_AMD_DC_SI = lib.mkForce no;
+        DRM_NOUVEAU = no;
+        NOUVEAU_LEGACY_CTX_SUPPORT = no;
+        DRM_NOUVEAU_BACKLIGHT = no;
+        DRM_VGEM = no;
+        DRM_VKMS = no;
+        DRM_UDL = no;
+        DRM_AST = no;
+        DRM_MGAG200 = no;
+        DRM_RCAR_DW_HDMI = no;
+        DRM_QXL = no;
+        DRM_VIRTIO_GPU = no;
+        DRM_PANEL = no;
+        DRM_PANEL_ABT_Y030XX067A = no;
+        DRM_PANEL_ARM_VERSATILE = no;
+        DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 = no;
+        DRM_PANEL_BOE_HIMAX8279D = no;
+        DRM_PANEL_BOE_TV101WUM_NL6 = no;
+        DRM_PANEL_DSI_CM = no;
+        DRM_PANEL_LVDS = no;
+        DRM_PANEL_SIMPLE = no;
+        DRM_PANEL_ELIDA_KD35T133 = no;
+        DRM_PANEL_FEIXIN_K101_IM2BA02 = no;
+        DRM_PANEL_FEIYANG_FY07024DI26A30D = no;
+        DRM_PANEL_ILITEK_IL9322 = no;
+        DRM_PANEL_ILITEK_ILI9341 = no;
+        DRM_PANEL_ILITEK_ILI9881C = no;
+        DRM_PANEL_INNOLUX_EJ030NA = no;
+        DRM_PANEL_INNOLUX_P079ZCA = no;
+        DRM_PANEL_JDI_LT070ME05000 = no;
+        DRM_PANEL_KHADAS_TS050 = no;
+        DRM_PANEL_KINGDISPLAY_KD097D04 = no;
+        DRM_PANEL_LEADTEK_LTK050H3146W = no;
+        DRM_PANEL_LEADTEK_LTK500HD1829 = no;
+        DRM_PANEL_SAMSUNG_LD9040 = no;
+        DRM_PANEL_LG_LB035Q02 = no;
+        DRM_PANEL_LG_LG4573 = no;
+        DRM_PANEL_NEC_NL8048HL11 = no;
+        DRM_PANEL_NOVATEK_NT35510 = no;
+        DRM_PANEL_NOVATEK_NT36672A = no;
+        DRM_PANEL_NOVATEK_NT39016 = no;
+        DRM_PANEL_MANTIX_MLAF057WE51 = no;
+        DRM_PANEL_OLIMEX_LCD_OLINUXINO = no;
+        DRM_PANEL_ORISETECH_OTM8009A = no;
+        DRM_PANEL_OSD_OSD101T2587_53TS = no;
+        DRM_PANEL_PANASONIC_VVX10F034N00 = no;
+        DRM_PANEL_RASPBERRYPI_TOUCHSCREEN = no;
+        DRM_PANEL_RAYDIUM_RM67191 = no;
+        DRM_PANEL_RAYDIUM_RM68200 = no;
+        DRM_PANEL_RONBO_RB070D30 = no;
+        DRM_PANEL_SAMSUNG_ATNA33XC20 = no;
+        DRM_PANEL_SAMSUNG_DB7430 = no;
+        DRM_PANEL_SAMSUNG_S6D16D0 = no;
+        DRM_PANEL_SAMSUNG_S6E3HA2 = no;
+        DRM_PANEL_SAMSUNG_S6E63J0X03 = no;
+        DRM_PANEL_SAMSUNG_S6E63M0 = no;
+        DRM_PANEL_SAMSUNG_S6E63M0_SPI = no;
+        DRM_PANEL_SAMSUNG_S6E63M0_DSI = no;
+        DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 = no;
+        DRM_PANEL_SAMSUNG_S6E8AA0 = no;
+        DRM_PANEL_SAMSUNG_SOFEF00 = no;
+        DRM_PANEL_SEIKO_43WVF1G = no;
+        DRM_PANEL_SHARP_LQ101R1SX01 = no;
+        DRM_PANEL_SHARP_LS037V7DW01 = no;
+        DRM_PANEL_SHARP_LS043T1LE01 = no;
+        DRM_PANEL_SITRONIX_ST7701 = no;
+        DRM_PANEL_SITRONIX_ST7703 = no;
+        DRM_PANEL_SITRONIX_ST7789V = no;
+        DRM_PANEL_SONY_ACX565AKM = no;
+        DRM_PANEL_TDO_TL070WSH30 = no;
+        DRM_PANEL_TPO_TD028TTEC1 = no;
+        DRM_PANEL_TPO_TD043MTEA1 = no;
+        DRM_PANEL_TPO_TPG110 = no;
+        DRM_PANEL_TRULY_NT35597_WQXGA = no;
+        DRM_PANEL_VISIONOX_RM69299 = no;
+        DRM_PANEL_WIDECHIPS_WS2401 = no;
+        DRM_PANEL_XINPENG_XPP055C272 = no;
+        DRM_BRIDGE = no;
+        DRM_PANEL_BRIDGE = no;
+        DRM_CDNS_DSI = no;
+        DRM_CHIPONE_ICN6211 = no;
+        DRM_CHRONTEL_CH7033 = no;
+        DRM_DISPLAY_CONNECTOR = no;
+        DRM_LONTIUM_LT8912B = no;
+        DRM_LONTIUM_LT9611 = no;
+        DRM_LONTIUM_LT9611UXC = no;
+        DRM_ITE_IT66121 = no;
+        DRM_LVDS_CODEC = no;
+        DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW = no;
+        DRM_NWL_MIPI_DSI = no;
+        DRM_NXP_PTN3460 = no;
+        DRM_PARADE_PS8622 = no;
+        DRM_PARADE_PS8640 = no;
+        DRM_SIL_SII8620 = no;
+        DRM_SII902X = no;
+        DRM_SII9234 = no;
+        DRM_SIMPLE_BRIDGE = no;
+        DRM_THINE_THC63LVD1024 = no;
+        DRM_TOSHIBA_TC358762 = no;
+        DRM_TOSHIBA_TC358764 = no;
+        DRM_TOSHIBA_TC358767 = no;
+        DRM_TOSHIBA_TC358768 = no;
+        DRM_TOSHIBA_TC358775 = no;
+        DRM_TI_TFP410 = no;
+        DRM_TI_SN65DSI83 = no;
+        DRM_TI_SN65DSI86 = no;
+        DRM_TI_TPD12S015 = no;
+        DRM_ANALOGIX_ANX6345 = no;
+        DRM_ANALOGIX_ANX78XX = no;
+        DRM_ANALOGIX_DP = no;
+        DRM_ANALOGIX_ANX7625 = no;
+        DRM_I2C_ADV7511 = no;
+        DRM_I2C_ADV7511_CEC = no;
+        DRM_CDNS_MHDP8546 = no;
+        DRM_DW_HDMI = no;
+        DRM_DW_HDMI_AHB_AUDIO = no;
+        DRM_DW_HDMI_I2S_AUDIO = no;
+        DRM_DW_HDMI_CEC = no;
+        DRM_ETNAVIV = no;
+        DRM_ETNAVIV_THERMAL = no;
+        DRM_MXS = no;
+        DRM_MXSFB = no;
+        DRM_ARCPGU = no;
+        DRM_BOCHS = no;
+        DRM_CIRRUS_QEMU = no;
+        DRM_GM12U320 = no;
+        TINYDRM_HX8357D = no;
+        TINYDRM_ILI9225 = no;
+        TINYDRM_ILI9341 = no;
+        TINYDRM_ILI9486 = no;
+        TINYDRM_MI0283QT = no;
+        TINYDRM_REPAPER = no;
+        TINYDRM_ST7586 = no;
+        TINYDRM_ST7735R = no;
+        DRM_GUD = no;
+        DRM_LEGACY = no;
+        DRM_TDFX = no;
+        DRM_R128 = no;
+        DRM_MGA = no;
+        DRM_VIA = no;
+        DRM_SAVAGE = no;
+        VIDEOMODE_HELPERS = no;
+        SND_PCM_ELD = no;
+        SND_PCM_IEC958 = no;
+        SND_HDA_COMPONENT = no;
+        SND_SOC_HDMI_CODEC = no;
+        VIRTIO_DMA_SHARED_BUFFER = no;
+      };
 
       extraMeta = {
-        branch = "JH7110_VisionFive2_upstream";
+        branch = "visionfive2";
         description = "Linux kernel for StarFive's VisionFive2";
         platforms = ["riscv64-linux"];
       };

linux/vf2/source.json

@@ -1,9 +1,9 @@
 {
-  "url": "https://github.com/starfive-tech/linux",
-  "rev": "e5a381c51d624ffd8784db908a58ae227d0608a4",
-  "date": "2023-06-29T17:00:49+08:00",
-  "path": "/nix/store/7ks8y8krj0c37m9a0q6dznjh5lkak8gr-linux",
-  "sha256": "04f9b8aih2pvxl2vj8xm6m4knkly14h4mcj9ylw9m7nxhkcgw3c2",
+  "url": "https://github.com/darkkirb/linux",
+  "rev": "bf44cf47a28b4f0f62f6ebdb307a2b66842284f2",
+  "date": "2023-03-02T10:30:15+01:00",
+  "path": "/nix/store/d0fx5cdi0w0lf31jcsrnvd8bb5jmr7yr-linux",
+  "sha256": "054gsgjww877riryvr2zjrwnpzg92zx7p9f4qk7hbq45i7fqlwd0",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/element-web/default.nix

@@ -26,7 +26,7 @@ in
     version = source.date;
 
     src = fetchFromGitHub {
-      owner = "DarkKirb";
+      owner = "maunium";
       repo = pname;
       inherit (source) rev sha256;
     };
@@ -79,7 +79,7 @@ in
 
     passthru = {
       updateScript = writeScript "update-element-web" ''
-        ${../../scripts/update-git.sh} https://github.com/DarkKirb/element-web matrix/element-web/source.json
+        ${../../scripts/update-git.sh} https://github.com/maunium/element-web matrix/element-web/source.json
         if [ "$(git diff -- matrix/element-web/source.json)" ]; then
           SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
           ${../../scripts/update-yarn.sh} $SRC_PATH matrix/element-web

matrix/element-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.46",
+    "version": "1.11.24",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -26,19 +26,15 @@
         "contribute.json"
     ],
     "style": "bundle.css",
-    "matrix_i18n_extra_translation_funcs": [
-        "UserFriendlyError"
-    ],
     "scripts": {
-        "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
-        "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json",
-        "i18n:lint": "prettier --write src/i18n/strings/ --ignore-path /dev/null",
-        "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+        "i18n": "matrix-gen-i18n",
+        "prunei18n": "matrix-prune-i18n",
+        "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
         "clean": "rimraf lib webapp",
         "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
         "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
-        "build:jitsi": "ts-node scripts/build-jitsi.ts",
-        "build:res": "ts-node scripts/copy-res.ts",
+        "build:jitsi": "node scripts/build-jitsi.js",
+        "build:res": "node scripts/copy-res.js",
         "build:genfiles": "yarn build:res && yarn build:jitsi && yarn build:module_system",
         "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
         "build:bundle": "webpack --progress --bail --mode production",
@@ -47,7 +43,7 @@
         "dist": "scripts/package.sh",
         "start": "yarn build:module_system && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"",
         "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"",
-        "start:res": "yarn build:jitsi && ts-node scripts/copy-res.ts -w",
+        "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
         "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
         "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
         "lint:js": "yarn lint:js:src && yarn lint:js:module_system",
@@ -62,25 +58,24 @@
         "lint:style": "stylelint \"res/css/**/*.pcss\"",
         "test": "jest",
         "coverage": "yarn test --coverage",
-        "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
-        "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp"
+        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js"
     },
     "resolutions": {
         "@types/react-dom": "17.0.19",
-        "@types/react": "17.0.58"
+        "@types/react": "17.0.53"
     },
     "dependencies": {
-        "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
-        "@matrix-org/react-sdk-module-api": "^2.1.0",
+        "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
+        "@matrix-org/react-sdk-module-api": "^0.0.4",
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "lodash": "^4.17.21",
-        "matrix-js-sdk": "github:DarkKirb/matrix-js-sdk",
-        "matrix-react-sdk": "github:DarkKirb/matrix-react-sdk",
-        "matrix-widget-api": "^1.3.1",
+        "matrix-js-sdk": "github:maunium/matrix-js-sdk",
+        "matrix-react-sdk": "github:maunium/matrix-react-sdk",
+        "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
+        "sanitize-html": "^2.3.2",
         "ua-parser-js": "^1.0.0"
     },
     "devDependencies": {
@@ -89,7 +84,6 @@
         "@babel/eslint-plugin": "^7.12.10",
         "@babel/plugin-proposal-class-properties": "^7.12.1",
         "@babel/plugin-proposal-export-default-from": "^7.12.1",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
         "@babel/plugin-proposal-numeric-separator": "^7.12.7",
         "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
@@ -103,19 +97,16 @@
         "@babel/runtime": "^7.12.5",
         "@casualbot/jest-sonar-reporter": "^2.2.5",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@sentry/webpack-plugin": "^2.0.0",
+        "@sentry/webpack-plugin": "^1.18.1",
         "@svgr/webpack": "^5.5.0",
         "@testing-library/react": "^12.1.5",
         "@types/jest": "^29.0.0",
-        "@types/jitsi-meet": "^2.0.2",
         "@types/jsrsasign": "^10.5.4",
-        "@types/loader-utils": "^2.0.4",
-        "@types/lodash": "^4.14.197",
         "@types/modernizr": "^3.5.3",
         "@types/node": "^16",
-        "@types/node-fetch": "^2.6.4",
-        "@types/react": "17.0.58",
+        "@types/react": "17.0.53",
         "@types/react-dom": "17.0.19",
+        "@types/sanitize-html": "^2.3.1",
         "@types/ua-parser-js": "^0.7.36",
         "@typescript-eslint/eslint-plugin": "^5.45.0",
         "@typescript-eslint/parser": "^5.45.0",
@@ -123,19 +114,19 @@
         "babel-jest": "^29.0.0",
         "babel-loader": "^8.2.2",
         "chokidar": "^3.5.1",
-        "concurrently": "^8.0.0",
-        "cpx": "1.5.0",
+        "concurrently": "^7.0.0",
+        "cpx": "^1.5.0",
         "css-loader": "^4",
         "dotenv": "^16.0.2",
-        "eslint": "8.48.0",
+        "eslint": "8.35.0",
         "eslint-config-google": "^0.14.0",
-        "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-deprecate": "0.7.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-deprecate": "^0.7.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-matrix-org": "^1.0.0",
         "eslint-plugin-react": "^7.28.0",
         "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-unicorn": "^48.0.0",
+        "eslint-plugin-unicorn": "^46.0.0",
         "extract-text-webpack-plugin": "^4.0.0-beta.0",
         "fake-indexeddb": "^4.0.0",
         "fetch-mock-jest": "^1.5.1",
@@ -143,17 +134,17 @@
         "fs-extra": "^11.0.0",
         "html-webpack-plugin": "^4.5.2",
         "jest": "^29.0.0",
-        "jest-canvas-mock": "2.5.2",
+        "jest-canvas-mock": "^2.3.0",
         "jest-environment-jsdom": "^29.0.0",
         "jest-mock": "^29.0.0",
         "jest-raw-loader": "^1.0.1",
         "json-loader": "^0.5.7",
         "loader-utils": "^3.0.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^3.1.3",
+        "matrix-web-i18n": "^1.3.0",
         "mini-css-extract-plugin": "^1",
         "minimist": "^1.2.6",
-        "mkdirp": "^3.0.0",
+        "mkdirp": "^2.0.0",
         "modernizr": "^3.12.0",
         "node-fetch": "^2.6.7",
         "optimize-css-assets-webpack-plugin": "^6.0.0",
@@ -167,28 +158,68 @@
         "postcss-preset-env": "^6.7.0",
         "postcss-scss": "^4.0.4",
         "postcss-simple-vars": "^5.0.2",
-        "prettier": "2.8.8",
-        "proxy-agent": "^6.3.0",
+        "prettier": "2.8.4",
         "raw-loader": "^4.0.2",
-        "rimraf": "^5.0.0",
-        "semver": "^7.5.2",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.7",
+        "simple-proxy-agent": "^1.1.0",
         "string-replace-loader": "3",
         "style-loader": "2",
-        "stylelint": "^15.10.1",
-        "stylelint-config-standard": "^34.0.0",
-        "stylelint-scss": "^5.0.0",
+        "stylelint": "^15.0.0",
+        "stylelint-config-standard": "^30.0.0",
+        "stylelint-scss": "^4.2.0",
         "terser-webpack-plugin": "^4.0.0",
-        "ts-node": "^10.9.1",
         "ts-prune": "^0.10.3",
-        "typescript": "5.1.6",
+        "typescript": "4.9.5",
         "webpack": "^4.46.0",
-        "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^3.3.12",
         "webpack-dev-server": "^3.11.2",
         "worker-loader": "^3.0.0",
         "worklet-loader": "^2.0.0",
         "yaml": "^2.0.1"
     },
+    "jest": {
+        "testEnvironment": "jsdom",
+        "testEnvironmentOptions": {
+            "url": "http://localhost/"
+        },
+        "testMatch": [
+            "<rootDir>/test/**/*-test.[tj]s?(x)"
+        ],
+        "setupFiles": [
+            "jest-canvas-mock"
+        ],
+        "setupFilesAfterEnv": [
+            "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
+        ],
+        "moduleNameMapper": {
+            "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
+            "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
+            "\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
+            "\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
+            "^react$": "<rootDir>/node_modules/react",
+            "^react-dom$": "<rootDir>/node_modules/react-dom",
+            "^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
+            "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
+            "decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+            "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+            "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+            "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+            "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
+            "workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
+            "^!!raw-loader!.*": "jest-raw-loader",
+            "RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js"
+        },
+        "transformIgnorePatterns": [
+            "/node_modules/(?!matrix-js-sdk).+$",
+            "/node_modules/(?!matrix-react-sdk).+$"
+        ],
+        "coverageReporters": [
+            "text-summary",
+            "lcov"
+        ],
+        "testResultsProcessor": "@casualbot/jest-sonar-reporter"
+    },
     "@casualbot/jest-sonar-reporter": {
         "outputDirectory": "coverage",
         "outputName": "jest-sonar-report.xml",

matrix/element-web/source.json

@@ -1,10 +1,9 @@
 {
-  "url": "https://github.com/DarkKirb/element-web",
-  "rev": "917d55033055e4568a83f0840da26d0382b97f58",
-  "date": "2023-10-17T08:40:07+01:00",
-  "path": "/nix/store/53mp3vnv73bklzyzikba492anvy6vjkd-element-web",
-  "sha256": "1df2mwx3dccn8a4mqjmqaiyaa9h0mnv8r4agaw5ng7x95r4ksnhx",
-  "hash": "sha256-HVo9SS6pn2cLV0+RjLatACalfFS4SlyJQpaxNjqvwrU=",
+  "url": "https://github.com/maunium/element-web",
+  "rev": "796837f5e409f1639c0e7150f27e0e92857ae5fd",
+  "date": "2023-03-14T13:57:29+02:00",
+  "path": "/nix/store/b8hcwvzfwyqg8iaamwq1a49a8mswi1vg-element-web",
+  "sha256": "0j2rvajypssw9h9iyv3h5vnki4n3gwvckppd8bdqkfwa85ldpx17",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/matrix-media-repo/0001-Make-using-MD5-hashing-a-config-option-on-the-datast.patch

@@ -1,86 +0,0 @@
-From b740c2f77c7e3b10ff77ebade90afa58f79f6267 Mon Sep 17 00:00:00 2001
-From: Travis Ralston <travpc@gmail.com>
-Date: Sat, 10 Jun 2023 15:04:48 -0600
-Subject: [PATCH] Make using MD5 hashing a config option on the datastore
-
----
- config.sample.yaml   | 4 ++++
- datastores/s3.go     | 8 ++++++++
- datastores/upload.go | 6 +++++-
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/config.sample.yaml b/config.sample.yaml
-index d0d9543..24774b7 100644
---- a/config.sample.yaml
-+++ b/config.sample.yaml
-@@ -191,6 +191,10 @@ datastores:
-       # An optional storage class for tuning how the media is stored at s3.
-       # See https://aws.amazon.com/s3/storage-classes/ for details; uncomment to use.
-       #storageClass: STANDARD
-+      # If you're seeing errors relating to 'z-amz-checksum-algorithm CRC32C not implemented',
-+      # set this to `true`. This will reduce performance, but will allow uploads to be possible.
-+      # It is common that you need to enable this with Backblaze B2 and CloudFlare R2.
-+      useMD5: false
- 
- # Options for controlling archives. Archives are exports of a particular user's content for
- # the purpose of GDPR or moving media to a different server.
-diff --git a/datastores/s3.go b/datastores/s3.go
-index 0517188..828f6e5 100644
---- a/datastores/s3.go
-+++ b/datastores/s3.go
-@@ -19,6 +19,7 @@ type s3 struct {
- 	client       *minio.Client
- 	storageClass string
- 	bucket       string
-+	putWithMd5   bool
- }
- 
- func ResetS3Clients() {
-@@ -37,6 +38,7 @@ func getS3(ds config.DatastoreConfig) (*s3, error) {
- 	region := ds.Options["region"]
- 	storageClass, hasStorageClass := ds.Options["storageClass"]
- 	useSslStr, hasSsl := ds.Options["ssl"]
-+	useMd5Str, hasMd5 := ds.Options["useMD5"]
- 
- 	if !hasStorageClass {
- 		storageClass = "STANDARD"
-@@ -47,6 +49,11 @@ func getS3(ds config.DatastoreConfig) (*s3, error) {
- 		useSsl, _ = strconv.ParseBool(useSslStr)
- 	}
- 
-+	useMd5 := false
-+	if hasMd5 && useMd5Str != "" {
-+		useMd5, _ = strconv.ParseBool(useMd5Str)
-+	}
-+
- 	var err error
- 	var client *minio.Client
- 	client, err = minio.New(endpoint, &minio.Options{
-@@ -62,6 +69,7 @@ func getS3(ds config.DatastoreConfig) (*s3, error) {
- 		client:       client,
- 		storageClass: storageClass,
- 		bucket:       bucket,
-+		putWithMd5:   useMd5,
- 	}
- 	s3clients.Store(ds.Id, s3c)
- 	return s3c, nil
-diff --git a/datastores/upload.go b/datastores/upload.go
-index a06bc0e..f011752 100644
---- a/datastores/upload.go
-+++ b/datastores/upload.go
-@@ -40,7 +40,11 @@ func Upload(ctx rcontext.RequestContext, ds config.DatastoreConfig, data io.Read
- 
- 		metrics.S3Operations.With(prometheus.Labels{"operation": "PutObject"}).Inc()
- 		var info minio.UploadInfo
--		info, err = s3c.client.PutObject(ctx.Context, s3c.bucket, objectName, tee, size, minio.PutObjectOptions{StorageClass: s3c.storageClass, ContentType: contentType})
-+		info, err = s3c.client.PutObject(ctx.Context, s3c.bucket, objectName, tee, size, minio.PutObjectOptions{
-+			StorageClass:   s3c.storageClass,
-+			ContentType:    contentType,
-+			SendContentMd5: s3c.putWithMd5,
-+		})
- 		uploadedBytes = info.Size
- 	} else if ds.Type == "file" {
- 		basePath := ds.Options["path"]
--- 
-2.41.0
-

matrix/matrix-media-repo/default.nix

@@ -1,28 +1,13 @@
 {
-  go_1_20,
-  buildGoApplication,
+  buildGo119Module,
   git,
   fetchFromGitHub,
   lib,
   writeScript,
-  libde265,
-  libheif,
-  pkg-config,
-  cmake,
 }: let
   source = builtins.fromJSON (builtins.readFile ./source.json);
-  libheif' = libheif.overrideAttrs (super: rec {
-    version = "1.16.2";
-    src = fetchFromGitHub {
-      owner = "strukturag";
-      repo = "libheif";
-      rev = "v${version}";
-      sha256 = "sha256-+6vWHkhsHSJDjOmNmdf18+IKavH/ysgfyxREMeTasLc=";
-    };
-    nativeBuildInputs = [cmake pkg-config];
-  });
 in
-  buildGoApplication rec {
+  buildGo119Module rec {
     pname = "matrix-media-repo";
     version = source.date;
     src = fetchFromGitHub {
@@ -30,19 +15,13 @@ in
       repo = "matrix-media-repo";
       inherit (source) rev sha256;
     };
-    patches = [
-      ./0001-Make-using-MD5-hashing-a-config-option-on-the-datast.patch
-    ];
-    modules = ./gomod2nix.toml;
-    go = go_1_20;
+    #patches = [./async-media.patch];
+    patches = [./fix-build.patch];
+    vendorSha256 = builtins.readFile ./vendor.sha256;
     nativeBuildInputs = [
       git
-      pkg-config
-    ];
-    buildInputs = [
-      libde265
-      libheif'
     ];
+    proxyVendor = true;
     CGO_ENABLED = "1";
     buildPhase = ''
       GOBIN=$PWD/bin go install -v ./cmd/compile_assets
@@ -57,17 +36,11 @@ in
       description = "Matrix media repository with multi-domain in mind.";
       license = lib.licenses.mit;
     };
-    postConfigure = ''
-      chmod -R +w vendor/
-      for f in vendor/golang.org/x/net/publicsuffix/data/*; do
-          cp -v --remove-destination -f `readlink $f` $f
-      done
-    '';
     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')
-        ${../../scripts/update-go.sh} $SRC_PATH matrix/matrix-media-repo/
+        ${../../scripts/update-go.sh} ./matrix/matrix-media-repo matrix/matrix-media-repo/vendor.sha256
       fi
     '';
   }

matrix/matrix-media-repo/fix-build.patch

@@ -0,0 +1,22 @@
+From 4728b8b0faf0fedc4dcb19e7bfa932333fc25147 Mon Sep 17 00:00:00 2001
+From: Charlotte <lotte@chir.rs>
+Date: Fri, 10 Mar 2023 16:06:54 +0100
+Subject: [PATCH] Readd io import in plugin_antispam_ocr
+
+Fixes broken build
+---
+ cmd/plugin_antispam_ocr/main.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmd/plugin_antispam_ocr/main.go b/cmd/plugin_antispam_ocr/main.go
+index 5b07356..0cf0899 100644
+--- a/cmd/plugin_antispam_ocr/main.go
++++ b/cmd/plugin_antispam_ocr/main.go
+@@ -7,6 +7,7 @@ import (
+ 	"errors"
+ 	"fmt"
+ 	"image"
++	"io"
+ 	"math"
+ 	"net/http"
+ 	"os"

matrix/matrix-media-repo/gomod2nix.toml

@@ -1,417 +0,0 @@
-schema = 3
-
-[mod]
-  [mod."dario.cat/mergo"]
-    version = "v1.0.0"
-    hash = "sha256-jlpc8dDj+DmiOU4gEawBu8poJJj9My0s9Mvuk9oS8ww="
-  [mod."github.com/Azure/go-ansiterm"]
-    version = "v0.0.0-20230124172434-306776ec8161"
-    hash = "sha256-17hCoOE3HBv6cjpcukfBS6/ULgTuoUZ7RNbi5korH2M="
-  [mod."github.com/DavidHuie/gomigrate"]
-    version = "v0.0.0-20190826182718-4adc4b3de142"
-    hash = "sha256-TprT0kezFl+AbDaMvZOeQMNvCyG+5RtRnMGUk4ZUdtk="
-  [mod."github.com/Jeffail/gabs"]
-    version = "v1.4.0"
-    hash = "sha256-Za8Lg0vfQPmuwzu1pUWFwqIoKuHM6TDt1Pe37i4ZOZU="
-  [mod."github.com/Microsoft/go-winio"]
-    version = "v0.6.1"
-    hash = "sha256-BL0BVaHtmPKQts/711W59AbHXjGKqFS4ZTal0RYnR9I="
-  [mod."github.com/Microsoft/hcsshim"]
-    version = "v0.11.0"
-    hash = "sha256-xbtye+JaCVRvmtAQPzEkcQgf59qXc+HE0+aQgxIzDiE="
-  [mod."github.com/PuerkitoBio/goquery"]
-    version = "v1.8.1"
-    hash = "sha256-z2RaB8PVPEzSJdMUfkfNjT616yXWTjW2gkhNOh989ZU="
-  [mod."github.com/ajstarks/svgo"]
-    version = "v0.0.0-20211024235047-1546f124cd8b"
-    hash = "sha256-sPwt5sImKFk949TzUeYEF2UiJDqHxXFJKRL2Y7JWJ6Y="
-  [mod."github.com/alioygur/is"]
-    version = "v1.0.3"
-    hash = "sha256-PDROYkpqujdG0e3yz1xhuSnjP8+U9K46xzBrm41wG6o="
-  [mod."github.com/andybalholm/cascadia"]
-    version = "v1.3.2"
-    hash = "sha256-Nc9SkqJO/ecincVcUBFITy24TMmMGj5o0Q8EgdNhrEk="
-  [mod."github.com/beorn7/perks"]
-    version = "v1.0.1"
-    hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4="
-  [mod."github.com/bep/debounce"]
-    version = "v1.2.1"
-    hash = "sha256-7qHOp4vB0ifEseXXBuSH6W5YNImVcb8PTWSJJAMaGcU="
-  [mod."github.com/bwmarrin/snowflake"]
-    version = "v0.3.0"
-    hash = "sha256-mOU/CgyC9W8XwuinYTPOH69wJY/f+nFVZjZ8lAr9fGM="
-  [mod."github.com/cenk/backoff"]
-    version = "v2.2.1+incompatible"
-    hash = "sha256-aMpsIH8tC5An/Ldb4yTweEbi/4e5gi7InGitPKimxNU="
-  [mod."github.com/cenkalti/backoff/v4"]
-    version = "v4.2.1"
-    hash = "sha256-CKogmPe0pCcAdpztzPwr24rLTJZfq8QVZ9AUduwAcoA="
-  [mod."github.com/cespare/xxhash/v2"]
-    version = "v2.2.0"
-    hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4="
-  [mod."github.com/containerd/containerd"]
-    version = "v1.7.6"
-    hash = "sha256-F/CUegskc5duMfS86G6xYJVLLkPdwMx/+E5EfrRzaco="
-  [mod."github.com/cpuguy83/dockercfg"]
-    version = "v0.3.1"
-    hash = "sha256-ILY8MBdfgIZtuSIGEeXFRiVSDAOLAhdGqr9uq0KSiVk="
-  [mod."github.com/cupcake/sigil"]
-    version = "v0.0.0-20131127230922-6bf9722f2ae8"
-    hash = "sha256-zj78W+DugvlxoiIcjLIbKTb10ZhNz3HjBVLlqsVVWLk="
-  [mod."github.com/davecgh/go-spew"]
-    version = "v1.1.1"
-    hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="
-  [mod."github.com/dgryski/go-rendezvous"]
-    version = "v0.0.0-20200823014737-9f7001d12a5f"
-    hash = "sha256-n/7xo5CQqo4yLaWMSzSN1Muk/oqK6O5dgDOFWapeDUI="
-  [mod."github.com/dhowden/tag"]
-    version = "v0.0.0-20230630033851-978a0926ee25"
-    hash = "sha256-zzAeI6sGEE9f8Wr3lg68FEK9pcLsS7YSRXmtqGFUBo0="
-  [mod."github.com/didip/tollbooth"]
-    version = "v4.0.2+incompatible"
-    hash = "sha256-M8K9oYioGBJnSH+Jrf16uwKbC0uacj6I2YiS1bD9W8o="
-  [mod."github.com/disintegration/imaging"]
-    version = "v1.6.2"
-    hash = "sha256-pSeMTPvSkxlthh65LjNYYhPLvCZDkBgVgAGYWW0Aguo="
-  [mod."github.com/docker/distribution"]
-    version = "v2.8.2+incompatible"
-    hash = "sha256-ocVWMRt5ErWdVsj3rsNa/QhizG5b/PCu8LoOlUi24/c="
-  [mod."github.com/docker/docker"]
-    version = "v24.0.6+incompatible"
-    hash = "sha256-bCEAXrxDfMgcEoMDZfq5ka+pI4kSIrIhfKrrq5f0g9g="
-  [mod."github.com/docker/go-connections"]
-    version = "v0.4.0"
-    hash = "sha256-GHNIjOuuNp5lFQ308+nDNwQPGESCVV7bCUxSW5ZxZlc="
-  [mod."github.com/docker/go-units"]
-    version = "v0.5.0"
-    hash = "sha256-iK/V/jJc+borzqMeqLY+38Qcts2KhywpsTk95++hImE="
-  [mod."github.com/dsoprea/go-exif/v3"]
-    version = "v3.0.1"
-    hash = "sha256-Gt1LFNs82CNulAZm5vJB2Evp6cBctPfL4eb1UaboR38="
-  [mod."github.com/dsoprea/go-logging"]
-    version = "v0.0.0-20200710184922-b02d349568dd"
-    hash = "sha256-qc4Nzj7uHl5VRc5Q+iXVCjOmfDQl5wIoiuJKque5jCY="
-  [mod."github.com/dsoprea/go-utility/v2"]
-    version = "v2.0.0-20221003172846-a3e1774ef349"
-    hash = "sha256-s40UVM7/Y7zosud6xvWDRyBEqj1F4fJzSyABdTzK1iE="
-  [mod."github.com/dustin/go-humanize"]
-    version = "v1.0.1"
-    hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc="
-  [mod."github.com/dyatlov/go-oembed"]
-    version = "v0.0.0-20191103150536-a57c85b3b37c"
-    hash = "sha256-QX3b7h0mkslDh5QtUU1ZS6f1YH9lGEjz5xdxdmUb7l8="
-  [mod."github.com/dyatlov/go-opengraph/opengraph"]
-    version = "v0.0.0-20220524092352-606d7b1e5f8a"
-    hash = "sha256-Cxi9BjtsbWDh5WIRZ3zdqIJrpmDHydnYRRJOYYPjIGI="
-  [mod."github.com/facebookgo/clock"]
-    version = "v0.0.0-20150410010913-600d898af40a"
-    hash = "sha256-Qh3po2B69wTmUwMS8QcJ3Lz3GpGlN5YPjcVQijXvcvw="
-  [mod."github.com/faiface/beep"]
-    version = "v1.1.0"
-    hash = "sha256-66qAbnJjUjhXofxlGCa6G1+vjQcSTyN/POCZvYzHaQo="
-  [mod."github.com/fastly/go-utils"]
-    version = "v0.0.0-20180712184237-d95a45783239"
-    hash = "sha256-qB9zUQgDG7W2kvbsUSZ+Qb1Lwgd4vBSeIp0+p1JK8Yc="
-  [mod."github.com/fatih/color"]
-    version = "v1.15.0"
-    hash = "sha256-7b+scFVQeEUoXfeCDd8X2gS8GMoWA+HxjK8wfbypa5s="
-  [mod."github.com/fogleman/gg"]
-    version = "v1.3.0"
-    hash = "sha256-Fs2JI0FmF4N5EzXJzGAPZMxZxo6wKyebkN/iBZ9sdNo="
-  [mod."github.com/fsnotify/fsnotify"]
-    version = "v1.6.0"
-    hash = "sha256-DQesOCweQPEwmAn6s7DCP/Dwy8IypC+osbpfsvpkdP0="
-  [mod."github.com/gabriel-vasile/mimetype"]
-    version = "v1.4.2"
-    hash = "sha256-laV+IkgbnEG07h1eFfPISqp0ctnLXfzchz/CLR1lftk="
-  [mod."github.com/getsentry/sentry-go"]
-    version = "v0.24.1"
-    hash = "sha256-R4QLkZwdUNgtGCqLcihcOY/F5GOOxthkAIK6jlgBjw4="
-  [mod."github.com/go-errors/errors"]
-    version = "v1.5.0"
-    hash = "sha256-nRLVRTWLOto8dmkbnEV6bUyBMFEwfYxYkY1UMFZKC+Q="
-  [mod."github.com/go-redsync/redsync/v4"]
-    version = "v4.9.4"
-    hash = "sha256-M+gAySrUsuPDj2985CCIMeyhOMADQB+o8NklzXDR5tI="
-  [mod."github.com/go-sql-driver/mysql"]
-    version = "v1.5.0"
-    hash = "sha256-DDpwoQ/rAo3Eml3IZYZBu/2ohtGsAPBnxQsuZiKV4BU="
-  [mod."github.com/gogo/protobuf"]
-    version = "v1.3.2"
-    hash = "sha256-pogILFrrk+cAtb0ulqn9+gRZJ7sGnnLLdtqITvxvG6c="
-  [mod."github.com/golang/freetype"]
-    version = "v0.0.0-20170609003504-e2365dfdc4a0"
-    hash = "sha256-AHAFBd20/tqxohkWyQkui2bUef9i1HWYgk9LOIFErvA="
-  [mod."github.com/golang/geo"]
-    version = "v0.0.0-20230421003525-6adc56603217"
-    hash = "sha256-j4EFdpNjnCIRM9fFx4zUUipzSdvdAHnC/wmevliJirU="
-  [mod."github.com/golang/protobuf"]
-    version = "v1.5.3"
-    hash = "sha256-svogITcP4orUIsJFjMtp+Uv1+fKJv2Q5Zwf2dMqnpOQ="
-  [mod."github.com/google/uuid"]
-    version = "v1.3.1"
-    hash = "sha256-JxAEAB2bFlGPShFreyOWjUahjaGV3xYS5TpfUOikod0="
-  [mod."github.com/gopherjs/gopherjs"]
-    version = "v0.0.0-20190430165422-3e4dfb77656c"
-    hash = "sha256-kbuMirhXODg0AZZWX4Nlp4VNnD5nNAHa0cX5XNpMbq8="
-  [mod."github.com/hajimehoshi/go-mp3"]
-    version = "v0.3.4"
-    hash = "sha256-h6l0PuIS0h1zdB8MEqHTTgg8dE6nL6PSOt583ymaPnA="
-  [mod."github.com/hashicorp/errwrap"]
-    version = "v1.1.0"
-    hash = "sha256-6lwuMQOfBq+McrViN3maJTIeh4f8jbEqvLy2c9FvvFw="
-  [mod."github.com/hashicorp/go-hclog"]
-    version = "v1.5.0"
-    hash = "sha256-u3Jqg7Qex11IZ7vbk4hRGgLy6e0cF70CCx7ERF0GUHo="
-  [mod."github.com/hashicorp/go-multierror"]
-    version = "v1.1.1"
-    hash = "sha256-ANzPEUJIZIlToxR89Mn7Db73d9LGI51ssy7eNnUgmlA="
-  [mod."github.com/hashicorp/go-plugin"]
-    version = "v1.5.1"
-    hash = "sha256-rXNajanQOAkqHDghaICUkikQHuWbAICg6OKelhEleEo="
-  [mod."github.com/hashicorp/yamux"]
-    version = "v0.1.1"
-    hash = "sha256-jr4ZFM3XHSwGoZcRcmmdGTq4IqxBTnimojIPDgK0USU="
-  [mod."github.com/icza/bitio"]
-    version = "v1.1.0"
-    hash = "sha256-CtV/dr1L46cZ65EnK9DrBduZCaMnTGf4N2MnElCymtM="
-  [mod."github.com/jehiah/go-strftime"]
-    version = "v0.0.0-20171201141054-1d33003b3869"
-    hash = "sha256-+4WOjV+F2BXgKmdfYvuSkfQAKOZlFo8eZrnCT+xT3xQ="
-  [mod."github.com/jfreymuth/oggvorbis"]
-    version = "v1.0.5"
-    hash = "sha256-jphTCaPr34ZT9Id4ZZ6zU9Vnxzy6cTjCwjpQ819eGV0="
-  [mod."github.com/jfreymuth/vorbis"]
-    version = "v1.0.2"
-    hash = "sha256-gVS+/PZ5pDnswpTQNZILcrx5ZNq9ShXd6vXn7Jabes4="
-  [mod."github.com/jonboulle/clockwork"]
-    version = "v0.1.0"
-    hash = "sha256-dEV9aGzJRIrYfPpuJux3guJNvZGi+5dfseGurZqGHd8="
-  [mod."github.com/json-iterator/go"]
-    version = "v1.1.12"
-    hash = "sha256-To8A0h+lbfZ/6zM+2PpRpY3+L6725OPC66lffq6fUoM="
-  [mod."github.com/julienschmidt/httprouter"]
-    version = "v1.3.0"
-    hash = "sha256-YVbnyFLVZX1mtqcwM1SStQdhcQsPHyi1ltpOrD3w2qg="
-  [mod."github.com/k3a/html2text"]
-    version = "v1.2.1"
-    hash = "sha256-6raeYlNE68D/vEX7m6wurFrTIRPaj+SOoqo57NOQLl0="
-  [mod."github.com/kettek/apng"]
-    version = "v0.0.0-20220823221153-ff692776a607"
-    hash = "sha256-VuxcQDPJsmSpueFu9ECqG/EIr29eDALA1iRpl2pquzI="
-  [mod."github.com/klauspost/compress"]
-    version = "v1.16.7"
-    hash = "sha256-8miX/lnXyNLPSqhhn5BesLauaIAxETpQpWtr1cu2f+0="
-  [mod."github.com/klauspost/cpuid/v2"]
-    version = "v2.2.5"
-    hash = "sha256-/M8CHNah2/EPr0va44r1Sx+3H6E+jN8bGFi5jQkLBrM="
-  [mod."github.com/lestrrat/go-envload"]
-    version = "v0.0.0-20180220120943-6ed08b54a570"
-    hash = "sha256-O+xFK7J0d+cgv9N4pI/Nunk89FVQ3Zmywn1QfBc8pH4="
-  [mod."github.com/lestrrat/go-file-rotatelogs"]
-    version = "v0.0.0-20180223000712-d3151e2a480f"
-    hash = "sha256-A89P/ThMyvrYoj7Yhq/3PG8MM7KDQE+pWf4F3WHjuoo="
-  [mod."github.com/lestrrat/go-strftime"]
-    version = "v0.0.0-20180220042222-ba3bf9c1d042"
-    hash = "sha256-Wd3GYo14taUxeZbqogdt6y8aPikCTyghK20WPamH5JU="
-  [mod."github.com/lib/pq"]
-    version = "v1.10.9"
-    hash = "sha256-Gl6dLtL+yk6UrTTWfas43aM4lP/pNa2l7+ITXnjQyKs="
-  [mod."github.com/magiconair/properties"]
-    version = "v1.8.7"
-    hash = "sha256-XQ2bnc2s7/IH3WxEO4GishZurMyKwEclZy1DXg+2xXc="
-  [mod."github.com/mattn/go-colorable"]
-    version = "v0.1.13"
-    hash = "sha256-qb3Qbo0CELGRIzvw7NVM1g/aayaz4Tguppk9MD2/OI8="
-  [mod."github.com/mattn/go-isatty"]
-    version = "v0.0.19"
-    hash = "sha256-wYQqGxeqV3Elkmn26Md8mKZ/viw598R4Ych3vtt72YE="
-  [mod."github.com/mattn/go-sqlite3"]
-    version = "v2.0.3+incompatible"
-    hash = "sha256-+zdGqThUb7if9JAiO+6s6KXBeuT322JhfcityvdrxD4="
-  [mod."github.com/matttproud/golang_protobuf_extensions"]
-    version = "v1.0.4"
-    hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc="
-  [mod."github.com/mewkiz/flac"]
-    version = "v1.0.8"
-    hash = "sha256-CdgX5s+WyTs7qZKJZMrp5c5VVoalBxYTlmmKiSqIoR0="
-  [mod."github.com/mewkiz/pkg"]
-    version = "v0.0.0-20230226050401-4010bf0fec14"
-    hash = "sha256-vpPhgYcMQIaDd50OdQZvDitV73oBNGJhCNYVt1FKIX4="
-  [mod."github.com/minio/md5-simd"]
-    version = "v1.1.2"
-    hash = "sha256-vykcXvy2VBBAXnJott/XsGTT0gk2UL36JzZKfJ1KAUY="
-  [mod."github.com/minio/minio-go/v7"]
-    version = "v7.0.63"
-    hash = "sha256-6jIVszEtpMlpipTccqitiSC0VomVzkkZyfBoSHbCoek="
-  [mod."github.com/minio/sha256-simd"]
-    version = "v1.0.1"
-    hash = "sha256-4hfGDIQaWq8fvtGzHDhoK9v2IocXnJY7OAL6saMJbmA="
-  [mod."github.com/mitchellh/go-testing-interface"]
-    version = "v1.14.1"
-    hash = "sha256-TMGi38D13BEVN5cpeKDzKRIgLclm4ErOG+JEyqJrN/c="
-  [mod."github.com/moby/patternmatcher"]
-    version = "v0.6.0"
-    hash = "sha256-ny3L8ktj8cyN41CEJhaRT74Vi8HpXXsbTvlrw/Tl5+g="
-  [mod."github.com/moby/sys/sequential"]
-    version = "v0.5.0"
-    hash = "sha256-A29wOMXw/O8L5Kmu3UNb9s9go2Vya8qFEYtsYrg3Rzo="
-  [mod."github.com/moby/term"]
-    version = "v0.5.0"
-    hash = "sha256-jy0kbkeUsr0KoiE33WLxNAgYXZIERKR2O5+saXBwdD8="
-  [mod."github.com/modern-go/concurrent"]
-    version = "v0.0.0-20180306012644-bacd9c7ef1dd"
-    hash = "sha256-OTySieAgPWR4oJnlohaFTeK1tRaVp/b0d1rYY8xKMzo="
-  [mod."github.com/modern-go/reflect2"]
-    version = "v1.0.2"
-    hash = "sha256-+W9EIW7okXIXjWEgOaMh58eLvBZ7OshW2EhaIpNLSBU="
-  [mod."github.com/morikuni/aec"]
-    version = "v1.0.0"
-    hash = "sha256-5zYgLeGr3K+uhGKlN3xv0PO67V+2Zw+cezjzNCmAWOE="
-  [mod."github.com/oklog/run"]
-    version = "v1.1.0"
-    hash = "sha256-U4IS0keJa4BSBSeEBqtIV1Zg6N4b0zFiKfzN9ua4pWQ="
-  [mod."github.com/opencontainers/go-digest"]
-    version = "v1.0.0"
-    hash = "sha256-cfVDjHyWItmUGZ2dzQhCHgmOmou8v7N+itDkLZVkqkQ="
-  [mod."github.com/opencontainers/image-spec"]
-    version = "v1.1.0-rc5"
-    hash = "sha256-wvg4aRpoZ3alRygfEehPg9p6N2Sv5umwx0WTxeIgyao="
-  [mod."github.com/opencontainers/runc"]
-    version = "v1.1.9"
-    hash = "sha256-zJI1/cRfG9PqX/je79AbS/dSmvSHv1p8Rs3qN0g93Fs="
-  [mod."github.com/panjf2000/ants/v2"]
-    version = "v2.8.1"
-    hash = "sha256-SxPFjCOjG4uvUf1XxX0w6aoyNBKbuzXTykFLaNxrgnQ="
-  [mod."github.com/patrickmn/go-cache"]
-    version = "v2.1.0+incompatible"
-    hash = "sha256-+i3/Cd9byb1q926jszLjadiUMUeux0VyGKnmP20EAoA="
-  [mod."github.com/peterbourgon/g2s"]
-    version = "v0.0.0-20170223122336-d4e7ad98afea"
-    hash = "sha256-NIVsrq1z2UEvuVTHVIptWDn0MYx4jMyk707K7QNLiq8="
-  [mod."github.com/pkg/errors"]
-    version = "v0.9.1"
-    hash = "sha256-mNfQtcrQmu3sNg/7IwiieKWOgFQOVVe2yXgKBpe/wZw="
-  [mod."github.com/pmezard/go-difflib"]
-    version = "v1.0.0"
-    hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
-  [mod."github.com/prometheus/client_golang"]
-    version = "v1.16.0"
-    hash = "sha256-P/b4/8m1ztF0fCLSJ+eRXN74Bncx2vjOJx7nFl2QEg4="
-  [mod."github.com/prometheus/client_model"]
-    version = "v0.4.0"
-    hash = "sha256-4P0sPWpxa69gGM6zm3dA06cH6twaeopq22VVDJjucHA="
-  [mod."github.com/prometheus/common"]
-    version = "v0.44.0"
-    hash = "sha256-8n3gSWKDSJtGfOQgxsiCGyTnUjb5hvSxJi/hPcrE5Oo="
-  [mod."github.com/prometheus/procfs"]
-    version = "v0.11.1"
-    hash = "sha256-yphZ7NZtYC/tb0HVag2T58SuN64Ial9sBo/TdCEQx6Q="
-  [mod."github.com/redis/go-redis/v9"]
-    version = "v9.1.0"
-    hash = "sha256-dXHN2blZPDbSgp40g2kQ7KXyul75M6jCvB/y/FHvRH4="
-  [mod."github.com/rifflock/lfshook"]
-    version = "v0.0.0-20180920164130-b9218ef580f5"
-    hash = "sha256-LHemSy/AaUcajEm9mdPjw6+nJht81dcqnYCh5ySTuHM="
-  [mod."github.com/rs/xid"]
-    version = "v1.5.0"
-    hash = "sha256-u0QLm2YFMJqEjUhpWcLwfoS9lNHUxc2A79MObsqVbVU="
-  [mod."github.com/rubyist/circuitbreaker"]
-    version = "v2.2.1+incompatible"
-    hash = "sha256-6qlPpfrp0grghKbwnRBh3azjyJSjS2e2FPhgz3Q76DU="
-  [mod."github.com/ryanuber/go-glob"]
-    version = "v1.0.0"
-    hash = "sha256-YkMl1utwUhi3E0sHK23ISpAsPyj4+KeXyXKoFYGXGVY="
-  [mod."github.com/sabhiram/go-gitignore"]
-    version = "v0.0.0-20210923224102-525f6e181f06"
-    hash = "sha256-A1aJFlcPRQvDqdJmEwpzhftR8C1Kzv1hXPszq8eO76Q="
-  [mod."github.com/saintfish/chardet"]
-    version = "v0.0.0-20230101081208-5e3ef4b5456d"
-    hash = "sha256-JXlHMCbXB8iRQ9wQBGCeTjDSfgaBwUVOpvcjj0iVn5A="
-  [mod."github.com/sebest/xff"]
-    version = "v0.0.0-20210106013422-671bd2870b3a"
-    hash = "sha256-t7Gdp7S71Koej5Njg3jOo5vwyj02tJCbJjrq/vZGOho="
-  [mod."github.com/sirupsen/logrus"]
-    version = "v1.9.3"
-    hash = "sha256-EnxsWdEUPYid+aZ9H4/iMTs1XMvCLbXZRDyvj89Ebms="
-  [mod."github.com/smartystreets/assertions"]
-    version = "v1.0.0"
-    hash = "sha256-sI2UUdq1+H+rcLysKDXDeaXi1Pz+zq28d/o/mV0c2wE="
-  [mod."github.com/stretchr/testify"]
-    version = "v1.8.4"
-    hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo="
-  [mod."github.com/strukturag/libheif"]
-    version = "v1.16.2"
-    hash = "sha256-jR0a6nvzviu3YtN+0V4mj6s7ZiwQJlg6BUSaI5GSlFs="
-  [mod."github.com/t2bot/go-singleflight-streams"]
-    version = "v0.0.8"
-    hash = "sha256-YG78j81YNvsqS1hrJScmaz4kNF+O3TAnFsGgVzDKna4="
-  [mod."github.com/t2bot/go-typed-singleflight"]
-    version = "v0.0.3"
-    hash = "sha256-gDeRUn27fWmdPmBaVR8aly2rRmreVxmWeUM/P7N4PZI="
-  [mod."github.com/t2bot/gotd-contrib"]
-    version = "v0.0.0-20230907202504-d21987ea2957"
-    hash = "sha256-UQB0iEYhOlTA0TvkZwKgYm0UKQYDqx5qlOzON4Q5tH0="
-  [mod."github.com/t2bot/pgo-fleet/embedded"]
-    version = "v1.0.1"
-    hash = "sha256-UrNOX5SXttFPLdVVpzslPFBb4T+xDI359vxqsBS7TEY="
-  [mod."github.com/tebeka/strftime"]
-    version = "v0.1.3"
-    hash = "sha256-ahLbzsDylxmyGMzcUGePJCCR/qjtNPDQ2R21C38ydi8="
-  [mod."github.com/testcontainers/testcontainers-go"]
-    version = "v0.23.0"
-    hash = "sha256-ItMwMkJa//CARErkX+27koux0MmQ9nOXEvD5Ck97c/Q="
-  [mod."github.com/testcontainers/testcontainers-go/modules/postgres"]
-    version = "v0.23.0"
-    hash = "sha256-/A4hZV/MkOgbnin1fIu4jR9aPD0wcKdRzOcm/8QaGYQ="
-  [mod."golang.org/x/crypto"]
-    version = "v0.13.0"
-    hash = "sha256-4ThyrEJI4i9XBwx/q/R4jR41VJBZ/TSR0+UCkjTH95A="
-  [mod."golang.org/x/exp"]
-    version = "v0.0.0-20230905200255-921286631fa9"
-    hash = "sha256-CyeVwjp12Wqh4ptqfi3KHCWPzOFhE8fSrP3sMjMXvec="
-  [mod."golang.org/x/image"]
-    version = "v0.12.0"
-    hash = "sha256-ttx1gCoWia/Nhhq9t6a2rEXI1gCu5UCLmECIbVtqbp8="
-  [mod."golang.org/x/mod"]
-    version = "v0.12.0"
-    hash = "sha256-M/oXnzm7odpJdQzEnG6W0pNYtl0uhOM/l7qgfGVpU2M="
-  [mod."golang.org/x/net"]
-    version = "v0.15.0"
-    hash = "sha256-k0hgSwNmZz9nN9cqqACNHdnejV50AAwzxnoyTs9liXw="
-  [mod."golang.org/x/sync"]
-    version = "v0.3.0"
-    hash = "sha256-bCJKLvwExhYacH2ZrWlZ38lr1d6oNenNt2m1QqDCs0o="
-  [mod."golang.org/x/sys"]
-    version = "v0.12.0"
-    hash = "sha256-Ht/PhBJGWNBg4ksmdUu4+7hJjFypSwoUN/8DJricd+0="
-  [mod."golang.org/x/term"]
-    version = "v0.12.0"
-    hash = "sha256-NFko0uqv/r2VxrbSgS1IwWzaWQK3RZuk0MvUV+qxIsc="
-  [mod."golang.org/x/text"]
-    version = "v0.13.0"
-    hash = "sha256-J34dbc8UNVIdRJUZP7jPt11oxuwG8VvrOOylxE7V3oA="
-  [mod."golang.org/x/time"]
-    version = "v0.3.0"
-    hash = "sha256-/hmc9skIswMYbivxNS7R8A6vCTUF9k2/7tr/ACkcEaM="
-  [mod."golang.org/x/tools"]
-    version = "v0.13.0"
-    hash = "sha256-OCgLOwia8fNHxfdogXVApf0/qK6jE2ukegOx7lkOzfo="
-  [mod."google.golang.org/genproto/googleapis/rpc"]
-    version = "v0.0.0-20230913181813-007df8e322eb"
-    hash = "sha256-1kP7lqQ+fKtARDzTrRNob0owX4GsUnxzOwLyBZSmHOc="
-  [mod."google.golang.org/grpc"]
-    version = "v1.58.1"
-    hash = "sha256-Oqcw5RLWngXbcDSwFuPR3HqfWGM3WndlfEgSsObNQz8="
-  [mod."google.golang.org/protobuf"]
-    version = "v1.31.0"
-    hash = "sha256-UdIk+xRaMfdhVICvKRk1THe3R1VU+lWD8hqoW/y8jT0="
-  [mod."gopkg.in/ini.v1"]
-    version = "v1.67.0"
-    hash = "sha256-V10ahGNGT+NLRdKUyRg1dos5RxLBXBk1xutcnquc/+4="
-  [mod."gopkg.in/yaml.v2"]
-    version = "v2.4.0"
-    hash = "sha256-uVEGglIedjOIGZzHW4YwN1VoRSTK8o0eGZqzd+TNdd0="
-  [mod."gopkg.in/yaml.v3"]
-    version = "v3.0.1"
-    hash = "sha256-FqL9TKYJ0XkNwJFnq9j0VvJ5ZUU1RvH/52h/f5bkYAU="

matrix/matrix-media-repo/source.json

@@ -1,10 +1,9 @@
 {
   "url": "https://github.com/turt2live/matrix-media-repo",
-  "rev": "07183614a9e4f69af62420a4ee7ca9785f1fae67",
-  "date": "2023-09-29T16:22:39+00:00",
-  "path": "/nix/store/56phspagz29yw81sng6nk3v1m8vb60jq-matrix-media-repo",
-  "sha256": "051jzmkkli2mkw353p3jsajibizsmhynq09isbradmy1kx8l52dr",
-  "hash": "sha256-uYlCUZ/B16by0jEBbD2s+scVpdJy3FEGn1VEOmf9MhQ=",
+  "rev": "f32bbbf6a370a399303e9e35248d889a0aa31daa",
+  "date": "2023-03-05T19:11:24-07:00",
+  "path": "/nix/store/2dc6mvj6kx0s479n0zc7day9qj7phrjk-matrix-media-repo",
+  "sha256": "1829k6mfbb8acx9k4ygnz5c9yb20f0xd2fmdpyzlx3v2fi92023y",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,