wechat-uos-sandboxed: add and deprecate wechat-uos

xddxdd · Dec 7, 2024 · ef2dff1 · ef2dff1
1 parent b0e047a
commit ef2dff1
Show file tree

Hide file tree

Showing 10 changed files with 126 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ Or, use variables from this repository in case I change them:
 ## Packages
 
 <details>
-<summary>Package set: (Uncategorized) (144 packages)</summary>
+<summary>Package set: (Uncategorized) (145 packages)</summary>
 
 | State | Path | Name | Version | Description |
 | ----- | ---- | ---- | ------- | ----------- |
@@ -218,9 +218,7 @@ Or, use variables from this repository in case I change them:
 |  | `vgpu-unlock-rs` | [vgpu-unlock-rs](https://github.com/mbilker/vgpu_unlock-rs) | 2.5.0 | Unlock vGPU functionality for consumer grade GPUs |
 |  | `vk-hdr-layer` | [vk-hdr-layer](https://github.com/Zamundaaa/VK_hdr_layer) | 0-unstable-2024-11-25 | Vulkan layer utilizing a small color management / HDR protocol for experimentation |
 |  | `vpp` | [vpp](https://wiki.fd.io/view/VPP/What_is_VPP%3F) | 24.10 | Vector Packet Processing |
-| `x86_64-linux` | `wechat-uos` | [wechat-uos](https://weixin.qq.com/) | 4.0.0.21 | WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
-| `x86_64-linux` | `wechat-uos-bin` | [wechat-uos](https://weixin.qq.com/) | 4.0.0.21 | WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
-| `x86_64-linux` | `wechat-uos-without-sandbox` | [wechat-uos](https://weixin.qq.com/) | 4.0.0.21 | WeChat desktop without sandbox (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
+|  | `wechat-uos-sandboxed` | [wechat-uos-4.0.0.23](https://weixin.qq.com/) |  | WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
 | `x86_64-linux` | `wine-wechat` | [wine-wechat](https://weixin.qq.com/) | 3.9.12.17 | Wine WeChat x64 (Packaging script adapted from https://aur.archlinux.org/packages/deepin-wine-wechat) |
 | `x86_64-linux` | `wine-wechat-x86` | [wine-wechat-x86](https://weixin.qq.com/) | 3.9.12.16 | Wine WeChat x86 (Packaging script adapted from https://aur.archlinux.org/packages/deepin-wine-wechat) |
 |  | `xstatic-asciinema-player` | [xstatic-asciinema-player](https://github.com/asciinema/asciinema-player) | 2.6.1.1 | Asciinema-player packaged for setuptools (easy_install) / pip |
@@ -229,10 +227,13 @@ Or, use variables from this repository in case I change them:
 | `Broken` `x86_64-linux` | `deepspeech-gpu` | [deepspeech-gpu](https://github.com/mozilla/DeepSpeech) | 0.9.3 | Speech-to-text engine which can run in real time on devices ranging from a Raspberry Pi 4 to high power GPU servers |
 | `Broken` `x86_64-linux` | `deepspeech-wrappers` | [deepspeech](https://github.com/mozilla/DeepSpeech) | 0.9.3 | Speech-to-text engine which can run in real time on devices ranging from a Raspberry Pi 4 to high power GPU servers |
 | `Broken` | `douban-openapi-server` | [douban-openapi-server](https://github.com/caryyu/douban-openapi-server) | 0-unstable-2022-12-17 | Douban API server that provides an unofficial APIs for media information gathering |
-| `Deprecated` | `glauth` | [glauth](https://github.com/glauth/glauth) | 2.3.2 | Lightweight LDAP server for development, home use, or CI |
-| `Deprecated` | `kata-image` | [kata-image](https://github.com/kata-containers/kata-containers) | 3.11.0 | Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-images/default.nix) |
-| `Deprecated` | `kata-runtime` | [kata-runtime](https://github.com/kata-containers/kata-containers) | 3.11.0 | Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-runtime/default.nix) |
-| `Deprecated` | `payload-dumper-go` | [payload-dumper-go](https://github.com/ssut/payload-dumper-go) | 1.3.0 | Android OTA payload dumper written in Go |
+| `Deprecated` | `glauth` | [glauth](https://github.com/glauth/glauth) | 2.3.2 | (DEPRECATED: glauth is available in nixpkgs by a different maintainer) Lightweight LDAP server for development, home use, or CI |
+| `Deprecated` | `kata-image` | [kata-image](https://github.com/kata-containers/kata-containers) | 3.11.0 | (DEPRECATED: kata-image is available in nixpkgs by a different maintainer) Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-images/default.nix) |
+| `Deprecated` | `kata-runtime` | [kata-runtime](https://github.com/kata-containers/kata-containers) | 3.11.0 | (DEPRECATED: kata-runtime is available in nixpkgs by a different maintainer) Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-runtime/default.nix) |
+| `Deprecated` | `payload-dumper-go` | [payload-dumper-go](https://github.com/ssut/payload-dumper-go) | 1.3.0 | (DEPRECATED: payload-dumper-go is available in nixpkgs by a different maintainer) Android OTA payload dumper written in Go |
+| `Deprecated` `x86_64-linux` | `wechat-uos` | [wechat-uos](https://weixin.qq.com/) | 4.0.0.21 | (DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
+| `Deprecated` `x86_64-linux` | `wechat-uos-bin` | [wechat-uos](https://weixin.qq.com/) | 4.0.0.21 | (DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
+| `Deprecated` `x86_64-linux` | `wechat-uos-without-sandbox` | [wechat-uos](https://weixin.qq.com/) | 4.0.0.21 | (DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop without sandbox (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap) |
 </details>
 
 

diff --git a/helpers/group.nix b/helpers/group.nix
@@ -54,6 +54,7 @@ rec {
         callPackage
         ifNotCI
         ifNotNUR
+        lib
         loadPackages
         mergePkgs
         mode

diff --git a/nix-packages.json b/nix-packages.json
@@ -535,7 +535,7 @@
     "version": "1.2.3"
   },
   "legacyPackages.x86_64-linux.glauth": {
-    "description": "Lightweight LDAP server for development, home use, or CI",
+    "description": "(DEPRECATED: glauth is available in nixpkgs by a different maintainer) Lightweight LDAP server for development, home use, or CI",
     "pname": "glauth",
     "version": "2.3.2"
   },
@@ -605,12 +605,12 @@
     "version": "3.0"
   },
   "legacyPackages.x86_64-linux.kata-image": {
-    "description": "Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-images/default.nix)",
+    "description": "(DEPRECATED: kata-image is available in nixpkgs by a different maintainer) Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-images/default.nix)",
     "pname": "kata-image",
     "version": "3.11.0"
   },
   "legacyPackages.x86_64-linux.kata-runtime": {
-    "description": "Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-runtime/default.nix)",
+    "description": "(DEPRECATED: kata-runtime is available in nixpkgs by a different maintainer) Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-runtime/default.nix)",
     "pname": "kata-runtime",
     "version": "3.11.0"
   },
@@ -3280,7 +3280,7 @@
     "version": "1.10.0"
   },
   "legacyPackages.x86_64-linux.payload-dumper-go": {
-    "description": "Android OTA payload dumper written in Go",
+    "description": "(DEPRECATED: payload-dumper-go is available in nixpkgs by a different maintainer) Android OTA payload dumper written in Go",
     "pname": "payload-dumper-go",
     "version": "1.3.0"
   },
@@ -3605,17 +3605,22 @@
     "version": "24.10"
   },
   "legacyPackages.x86_64-linux.wechat-uos": {
-    "description": "WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "description": "(DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
     "pname": "wechat-uos",
     "version": "4.0.0.21"
   },
   "legacyPackages.x86_64-linux.wechat-uos-bin": {
-    "description": "WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "description": "(DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
     "pname": "wechat-uos",
     "version": "4.0.0.21"
   },
+  "legacyPackages.x86_64-linux.wechat-uos-sandboxed": {
+    "description": "WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "pname": "wechat-uos",
+    "version": "4.0.0.23"
+  },
   "legacyPackages.x86_64-linux.wechat-uos-without-sandbox": {
-    "description": "WeChat desktop without sandbox (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "description": "(DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop without sandbox (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
     "pname": "wechat-uos",
     "version": "4.0.0.21"
   },
@@ -3830,7 +3835,7 @@
     "version": "1.2.3"
   },
   "packages.x86_64-linux.glauth": {
-    "description": "Lightweight LDAP server for development, home use, or CI",
+    "description": "(DEPRECATED: glauth is available in nixpkgs by a different maintainer) Lightweight LDAP server for development, home use, or CI",
     "pname": "glauth",
     "version": "2.3.2"
   },
@@ -3900,12 +3905,12 @@
     "version": "3.0"
   },
   "packages.x86_64-linux.kata-image": {
-    "description": "Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-images/default.nix)",
+    "description": "(DEPRECATED: kata-image is available in nixpkgs by a different maintainer) Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-images/default.nix)",
     "pname": "kata-image",
     "version": "3.11.0"
   },
   "packages.x86_64-linux.kata-runtime": {
-    "description": "Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-runtime/default.nix)",
+    "description": "(DEPRECATED: kata-runtime is available in nixpkgs by a different maintainer) Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. (Packaging script adapted from https://github.com/TUM-DSE/doctor-cluster-config/blob/0c40be8dd86282122f8f04df738c409ef5e3da1c/pkgs/kata-runtime/default.nix)",
     "pname": "kata-runtime",
     "version": "3.11.0"
   },
@@ -4110,7 +4115,7 @@
     "version": "1.10.0"
   },
   "packages.x86_64-linux.payload-dumper-go": {
-    "description": "Android OTA payload dumper written in Go",
+    "description": "(DEPRECATED: payload-dumper-go is available in nixpkgs by a different maintainer) Android OTA payload dumper written in Go",
     "pname": "payload-dumper-go",
     "version": "1.3.0"
   },
@@ -4390,17 +4395,22 @@
     "version": "24.10"
   },
   "packages.x86_64-linux.wechat-uos": {
-    "description": "WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "description": "(DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
     "pname": "wechat-uos",
     "version": "4.0.0.21"
   },
   "packages.x86_64-linux.wechat-uos-bin": {
-    "description": "WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "description": "(DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
     "pname": "wechat-uos",
     "version": "4.0.0.21"
   },
+  "packages.x86_64-linux.wechat-uos-sandboxed": {
+    "description": "WeChat desktop with sandbox enabled ($HOME/Documents/WeChat_Data) (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "pname": "wechat-uos",
+    "version": "4.0.0.23"
+  },
   "packages.x86_64-linux.wechat-uos-without-sandbox": {
-    "description": "WeChat desktop without sandbox (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
+    "description": "(DEPRECATED: wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package.) WeChat desktop without sandbox (Adapted from https://aur.archlinux.org/packages/wechat-uos-bwrap)",
     "pname": "wechat-uos",
     "version": "4.0.0.21"
   },

diff --git a/pkgs/_meta/readme/default.nix b/pkgs/_meta/readme/default.nix
@@ -1,6 +1,7 @@
 {
   writeTextFile,
   callPackage,
+  pkgs,
   lib,
   _meta,
   _packages,
@@ -17,7 +18,18 @@ let
     n: v: v != null && (builtins.tryEval v).success && !(isHiddenName n) && !(lib.isDerivation v)
   ) _packages;
 
-  deprecatedPackages = builtins.attrNames (builtins.readDir ../../deprecated);
+  deprecatedPackages =
+    let
+      inherit
+        (import ../../../helpers/group.nix {
+          inherit pkgs lib;
+          mode = null;
+        })
+        createCallGroupDeps
+        ;
+      callGroupDeps = createCallGroupDeps _packages callPackage;
+    in
+    builtins.attrNames (import ../../deprecated callGroupDeps);
 
   allPlatforms = [
     "x86_64-linux"

diff --git a/pkgs/deprecated/default.nix b/pkgs/deprecated/default.nix
@@ -1,8 +1,25 @@
 {
+  callPackage,
   loadPackages,
+  lib,
   ...
 }:
 let
   packages = loadPackages ./. { };
+  packages' = packages // {
+    wechat-uos-without-sandbox = callPackage ./wechat-uos {
+      enableSandbox = false;
+    };
+    # Deprecated alias
+    wechat-uos-bin = packages.wechat-uos;
+  };
 in
-packages
+lib.mapAttrs (
+  _k: v:
+  v
+  // {
+    meta = v.meta // {
+      description = "(DEPRECATED: ${builtins.concatStringsSep " " v.meta.knownVulnerabilities}) ${v.meta.description}";
+    };
+  }
+) packages'
diff --git a/pkgs/uncategorized/wechat-uos/default.nix → pkgs/deprecated/wechat-uos/default.nix b/pkgs/uncategorized/wechat-uos/default.nix → pkgs/deprecated/wechat-uos/default.nix
@@ -284,5 +284,8 @@ stdenv.mkDerivation {
     homepage = "https://weixin.qq.com/";
     platforms = [ "x86_64-linux" ];
     license = lib.licenses.unfreeRedistributable;
+    knownVulnerabilities = [
+      "wechat-uos is available in nixpkgs. If you still want sandbox functionality, use wechat-uos-sandboxed package."
+    ];
   };
 }
diff --git a/...gorized/wechat-uos/libuosdevicea-stub.nix → ...recated/wechat-uos/libuosdevicea-stub.nix b/...gorized/wechat-uos/libuosdevicea-stub.nix → ...recated/wechat-uos/libuosdevicea-stub.nix
diff --git a/pkgs/uncategorized/wechat-uos/license.tar.gz → pkgs/deprecated/wechat-uos/license.tar.gz b/pkgs/uncategorized/wechat-uos/license.tar.gz → pkgs/deprecated/wechat-uos/license.tar.gz
diff --git a/pkgs/uncategorized/default.nix b/pkgs/uncategorized/default.nix
@@ -16,9 +16,4 @@ packages
   nvlax-530 = callPackage ./nvlax/nvidia-530.nix { };
   svp-mpv = callPackage ./svp/mpv.nix { };
   uesave-0_3_0 = callPackage ./uesave/0_3_0.nix { };
-  wechat-uos-without-sandbox = callPackage ./wechat-uos {
-    enableSandbox = false;
-  };
-  # Deprecated alias
-  wechat-uos-bin = packages.wechat-uos;
 }