diff --git a/.gitea/workflows/publish-attic.yaml b/.gitea/workflows/publish-attic.yaml index 36e1c46..a342738 100644 --- a/.gitea/workflows/publish-attic.yaml +++ b/.gitea/workflows/publish-attic.yaml @@ -67,6 +67,7 @@ jobs: ".#packages.${system}.vintage-story" \ ".#packages.${system}.swaytreesave" \ ".#packages.${system}.archon" \ + ".#packages.${system}.ani-cli-rs" \ | tee built-paths.txt - name: Push packages to Attic diff --git a/pkgs/default.nix b/pkgs/default.nix index 1df984e..1d85c77 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,4 +10,5 @@ vintage-story = pkgs.callPackage ./linux/vintage-story.nix {}; archon = pkgs.callPackage ./linux/archon.nix {}; yubilock = pkgs.callPackage ./linux/yubilock/default.nix { }; + ani-cli-rs = pkgs.callPackage ./linux/ani-cli-rs.nix { }; } diff --git a/pkgs/linux/ani-cli-rs.nix b/pkgs/linux/ani-cli-rs.nix new file mode 100644 index 0000000..56e6ec6 --- /dev/null +++ b/pkgs/linux/ani-cli-rs.nix @@ -0,0 +1,27 @@ +{ pkgs }: +let + pname = "ani-cli-rs"; + version = "0.9.3"; + + src = pkgs.fetchFromGitHub { + owner = "vorlie"; + repo = "ani-cli-rs"; + rev = "${version}"; + sha256 = "sha256-4JjCe9dCggLtETmH8yWYyn1tkHimPYtTp0BLQML3NKY="; + }; +in pkgs.rustPlatform.buildRustPackage { + inherit pname version src; + cargoLock = { lockFile = "${src}/Cargo.lock"; }; + + # tests make this package fail to build, this line skips them + doCheck = false; + + meta = { + description = "A cross-platform Rust port of ani-cli with two independent Anikoto catalogs and native MegaPlay/KotoCDN playback"; + mainProgram = "ani-cli-rs"; + homepage = "https://github.com/vorlie/ani-cli-rs"; + maintainers = [ "wymillerlinux" ]; + platforms = [ "x86_64-linux" ]; + changelog = "https://github.com/vorlie/ani-cli-rs/releases/tag/${version}"; + }; +} diff --git a/pkgs/linux/archon.nix b/pkgs/linux/archon.nix index 9d3ad21..0714387 100644 --- a/pkgs/linux/archon.nix +++ b/pkgs/linux/archon.nix @@ -1,11 +1,11 @@ { pkgs }: let pname = "archon"; - version = "9.3.119"; + version = "9.5.8"; src = pkgs.fetchurl { url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-mUsmaIxm3DZ1vvcwxpmDTWTj+UlFSv+jYkBrteL8xQk="; + hash = "sha256-tEMfDK0BCBvNWFlA78FKWcOvU1wzIorBM4ZmLQ+6hzU="; }; appimageContents = pkgs.appimageTools.extract { @@ -17,8 +17,11 @@ pkgs.appimageTools.wrapType2 { nativeBuildInputs = with pkgs; [ makeWrapper ]; extraInstallCommands = '' - install -Dm444 "${appimageContents}/Archon App.desktop" "$out/share/applications/archon.desktop" - install -Dm444 "${appimageContents}/Archon App.png" "$out/share/icons/hicolor/256x256/apps/archon.png" + install -Dm444 "${appimageContents}/archon.desktop" "$out/share/applications/archon.desktop" + install -Dm444 "${appimageContents}/archon.png" "$out/share/icons/hicolor/512x512/apps/archon.png" + + substituteInPlace "$out/share/applications/archon.desktop" \ + --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=archon --no-sandbox %U" ''; meta = with pkgs.lib; { diff --git a/pkgs/linux/vintage-story.nix b/pkgs/linux/vintage-story.nix index 295ff89..86913c2 100644 --- a/pkgs/linux/vintage-story.nix +++ b/pkgs/linux/vintage-story.nix @@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null; stdenv.mkDerivation (finalAttrs: { pname = "vintagestory"; - version = "1.22.3"; + version = "1.22.6"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz"; - hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04="; + hash = "sha256-xJPyaYklEq2BeUX9+7hNPI6WC6ibcQDS+sKeqKYSh3A="; }; __structuredAttrs = true;