Merge pull request #81 from DarkKirb/akkoma-jxl-support

Add JXL support to akkoma
This commit is contained in:
Charlotte 🦝 Delenk 2022-12-01 21:41:36 +01:00 committed by GitHub
commit 8f604eca15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions

View file

@ -3,6 +3,8 @@
nix-packages,
config,
lib,
nixpkgs-libjxl-update,
system,
...
}: let
emoji_set_names = ["volpeon-blobfox-flip" "volpeon-blobfox" "volpeon-bunhd-flip" "volpeon-bunhd" "volpeon-drgn" "volpeon-fox" "volpeon-raccoon" "volpeon-vlpn" "lotte" "caro"];
@ -203,7 +205,7 @@ in {
group = "akkoma";
secretConfigFile = config.sops.secrets."services/akkoma.exs".path;
};
systemd.services.pleroma.path = with pkgs; [exiftool imagemagick ffmpeg];
systemd.services.pleroma.path = with pkgs; [exiftool nixpkgs-libjxl-update.legacyPackages.${system}.imagemagick ffmpeg];
services.postgresql.ensureDatabases = ["akkoma"];
services.postgresql.ensureUsers = [
{

View file

@ -577,11 +577,11 @@
]
},
"locked": {
"lastModified": 1669708371,
"narHash": "sha256-cWSNnbs8aA6L7ITx5z/czm1TTCayThUDsYrn9Ld8/6M=",
"lastModified": 1669923178,
"narHash": "sha256-wNZ0JuH3Cqnzz5P45sLeGn/Pgb+cAR5PtOwGf5xIo6o=",
"owner": "DarkKirb",
"repo": "nix-packages",
"rev": "202c40926e3ecfe894caa817c723afafec3f06d0",
"rev": "a38f86d6344b42c4a78ea304342980ff1e6f174b",
"type": "github"
},
"original": {
@ -670,6 +670,22 @@
"type": "github"
}
},
"nixpkgs-libjxl-update": {
"locked": {
"lastModified": 1669918756,
"narHash": "sha256-vc0TNEnwsIHVoQ9i7G0Sic80sQrrig6vxW375O5vNDM=",
"owner": "darkkirb",
"repo": "nixpkgs",
"rev": "9c686f3242fc3dde1819a92a7778ed58d088ec0b",
"type": "github"
},
"original": {
"owner": "darkkirb",
"ref": "bump-jxl-0.7.0",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-noto-variable": {
"locked": {
"lastModified": 1648877644,
@ -855,6 +871,7 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6",
"nixpkgs-fluffychat": "nixpkgs-fluffychat",
"nixpkgs-libjxl-update": "nixpkgs-libjxl-update",
"nixpkgs-noto-variable": "nixpkgs-noto-variable",
"nur": "nur",
"plasma-manager": "plasma-manager",

View file

@ -25,6 +25,7 @@ rec {
plasma-manager.url = "github:pjones/plasma-manager";
plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
plasma-manager.inputs.home-manager.follows = "home-manager";
nixpkgs-libjxl-update.url = "github:darkkirb/nixpkgs/bump-jxl-0.7.0";
nix-packages.url = "github:DarkKirb/nix-packages";
nix-packages.inputs.nixpkgs.follows = "nixpkgs";