diff --git a/README.md b/README.md index e4903add..f4276d20 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Or, use variables from this repository in case I change them: ## Packages
-Package set: (Uncategorized) (143 packages) +Package set: (Uncategorized) (144 packages) | State | Path | Name | Version | Description | | ----- | ---- | ---- | ------- | ----------- | @@ -144,6 +144,7 @@ Or, use variables from this repository in case I change them: | | `lyrica` | [lyrica](https://github.com/chiyuki0325/lyrica) | 0.12 | Linux desktop lyrics widget focused on simplicity and integration | | | `lyrica-plasmoid` | [lyrica](https://github.com/chiyuki0325/lyrica) | 0.12 | Linux desktop lyrics widget focused on simplicity and integration (Plasmoid component) | | | `magiskboot` | [magiskboot](https://topjohnwu.github.io/Magisk/tools.html) | 28.0 | Tool to unpack / repack boot images, parse / patch / extract cpio, patch dtb, hex patch binaries, and compress / decompress files with multiple algorithms | +| | `mautrix-gmessages` | [mautrix-gmessages](https://github.com/mautrix/gmessages) | 0.5.2 | Matrix-Google Messages puppeting bridge | | | `mtkclient` | [mtkclient](https://github.com/bkerler/mtkclient) | 2.0.1.freeze | MTK reverse engineering and flash tool | | | `ncmdump-rs` | [ncmdump-rs](https://github.com/iqiziqi/ncmdump.rs) | 0.8.0 | NetEase Cloud Music copyright protection file dump by rust | | | `netboot-xyz` | [netboot-xyz](https://netboot.xyz/) | 2.0.83 | Your favorite operating systems in one place. A network-based bootable operating system installer based on iPXE | diff --git a/_sources/generated.json b/_sources/generated.json index 306aab8f..5d9ab599 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1548,6 +1548,27 @@ }, "version": "v28.0" }, + "mautrix-gmessages": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "mautrix-gmessages", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "mautrix", + "repo": "gmessages", + "rev": "v0.5.2", + "sha256": "sha256-3sx2XxzH/cj2zJIkV9QKKVadxSWwf4YZbdg3p4repqs=", + "sparseCheckout": [], + "type": "github" + }, + "version": "v0.5.2" + }, "mtkclient": { "cargoLocks": null, "date": null, @@ -1974,7 +1995,7 @@ "owner": "open-quantum-safe", "repo": "oqs-provider", "rev": "0.7.0", - "sha256": "sha256-KKZMb6ebaXxLSr5aV0m0VIHj2ofaRYQ0JF5JMAfiEj4=", + "sha256": "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg=", "sparseCheckout": [], "type": "github" }, diff --git a/_sources/generated.nix b/_sources/generated.nix index 328c9fa4..24dc6237 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -799,6 +799,16 @@ hash = "sha256-Gx7rrCn4qxpB5fILvc7vszQek7w9VaD5lckCsP6Hf+I="; }; }; + mautrix-gmessages = { + pname = "mautrix-gmessages"; + version = "v0.5.2"; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "gmessages"; + rev = "v0.5.2"; + hash = "sha256-3sx2XxzH/cj2zJIkV9QKKVadxSWwf4YZbdg3p4repqs="; + }; + }; mtkclient = { pname = "mtkclient"; version = "2.0.1.freeze"; @@ -1018,7 +1028,7 @@ owner = "open-quantum-safe"; repo = "oqs-provider"; rev = "0.7.0"; - hash = "sha256-KKZMb6ebaXxLSr5aV0m0VIHj2ofaRYQ0JF5JMAfiEj4="; + hash = "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg="; }; }; osdlyrics = { diff --git a/flake-modules/nixpkgs-options.nix b/flake-modules/nixpkgs-options.nix index 974eefee..e3238e20 100644 --- a/flake-modules/nixpkgs-options.nix +++ b/flake-modules/nixpkgs-options.nix @@ -31,6 +31,11 @@ let description = "List of insecure packages to be allowed"; default = [ ]; }; + allowInsecurePredicate = lib.mkOption { + type = lib.types.anything; + description = "Predicate to check if insecure package is allowed"; + default = null; + }; }; }; in @@ -49,7 +54,7 @@ in import packages."${n}-patched" { inherit system; config = { - inherit (v) allowUnfree permittedInsecurePackages; + inherit (v) allowUnfree permittedInsecurePackages allowInsecurePredicate; }; inherit (v) overlays; } diff --git a/flake.nix b/flake.nix index 5473307a..b5435ad7 100644 --- a/flake.nix +++ b/flake.nix @@ -114,12 +114,7 @@ nixpkgs-options.pkgs = { sourceInput = inputs.nixpkgs; - permittedInsecurePackages = [ - "electron-11.5.0" - "electron-19.1.9" - "openssl-1.1.1w" - "python-2.7.18.7" - ]; + allowInsecurePredicate = _: true; }; perSystem = diff --git a/nix-packages.json b/nix-packages.json index 2d926ab3..0dbe1b2b 100644 --- a/nix-packages.json +++ b/nix-packages.json @@ -1184,6 +1184,11 @@ "pname": "magiskboot", "version": "28.0" }, + "legacyPackages.x86_64-linux.mautrix-gmessages": { + "description": "Matrix-Google Messages puppeting bridge", + "pname": "mautrix-gmessages", + "version": "0.5.2" + }, "legacyPackages.x86_64-linux.mtkclient": { "description": "MTK reverse engineering and flash tool", "pname": "python3.12-mtkclient", @@ -3984,6 +3989,11 @@ "pname": "magiskboot", "version": "28.0" }, + "packages.x86_64-linux.mautrix-gmessages": { + "description": "Matrix-Google Messages puppeting bridge", + "pname": "mautrix-gmessages", + "version": "0.5.2" + }, "packages.x86_64-linux.mtkclient": { "description": "MTK reverse engineering and flash tool", "pname": "python3.12-mtkclient", diff --git a/nvfetcher.toml b/nvfetcher.toml index a4cd955a..2556e6cf 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -346,6 +346,10 @@ fetch.github = "chiyuki0325/lyrica" src.github = "topjohnwu/Magisk" fetch.url = "https://github.com/topjohnwu/Magisk/releases/download/$ver/Magisk-$ver.apk" +[mautrix-gmessages] +src.github = "mautrix/gmessages" +fetch.github = "mautrix/gmessages" + [mtkclient] src.github = "bkerler/mtkclient" fetch.github = "bkerler/mtkclient" diff --git a/pkgs/uncategorized/mautrix-gmessages/default.nix b/pkgs/uncategorized/mautrix-gmessages/default.nix new file mode 100644 index 00000000..bebcf3bb --- /dev/null +++ b/pkgs/uncategorized/mautrix-gmessages/default.nix @@ -0,0 +1,31 @@ +{ + sources, + lib, + buildGoModule, + olm, + # This option enables the use of an experimental pure-Go implementation of + # the Olm protocol instead of libolm for end-to-end encryption. Using goolm + # is not recommended by the mautrix developers, but they are interested in + # people trying it out in non-production-critical environments and reporting + # any issues they run into. + withGoolm ? false, +}: + +buildGoModule rec { + inherit (sources.mautrix-gmessages) pname version src; + + vendorHash = "sha256-8KexkPsRqzlVeYMF0dVgDMS38zQ3i+erQgsdgHDOCF0="; + + buildInputs = lib.optional (!withGoolm) olm; + tags = lib.optional withGoolm "goolm"; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/mautrix/gmessages"; + description = "Matrix-Google Messages puppeting bridge"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ xddxdd ]; + mainProgram = "mautrix-gmessages"; + }; +}