summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-09-06 11:31:09 +0800
committerGitHub <noreply@github.com>2022-09-06 11:31:09 +0800
commitd2f66009e5a82a8c09f10a477c9276a963dd0129 (patch)
tree731574792cabd31261c7efeadbeeb28eb7369711
parentMerge pull request #189861 from NixOS/backport-154860-to-release-22.05 (diff)
parentxivlauncher: add sersorrel to maintainers (diff)
downloadnixpkgs-d2f66009e5a82a8c09f10a477c9276a963dd0129.tar.gz
Merge pull request #189719 from sersorrel/backport-189610-to-release-22.05
[22.05] xivlauncher: 1.0.0.9 -> 1.0.1.0
-rw-r--r--pkgs/games/xivlauncher/default.nix10
-rw-r--r--pkgs/games/xivlauncher/deps.nix3
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix
index f13654dcbbef..9cb8fb331b72 100644
--- a/pkgs/games/xivlauncher/default.nix
+++ b/pkgs/games/xivlauncher/default.nix
@@ -3,23 +3,23 @@
, useSteamRun ? true }:
let
- rev = "6a1a59f687ac7b98698e2ebb97d82a94865e50f6";
+ rev = "6246fde6b54f8c7e340057fe2d940287c437153f";
in
buildDotnetModule rec {
pname = "XIVLauncher";
- version = "1.0.0.9";
+ version = "1.0.1.0";
src = fetchFromGitHub {
owner = "goatcorp";
repo = "FFXIVQuickLauncher";
inherit rev;
- sha256 = "sha256-jRyYeTg73W58OH2fWmuVkjxEdyPNqDGRbEZwxBMfdCo=";
+ sha256 = "sha256-sM909/ysrlwsiVSBrMo4cOZUWxjRA3ZSwlloGythOAY=";
};
nativeBuildInputs = [ copyDesktopItems ];
projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj";
- nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`
+ nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps`
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
@@ -67,7 +67,7 @@ in
description = "Custom launcher for FFXIV";
homepage = "https://github.com/goatcorp/FFXIVQuickLauncher";
license = licenses.gpl3;
- maintainers = with maintainers; [ ashkitten ];
+ maintainers = with maintainers; [ ashkitten sersorrel ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/games/xivlauncher/deps.nix b/pkgs/games/xivlauncher/deps.nix
index 76a0b696ad15..c01d2d397a38 100644
--- a/pkgs/games/xivlauncher/deps.nix
+++ b/pkgs/games/xivlauncher/deps.nix
@@ -3,8 +3,8 @@
(fetchNuGet { pname = "CheapLoc"; version = "1.1.6"; sha256 = "1m6cgx9yh7h3vrq2d4f99xyvsxc9jvz8zjq1q14qgylfmyq4hx4l"; })
(fetchNuGet { pname = "Config.Net"; version = "4.19.0"; sha256 = "17iv0vy0693s6d8626lbz3w1ppn5abn77aaki7h4qi4izysizgim"; })
(fetchNuGet { pname = "Downloader"; version = "2.2.8"; sha256 = "0farwh3pc6m8hsgqywigdpcb4gr2m9myyxm2idzjmhhkzfqghj28"; })
- (fetchNuGet { pname = "Facepunch.Steamworks"; version = "2.3.3"; sha256 = "1r3m7cyzfy8ms9xxfa13xcwha02yk22givkaamw166im89m8wqyc"; })
(fetchNuGet { pname = "goaaats.NativeLibraryLoader"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1bjjgsw4ry9cz8dzsgwx428hn06wms194pqz8nclwrqcwfx7gmxk"; })
+ (fetchNuGet { pname = "goaaats.Steamworks"; version = "2.3.4"; sha256 = "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"; })
(fetchNuGet { pname = "goaaats.Veldrid"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "0b35bn4190hxbvrwsygpbpg00gnrj6crxyk8b0d7ian611v4jj0m"; })
(fetchNuGet { pname = "goaaats.Veldrid.ImageSharp"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1zihi2n9qz18kfkz4qnj3412bfsqvx49809hqkknixdrgn8323i2"; })
(fetchNuGet { pname = "goaaats.Veldrid.MetalBindings"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "13cs5jr8bpkrkzziz8b71l3npr14shxryrpsiw0zm7jcx69vg2qf"; })
@@ -169,6 +169,7 @@
(fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; })
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
+ (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "6.0.0-preview.5.21301.5"; sha256 = "1q3iikvjcfrm5p89p1j7qlw1szvryq680qypk023wgy9phmlwi57"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })