mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
godot_4-mono: fix nuget dependencies
This removes the explicit dependencies on sdk 6 packages, so the sdk can be upgraded without breaking this package.
This commit is contained in:
parent
3d38ecca0c
commit
845066f50e
5
pkgs/by-name/go/godot_4/deps.nix
generated
5
pkgs/by-name/go/godot_4/deps.nix
generated
@ -4,12 +4,10 @@
|
|||||||
{ fetchNuGet }: [
|
{ fetchNuGet }: [
|
||||||
(fetchNuGet { pname = "coverlet.collector"; version = "3.2.0"; hash = "sha256-2aM3pKX5toQQRLKpH5ArzND2Rgq1fSpMsLxcEDbat+M="; })
|
(fetchNuGet { pname = "coverlet.collector"; version = "3.2.0"; hash = "sha256-2aM3pKX5toQQRLKpH5ArzND2Rgq1fSpMsLxcEDbat+M="; })
|
||||||
(fetchNuGet { pname = "DiffPlex"; version = "1.5.0"; hash = "sha256-6HwA6ZyCn++NAXy6ep9ywSF/Ss+e/nmMhjyeIft9fQw="; })
|
(fetchNuGet { pname = "DiffPlex"; version = "1.5.0"; hash = "sha256-6HwA6ZyCn++NAXy6ep9ywSF/Ss+e/nmMhjyeIft9fQw="; })
|
||||||
(fetchNuGet { pname = "envdte"; version = "17.8.37221"; hash = "sha256-jKSZceeB+/IwrOqZ3USX6HeSQtxKCPs9VzA733NHEEU="; })
|
|
||||||
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; })
|
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; })
|
||||||
(fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; hash = "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI="; })
|
(fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; hash = "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI="; })
|
||||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2019.1.3"; hash = "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E="; })
|
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2019.1.3"; hash = "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E="; })
|
||||||
(fetchNuGet { pname = "JetBrains.Rider.PathLocator"; version = "1.0.9"; hash = "sha256-7c5TRZ594tr1Fj5fNiXtPI0pcBuyX/3eU4x+it6Yzew="; })
|
(fetchNuGet { pname = "JetBrains.Rider.PathLocator"; version = "1.0.9"; hash = "sha256-7c5TRZ594tr1Fj5fNiXtPI0pcBuyX/3eU4x+it6Yzew="; })
|
||||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.35"; hash = "sha256-BxvIeZIaBdC0wyDQqKW0E5axSRSrtQk3oEPsT287014="; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; })
|
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; })
|
||||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; })
|
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; })
|
||||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; })
|
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; })
|
||||||
@ -49,8 +47,6 @@
|
|||||||
(fetchNuGet { pname = "Microsoft.Composition"; version = "1.0.27"; hash = "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE="; })
|
(fetchNuGet { pname = "Microsoft.Composition"; version = "1.0.27"; hash = "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE="; })
|
||||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
|
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
|
||||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.1"; hash = "sha256-ySyNpRodd6R6qKnGrgwLYaiHZga2GL0fQARrYGIFa6k="; })
|
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.1"; hash = "sha256-ySyNpRodd6R6qKnGrgwLYaiHZga2GL0fQARrYGIFa6k="; })
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.35"; hash = "sha256-ckJ2xR4qf8OQdk/KhCjVmV91lX8pj19qjlsJ+i5bkMI="; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.35"; hash = "sha256-IcpSbsSHgYBbNVvbcXfmRRM9bdx3pogLncO4RuXEab0="; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
|
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
|
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
|
||||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; })
|
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; })
|
||||||
@ -65,7 +61,6 @@
|
|||||||
(fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; hash = "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A="; })
|
(fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; hash = "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A="; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; hash = "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ="; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; hash = "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ="; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; hash = "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE="; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; hash = "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE="; })
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Interop"; version = "17.8.37221"; hash = "sha256-n4gHogs2T+RxO7OCuFiITu90KTychqZycQMqPbukNuE="; })
|
|
||||||
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.0.82"; hash = "sha256-7JFaA/HZHVjsEtTh/iHDRLi5RcuA39KKvvCkuI4JQFc="; })
|
(fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.0.82"; hash = "sha256-7JFaA/HZHVjsEtTh/iHDRLi5RcuA39KKvvCkuI4JQFc="; })
|
||||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; })
|
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; })
|
||||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
|
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
autoPatchelfHook,
|
autoPatchelfHook,
|
||||||
buildPackages,
|
buildPackages,
|
||||||
dbus,
|
dbus,
|
||||||
|
dotnet-sdk_6,
|
||||||
dotnet-sdk_8,
|
dotnet-sdk_8,
|
||||||
dotnetCorePackages,
|
dotnetCorePackages,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
@ -100,6 +101,10 @@ let
|
|||||||
echo ${commitHash} > .git/HEAD
|
echo ${commitHash} > .git/HEAD
|
||||||
''
|
''
|
||||||
+ lib.optionalString withMono ''
|
+ lib.optionalString withMono ''
|
||||||
|
# TODO: avoid pulling in dependencies of windows-only project
|
||||||
|
dotnet sln modules/mono/editor/GodotTools/GodotTools.sln \
|
||||||
|
remove modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
|
||||||
|
|
||||||
dotnet restore modules/mono/glue/GodotSharp/GodotSharp.sln
|
dotnet restore modules/mono/glue/GodotSharp/GodotSharp.sln
|
||||||
dotnet restore modules/mono/editor/GodotTools/GodotTools.sln
|
dotnet restore modules/mono/editor/GodotTools/GodotTools.sln
|
||||||
dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
|
dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
|
||||||
@ -136,6 +141,8 @@ let
|
|||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals withMono dotnet-sdk_6.packages;
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
[
|
[
|
||||||
autoPatchelfHook
|
autoPatchelfHook
|
||||||
@ -262,7 +269,7 @@ stdenv.mkDerivation (
|
|||||||
runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms;
|
runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms;
|
||||||
buildInputs =
|
buildInputs =
|
||||||
old.buildInputs
|
old.buildInputs
|
||||||
++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk_8.targetPackages));
|
++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk_6.targetPackages));
|
||||||
};
|
};
|
||||||
} attrs
|
} attrs
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user