Merge master into staging-next

This commit is contained in:
github-actions[bot]
2025-01-04 06:04:22 +00:00
committed by GitHub
88 changed files with 2490 additions and 2017 deletions
+7
View File
@@ -21729,6 +21729,13 @@
githubId = 22163194;
name = "Stel Abrego";
};
stellessia = {
name = "Rachel Podya";
email = "homicide@disroot.org";
github = "stellessia";
githubId = 81514356;
keys = [ { fingerprint = "38E8 7F79 AE86 CA98 F8BC 45F8 1060 00A0 5E5B DB90"; } ];
};
stepbrobd = {
name = "Yifei Sun";
email = "ysun@hey.com";
+10 -3
View File
@@ -20,6 +20,12 @@ in
default = 5055;
description = ''The port which the Jellyseerr web UI should listen to.'';
};
configDir = lib.mkOption {
type = lib.types.path;
default = "/var/lib/jellyseerr/config";
description = "Config data directory";
};
};
config = lib.mkIf cfg.enable {
@@ -27,14 +33,15 @@ in
description = "Jellyseerr, a requests manager for Jellyfin";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.PORT = toString cfg.port;
environment = {
PORT = toString cfg.port;
CONFIG_DIRECTORY = cfg.configDir;
};
serviceConfig = {
Type = "exec";
StateDirectory = "jellyseerr";
WorkingDirectory = "${cfg.package}/libexec/jellyseerr/deps/jellyseerr";
DynamicUser = true;
ExecStart = lib.getExe cfg.package;
BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ];
Restart = "on-failure";
ProtectHome = true;
ProtectSystem = "strict";
@@ -1,23 +1,24 @@
{ lib
, stdenv
, fetchFromGitHub
, buildDotnetModule
, dotnetCorePackages
, libX11
, libICE
, libSM
, libXi
, libXcursor
, libXext
, libXrandr
, fontconfig
, glew
, makeDesktopItem
, copyDesktopItems
, icoutils
, bintools
, fixDarwinDylibNames
, autoSignDarwinBinariesHook
{
lib,
stdenv,
fetchFromGitHub,
buildDotnetModule,
dotnetCorePackages,
libX11,
libICE,
libSM,
libXi,
libXcursor,
libXext,
libXrandr,
fontconfig,
glew,
makeDesktopItem,
copyDesktopItems,
icoutils,
bintools,
fixDarwinDylibNames,
autoSignDarwinBinariesHook,
}:
buildDotnetModule rec {
@@ -28,19 +29,28 @@ buildDotnetModule rec {
owner = "icsharpcode";
repo = "AvaloniaILSpy";
rev = "v${version}";
sha256 = "cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";
hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";
};
patches = [
# Remove dead nuget package source
./remove-broken-sources.patch
# Upgrade project to .NET 8.0
./dotnet-8-upgrade.patch
];
nativeBuildInputs = [
copyDesktopItems
icoutils
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];
nativeBuildInputs =
[
copyDesktopItems
icoutils
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
bintools
fixDarwinDylibNames
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
autoSignDarwinBinariesHook
];
buildInputs = [
# Dependencies of nuget packages w/ native binaries
@@ -61,21 +71,22 @@ buildDotnetModule rec {
glew
];
postInstall = ''
icotool --icon -x ILSpy/ILSpy.ico
for i in 16 32 48 256; do
size=''${i}x''${i}
install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png
done
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist
install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns
mkdir -p $out/Applications/ILSpy.app/Contents/MacOS
ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
'';
postInstall =
''
icotool --icon -x ILSpy/ILSpy.ico
for i in 16 32 48 256; do
size=''${i}x''${i}
install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png
done
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist
install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns
mkdir -p $out/Applications/ILSpy.app/Contents/MacOS
ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
'';
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
projectFile = "ILSpy/ILSpy.csproj";
nugetDeps = ./deps.json;
@@ -108,8 +119,15 @@ buildDotnetModule rec {
lgpl21Only
mspl
];
sourceProvenance = with sourceTypes; [ fromSource binaryBytecode binaryNativeCode ];
maintainers = with maintainers; [ AngryAnt emilytrau ];
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode
binaryNativeCode
];
maintainers = with maintainers; [
AngryAnt
emilytrau
];
mainProgram = "ILSpy";
};
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,64 @@
diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
index 397e0e5..dfa385c 100644
--- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
+++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<LangVersion>7.2</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj
index cd6d5e2..d725817 100644
--- a/ILSpy.Core/ILSpy.Core.csproj
+++ b/ILSpy.Core/ILSpy.Core.csproj
@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<SignAssembly>True</SignAssembly>
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 4deb56f..b9813ba 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<OutputType>WinExe</OutputType>
<TieredCompilation>true</TieredCompilation>
diff --git a/SharpTreeView/SharpTreeView.csproj b/SharpTreeView/SharpTreeView.csproj
index d6f46c5..4183ffd 100644
--- a/SharpTreeView/SharpTreeView.csproj
+++ b/SharpTreeView/SharpTreeView.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<SignAssembly>True</SignAssembly>
diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj
index 453a3ef..806f375 100644
--- a/TestPlugin/TestPlugin.csproj
+++ b/TestPlugin/TestPlugin.csproj
@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<AssemblyName>Test.Plugin</AssemblyName>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
@@ -1236,6 +1236,15 @@
"spdx": "MPL-2.0",
"vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
},
"sysdig": {
"hash": "sha256-TvZ7x4dWOERkqTWtjmbILdcWy12kqsV+OzLJ4siQ7mA=",
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
"owner": "sysdiglabs",
"repo": "terraform-provider-sysdig",
"rev": "v1.42.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0="
},
"tailscale": {
"hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=",
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
@@ -28,20 +28,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "stellarium";
version = "24.3";
version = "24.4";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${finalAttrs.version}";
hash = "sha256-shDp2tCOynMiEuTSx4TEK8V9h3EsMDq+kkZFhldrinM=";
hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA=";
};
patches = [
# Compatibility with INDI 2.0 series from https://github.com/Stellarium/stellarium/pull/3269
# Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025
(fetchpatch {
url = "https://github.com/Stellarium/stellarium/commit/31fd7bebf33fa710ce53ac8375238a24758312bc.patch";
hash = "sha256-eJEqqitZgtV6noeCi8pDBYMVTFIVWXZU1fiEvoilX8o=";
url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch";
hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A=";
})
];
@@ -123,5 +123,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ kilianar ];
broken = stdenv.hostPlatform.isDarwin;
};
})
@@ -21,33 +21,33 @@
let
# SHA256 of the fritzing-parts HEAD on the master branch,
# which contains the latest stable parts definitions
partsSha = "015626e6cafb1fc7831c2e536d97ca2275a83d32";
partsSha = "76235099ed556e52003de63522fdd74e61d53a36";
parts = fetchFromGitHub {
owner = "fritzing";
repo = "fritzing-parts";
rev = partsSha;
hash = "sha256-5jw56cqxpT/8bf1q551WG53J6Lw5pH0HEtRUoNNMc+A=";
hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y=";
};
# Header-only library
svgpp = fetchFromGitHub {
owner = "svgpp";
repo = "svgpp";
rev = "v1.3.0";
hash = "sha256-kJEVnMYnDF7bThDB60bGXalYgpn9c5/JCZkRSK5GoE4=";
tag = "v1.3.1";
hash = "sha256-nW0ns06XWfUi22nOKZzFKgAOHVIlQqChW8HxUDOFMh4=";
};
in
stdenv.mkDerivation {
pname = "fritzing";
version = "1.0.2";
version = "1.0.4";
src = fetchFromGitHub {
owner = "fritzing";
repo = "fritzing-app";
rev = "dbdbe34c843677df721c7b3fc3e32c0f737e7e95";
hash = "sha256-Xi5sPU2RGkqh7T+EOvwxJJKKYDhJfccyEZ8LBBTb2s4=";
rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25";
hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0=";
};
nativeBuildInputs = [
@@ -56,6 +56,7 @@ stdenv.mkDerivation {
qttools
wrapQtAppsHook
];
buildInputs =
[
qtbase
@@ -90,12 +91,14 @@ stdenv.mkDerivation {
cp -a ${parts}/* parts/
'';
env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
"-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
"-I${svgpp}/include"
"-I${clipper}/include/polyclipping"
];
env.NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
env = {
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
"-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
"-I${svgpp}/include"
"-I${clipper}/include/polyclipping"
];
NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
};
qmakeFlags = [
"phoenix.pro"
@@ -116,18 +119,18 @@ stdenv.mkDerivation {
-folder "$out/share/fritzing"
'';
meta = with lib; {
meta = {
description = "Open source prototyping tool for Arduino-based projects";
homepage = "https://fritzing.org/";
license = with licenses; [
homepage = "https://fritzing.org";
license = with lib.licenses; [
gpl3
cc-by-sa-30
];
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
robberer
muscaln
];
platforms = platforms.unix;
platforms = lib.platforms.unix;
mainProgram = "Fritzing";
};
}
@@ -8,18 +8,18 @@
rustPlatform.buildRustPackage rec {
pname = "git-absorb";
version = "0.6.15";
version = "0.6.16";
src = fetchFromGitHub {
owner = "tummychow";
repo = "git-absorb";
tag = version;
hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU=";
hash = "sha256-5ZCCrq/mc9FAjl7AMbuQyRak5sL1dG3qWnrdNzUu4Ss=";
};
nativeBuildInputs = [ installShellFiles ];
cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0=";
cargoHash = "sha256-CzZgAjAIJryhFEJve3E62rg4QGRPSvBMuFZJzHGf09w=";
postInstall =
''
File diff suppressed because it is too large Load Diff
+7 -15
View File
@@ -17,29 +17,21 @@
}:
buildDotnetModule rec {
pname = "opentracker";
version = "1.8.5";
version = "1.8.6";
src = fetchFromGitHub {
owner = "trippsc2";
repo = pname;
repo = "opentracker";
tag = version;
hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg==";
hash = "sha256-4EBn3BX5tX+yPUjoNFQSls9CwTCd6MpvcBoUKwRndRo=";
};
patches = [./remove-project.patch];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
nugetDeps = ./deps.json;
projectFile = "OpenTracker.sln";
executables = ["OpenTracker"];
doCheck = true;
disabledTests = [
"OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue"
"OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected"
];
projectFile = "src/OpenTracker/OpenTracker.csproj";
executables = [ "OpenTracker" ];
nativeBuildInputs = [
autoPatchelfHook
@@ -86,6 +78,6 @@ buildDotnetModule rec {
license = licenses.mit;
maintainers = [ ];
mainProgram = "OpenTracker";
platforms = ["x86_64-linux"];
platforms = [ "x86_64-linux" ];
};
}
@@ -1,14 +0,0 @@
diff --git a/OpenTracker.sln b/OpenTracker.sln
index 0a8c438..77124e1 100644
--- a/OpenTracker.sln
+++ b/OpenTracker.sln
@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 16.0.29806.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker", "OpenTracker\OpenTracker.csproj", "{9D32A24F-7FF0-4632-B663-5AD2D64A6C87}"
- ProjectSection(ProjectDependencies) = postProject
- {732A9A56-32B4-4149-B3A5-F2A4F48293D3} = {732A9A56-32B4-4149-B3A5-F2A4F48293D3}
- EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker.Models", "OpenTracker.Models\OpenTracker.Models.csproj", "{5DB05A1F-56E3-4035-8898-5CFB22DB3568}"
EndProject
+31 -71
View File
@@ -2,191 +2,151 @@
{
"pname": "AtkSharp",
"version": "3.24.24.34",
"sha256": "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"
"hash": "sha256-GrOzO4YDMKJNHAnqLF+c44iGYlvazGTOuRLUnuLbwco="
},
{
"pname": "CairoSharp",
"version": "3.24.24.34",
"sha256": "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"
"hash": "sha256-/80xbYSPU8+6twoXRjES8PtV7dKB6fQoe6EqBmawzV8="
},
{
"pname": "Eto.Forms",
"version": "2.7.1",
"sha256": "1hzbdnmn5znycfi0mvqa5k5mz9gasy58qzwa7fjmlkwj8ab87l9r"
"hash": "sha256-OdGDlkKST1qlO4p/jIrX6qVfyywK7wqiY97+Yqtt68M="
},
{
"pname": "Eto.Platform.Gtk",
"version": "2.7.1",
"sha256": "09iz85s728jy5qg7y30qvqw5rpsr3yxffrchk1avryk87ky1ysys"
"hash": "sha256-2msf/Dxo+rxVmJBl57ofWd9cON4YDH8eLl4icXRBPyY="
},
{
"pname": "GdkSharp",
"version": "3.24.24.34",
"sha256": "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"
"hash": "sha256-pQOp2jft19vVN+gSjD0tHfNGucss7ruy1xyys6IHHWQ="
},
{
"pname": "GioSharp",
"version": "3.24.24.34",
"sha256": "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"
"hash": "sha256-/fZBfaKXlrdBuNh1/h0s1++5Ek4OnznXvzJx0uTbHQo="
},
{
"pname": "GLibSharp",
"version": "3.24.24.34",
"sha256": "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"
"hash": "sha256-eAYUYNHF37nIJnk7aRffzBj8b/rluqXERYy358YAd08="
},
{
"pname": "GtkSharp",
"version": "3.24.24.34",
"sha256": "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"
"hash": "sha256-i0XZfzUt9GNaZD1uXNd8x+pb1mPJqYrxQd15XOuHSAA="
},
{
"pname": "LibGit2Sharp",
"version": "0.27.0",
"sha256": "0n8crafpp4jq74km45wlm3jm0h96ggvqxy26wrz55azgjpk6p1gz"
"hash": "sha256-/4Vr5pXvq1J+5kb4jvd7JkFQ5aiUF1InOViSe53KDFk="
},
{
"pname": "LibGit2Sharp.NativeBinaries",
"version": "2.0.319",
"sha256": "0xm6np8y182v5246imnkw1fj2sx8x2nl3568kkm3razcgb0y5xlf"
"hash": "sha256-jvbiwXrsqzzqnMiUQa3oqGshXeDT1miIKFug4NG1pnY="
},
{
"pname": "log4net",
"version": "2.0.15",
"sha256": "1iq1rd0z0m15ln247jjrimj3avq50vh6njvw4x158r5v6nz093nb"
"hash": "sha256-y44EvjW7ZFRCJ3xLa+AGBW81ZI1ZykOEpSVU8EHLAcc="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
"version": "2.0.0",
"hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "5.0.0",
"sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "5.0.0",
"sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"
"hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
},
{
"pname": "Microsoft.Win32.SystemEvents",
"version": "6.0.0",
"sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
"sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
"hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
},
{
"pname": "PangoSharp",
"version": "3.24.24.34",
"sha256": "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"
},
{
"pname": "System.Buffers",
"version": "4.4.0",
"sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"
},
{
"pname": "System.Buffers",
"version": "4.5.1",
"sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
"hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ="
},
{
"pname": "System.ComponentModel.Annotations",
"version": "5.0.0",
"sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"
"hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "4.5.0",
"sha256": "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"
"hash": "sha256-TICO+mteKMC+kUTF2ooLBv2E+pwoSa/4gwcbW4nwN7s="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "6.0.0",
"sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"
"hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
},
{
"pname": "System.Drawing.Common",
"version": "6.0.0",
"sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"
},
{
"pname": "System.Memory",
"version": "4.5.0",
"sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"
},
{
"pname": "System.Memory",
"version": "4.5.4",
"sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
},
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.0",
"sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
"sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"
"hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
},
{
"pname": "System.Security.AccessControl",
"version": "4.5.0",
"sha256": "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"
"hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
},
{
"pname": "System.Security.AccessControl",
"version": "5.0.0",
"sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
},
{
"pname": "System.Security.AccessControl",
"version": "6.0.0",
"sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"
"hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "4.5.0",
"sha256": "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"
"hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "6.0.0",
"sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"
"hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
},
{
"pname": "System.Security.Permissions",
"version": "4.5.0",
"sha256": "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"
"hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ="
},
{
"pname": "System.Security.Permissions",
"version": "6.0.0",
"sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"
"hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.5.0",
"sha256": "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"
"hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "System.Windows.Extensions",
"version": "6.0.0",
"sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"
"hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
}
]
@@ -0,0 +1,52 @@
diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
index e5e6191..ab9f228 100644
--- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
+++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ApplicationIcon>icon64.ico</ApplicationIcon>
<RollForward>LatestMajor</RollForward>
<LangVersion>latest</LangVersion>
diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
index 2af5688..a91bb25 100644
--- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
+++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0-macos</TargetFramework>
+ <TargetFramework>net8.0-macos</TargetFramework>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<RollForward>LatestMajor</RollForward>
diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
index be49446..34a842f 100644
--- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
+++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<ApplicationIcon>Resources\LauncherIcon.ico</ApplicationIcon>
<Authors>Lojemiru, Miepee</Authors>
diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
index 673ab7a..da3a019 100644
--- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
+++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
<Configurations>Debug;Release</Configurations>
<Platforms>AnyCPU</Platforms>
+52 -29
View File
@@ -1,24 +1,25 @@
{ lib
, buildDotnetModule
, writeShellScript
, glibc
, gtk3
, libappindicator
, webkitgtk_4_0
, e2fsprogs
, libnotify
, libgit2
, openssl
, xdelta
, file
, openjdk
, patchelf
, fetchFromGitHub
, buildFHSEnv
, glib-networking
, wrapGAppsHook3
, gsettings-desktop-schemas
, dotnetCorePackages
{
lib,
buildDotnetModule,
writeShellScript,
glibc,
gtk3,
libappindicator,
webkitgtk_4_0,
e2fsprogs,
libnotify,
libgit2,
openssl,
xdelta,
file,
openjdk,
patchelf,
fetchFromGitHub,
buildFHSEnv,
glib-networking,
wrapGAppsHook3,
gsettings-desktop-schemas,
dotnetCorePackages,
}:
let
am2r-run = buildFHSEnv {
@@ -26,7 +27,8 @@ let
multiArch = true;
multiPkgs = pkgs: with pkgs; [
multiPkgs =
pkgs: with pkgs; [
(lib.getLib stdenv.cc.cc)
xorg.libX11
xorg.libXext
@@ -55,7 +57,7 @@ buildDotnetModule {
hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg=";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj";
nugetDeps = ./deps.json;
@@ -74,16 +76,37 @@ buildDotnetModule {
nativeBuildInputs = [ wrapGAppsHook3 ];
buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ];
buildInputs = [
gtk3
gsettings-desktop-schemas
glib-networking
];
patches = [ ./am2r-run-binary.patch ];
patches = [
./am2r-run-binary.patch
./dotnet-8-upgrade.patch
];
dotnetFlags = [ ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' ];
dotnetFlags = [
''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"''
];
makeWrapperArgs = [
"--prefix"
"PATH"
":"
(lib.escapeShellArg (
lib.makeBinPath [
am2r-run
xdelta
file
openjdk
patchelf
]
))
];
postFixup = ''
wrapProgram $out/bin/AM2RLauncher.Gtk \
--prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \
mkdir -p $out/share/icons
install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png
install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.desktop $out/share/applications/AM2RLauncher.desktop
+42
View File
@@ -0,0 +1,42 @@
{
lib,
stdenvNoCC,
fetchurl,
mkfontdir,
mkfontscale,
}:
stdenvNoCC.mkDerivation rec {
pname = "arphic-ukai";
version = "0.2.20080216.2";
src = fetchurl {
url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I=";
};
nativeBuildInputs = [
mkfontscale
mkfontdir
];
installPhase = ''
runHook preInstall
install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
cd $out/share/fonts
mkfontdir
mkfontscale
runHook postInstall
'';
meta = with lib; {
description = "CJK Unicode font Kai style";
homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
license = licenses.arphicpl;
maintainers = [ maintainers.changlinli ];
platforms = platforms.all;
};
}
+42
View File
@@ -0,0 +1,42 @@
{
lib,
stdenvNoCC,
fetchurl,
mkfontdir,
mkfontscale,
}:
stdenvNoCC.mkDerivation rec {
pname = "arphic-uming";
version = "0.2.20080216.2";
src = fetchurl {
url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds=";
};
nativeBuildInputs = [
mkfontscale
mkfontdir
];
installPhase = ''
runHook preInstall
install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
cd $out/share/fonts
mkfontdir
mkfontscale
runHook postInstall
'';
meta = with lib; {
description = "CJK Unicode font Ming style";
homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
license = licenses.arphicpl;
maintainers = [ maintainers.changlinli ];
platforms = platforms.all;
};
}
+6 -1
View File
@@ -81,9 +81,14 @@ stdenv.mkDerivation rec {
meta = {
description = "Companion app for the BitBox02 hardware wallet";
homepage = "https://bitbox.swiss/app/";
downloadPage = "https://github.com/BitBoxSwiss/bitbox-wallet-app";
changelog = "https://github.com/BitBoxSwiss/bitbox-wallet-app/blob/master/CHANGELOG.md#${
builtins.replaceStrings [ "." ] [ "" ] version
}";
license = lib.licenses.asl20;
mainProgram = "bitbox";
maintainers = [ lib.maintainers.tensor5 ];
mainProgram = "bitbox";
sourceProvenance = [ lib.sourceTypes.fromSource ];
platforms = [ "x86_64-linux" ];
};
}
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.41";
version = "0.4.42";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
hash = "sha256-ewxdjvo9WFVX4484uuEkerzcJ4fOy2Sm90tiPGNbrV0=";
hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0=";
};
cargoHash = "sha256-9jG5VgIlHYv1IFSjPy34dNk8RHjhgXi6daI+R0jgxMc=";
cargoHash = "sha256-IDFCzTAlC/ZYGwUSmmxyRmZy5belxvyfeWpTCPzJQ6o=";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
+3 -3
View File
@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.56";
version = "1.0.57";
src = fetchCrate {
inherit pname version;
hash = "sha256-IB1OoS9pdFHFewLfeu1cVCffLGtPvCJlVkIBZxtBkm4=";
hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150=";
};
cargoHash = "sha256-uPlilomHib10/v2HKBjU/ln0B4QkKpFJPpKf37RO7Oo=";
cargoHash = "sha256-o4S13uvKYLUUmx6tHQpCm7U9AOtmg8P60NxdNsXy9Fc=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk_11_0.frameworks;
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "civo";
version = "1.1.92";
version = "1.1.93";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
hash = "sha256-nsH/6OVvCOU4f9UZNFOm9AtyN9L4tXB285580g3SsxE=";
hash = "sha256-FX2hnqYqvPoD6Fn1363XrK4n0tMd9xkWlIcyIhDJDW4=";
};
vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8=";
+10 -3
View File
@@ -65,11 +65,18 @@ buildDotnetModule rec {
# frameworks, you must specify the framework for the published
# application."
substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
--replace-warn TargetFrameworks TargetFramework \
--replace-warn "netstandard2.0;net452" net6.0
--replace-fail TargetFrameworks TargetFramework \
--replace-fail "netstandard2.0;net452" net8.0
for f in Source/**/*.csproj ; do
[[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue;
substituteInPlace $f \
--replace-fail net6.0 net8.0
done
'';
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
nativeBuildInputs = [ jdk11 ];
nugetDeps = ./deps.json;
+49
View File
@@ -0,0 +1,49 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
perl,
python3,
versionCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "easel";
version = "0.49";
src = fetchFromGitHub {
owner = "EddyRivasLab";
repo = "easel";
tag = "easel-${finalAttrs.version}";
hash = "sha256-NSKy7ptNYR0K/VFJNv+5TGWdC1ZM4Y5i/3L+3Coj/sg=";
};
nativeBuildInputs = [ autoreconfHook ];
enableParallelBuilding = true;
doCheck = true;
nativeCheckInputs = [
perl
python3
];
preCheck = ''
patchShebangs devkit/sqc
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
meta = {
description = "Sequence analysis library used by Eddy/Rivas lab code";
homepage = "https://github.com/EddyRivasLab/easel";
license = lib.licenses.bsd2;
mainProgram = "easel";
maintainers = with lib.maintainers; [ natsukium ];
platforms = lib.platforms.unix;
};
})
+9 -9
View File
@@ -15,16 +15,16 @@
let
version = {
seriousproton = "2024.08.09";
emptyepsilon = "2024.08.09";
basis-universal = "v1_15_update2";
seriousproton = "2024.12.08";
emptyepsilon = "2024.12.08";
basis-universal = "1.15_final";
};
basis-universal = fetchFromGitHub {
owner = "BinomialLLC";
repo = "basis_universal";
rev = version.basis-universal;
hash = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4=";
tag = version.basis-universal;
hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY=";
};
serious-proton = stdenv.mkDerivation {
@@ -34,8 +34,8 @@ let
src = fetchFromGitHub {
owner = "daid";
repo = "SeriousProton";
rev = "EE-${version.seriousproton}";
hash = "sha256-B7BUe5rtN/eABJwkuSyn+h1lIHuV/tZUNcGXTyaWIr4=";
tag = "EE-${version.seriousproton}";
hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90=";
};
nativeBuildInputs = [ cmake ];
@@ -69,8 +69,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "daid";
repo = "EmptyEpsilon";
rev = "EE-${version.emptyepsilon}";
hash = "sha256-DxaasUyJa8n0ha8RqAfEnqCVELs5Or0zvIOgcK75TnU=";
tag = "EE-${version.emptyepsilon}";
hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -17,7 +17,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "erofs-utils";
version = "1.8.3";
version = "1.8.4";
outputs = [
"out"
"man"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
hash = "sha256-PFzANgPqCLqa5eBCDurqX/F+0p4igGhTEDVsvyUwToU=";
hash = "sha256-eRWHqgdLufn6IYx2LMH2CwFeL1G8ss6R9oLwQ4VqtJQ=";
};
nativeBuildInputs = [
@@ -0,0 +1,54 @@
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index da429c128..9c69ec8cb 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -14637,9 +14637,10 @@
}
},
"node_modules/nan": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+ "version": "2.22.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+ "license": "MIT",
"optional": true
},
"node_modules/nanoid": {
@@ -31852,9 +31853,9 @@
}
},
"nan": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+ "version": "2.22.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
"optional": true
},
"nanoid": {
@@ -33672,7 +33673,7 @@
"optional": true,
"requires": {
"install-artifact-from-github": "^1.3.1",
- "nan": "^2.17.0",
+ "nan": "^2.22.0",
"node-gyp": "^9.3.0"
}
},
diff --git a/package.json b/package.json
index a4284d841..90a0524f2 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,9 @@
"src/test/**/*"
]
},
+ "overrides" : {
+ "nan": "^2.22.0"
+ },
"dependencies": {
"@electric-sql/pglite": "^0.2.0",
"@google-cloud/cloud-sql-connector": "^1.3.3",
+13 -2
View File
@@ -5,8 +5,8 @@
fetchFromGitHub,
python3,
xcbuild,
fetchpatch,
}:
let
version = "13.29.1";
src = fetchFromGitHub {
@@ -20,7 +20,18 @@ buildNpmPackage {
pname = "firebase-tools";
inherit version src;
npmDepsHash = "sha256-3+XeXK3VGIs4Foi9iW9Kho/Y0JsTQZ7p+582MPgdH1A=";
npmDepsHash = "sha256-lQmoemIxzy2biu80UTR2eA+KJBeXWPh0xZRs/1of0eo=";
patches = [
# Use modern version of `ajv` instead of the four year old default in 13.29.1
(fetchpatch {
name = "bump-ajv.patch";
url = "https://github.com/firebase/firebase-tools/commit/b684155d827e7d1e8390e22511c0e1b5c46812ef.patch";
hash = "sha256-yv2AknT85Eyurc1ZFbbF5S9Sj/VEaVnHXBcXI10OWpw=";
})
# Fix embedded nan version to support node 22
./001-override-nan.patch
];
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
@@ -0,0 +1,65 @@
diff --git a/Src/CommandLine/CommandLine.csproj b/Src/CommandLine/CommandLine.csproj
index 2b6a4fe..5eee8c7 100644
--- a/Src/CommandLine/CommandLine.csproj
+++ b/Src/CommandLine/CommandLine.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
diff --git a/Src/Core/Core.csproj b/Src/Core/Core.csproj
index 8e79a00..db64e3a 100644
--- a/Src/Core/Core.csproj
+++ b/Src/Core/Core.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ApplicationIcon />
<StartupObject />
<Platforms>AnyCPU;x64</Platforms>
diff --git a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj
index daa042d..9290c12 100644
--- a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj
+++ b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
diff --git a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj
index ed3cde5..6c669cd 100644
--- a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj
+++ b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj
@@ -17,7 +17,7 @@
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ToolCommandName>dotnet-formula</ToolCommandName>
<AssemblyName>Microsoft.Jupyter.VUISIS.Formula</AssemblyName>
diff --git a/Src/Tests/Tests.csproj b/Src/Tests/Tests.csproj
index 8828a49..eebe401 100644
--- a/Src/Tests/Tests.csproj
+++ b/Src/Tests/Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
+106 -106
View File
@@ -2,531 +2,531 @@
{
"pname": "Antlr4.Runtime.Standard",
"version": "4.7.2",
"sha256": "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586"
"hash": "sha256-BhWgy5MeAc43bANzOi1p1oPqRA3z4x/yt0A6iZ++ud4="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.Win32.Primitives",
"version": "4.3.0",
"sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"
"hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
},
{
"pname": "Microsoft.Z3.x64",
"version": "4.8.7",
"sha256": "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz"
"hash": "sha256-v1XK4bsYAvySTtScd9dsCC2exuTvaBEl36iX2pPgtPM="
},
{
"pname": "NETStandard.Library",
"version": "1.6.1",
"sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"
"hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
"sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"
"hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
},
{
"pname": "runtime.any.System.Diagnostics.Tools",
"version": "4.3.0",
"sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"
"hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
},
{
"pname": "runtime.any.System.Diagnostics.Tracing",
"version": "4.3.0",
"sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"
"hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
},
{
"pname": "runtime.any.System.Globalization",
"version": "4.3.0",
"sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"
"hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
},
{
"pname": "runtime.any.System.Globalization.Calendars",
"version": "4.3.0",
"sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"
"hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
},
{
"pname": "runtime.any.System.IO",
"version": "4.3.0",
"sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"
"hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
},
{
"pname": "runtime.any.System.Reflection",
"version": "4.3.0",
"sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
},
{
"pname": "runtime.any.System.Reflection.Extensions",
"version": "4.3.0",
"sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"
"hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
},
{
"pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0",
"sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"
"hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
},
{
"pname": "runtime.any.System.Resources.ResourceManager",
"version": "4.3.0",
"sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"
"hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
},
{
"pname": "runtime.any.System.Runtime",
"version": "4.3.0",
"sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
},
{
"pname": "runtime.any.System.Runtime.Handles",
"version": "4.3.0",
"sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"
"hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
},
{
"pname": "runtime.any.System.Runtime.InteropServices",
"version": "4.3.0",
"sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"
"hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
"sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"
"hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
},
{
"pname": "runtime.any.System.Text.Encoding.Extensions",
"version": "4.3.0",
"sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"
"hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
},
{
"pname": "runtime.any.System.Threading.Tasks",
"version": "4.3.0",
"sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"
"hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
},
{
"pname": "runtime.any.System.Threading.Timer",
"version": "4.3.0",
"sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"
"hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
"hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
"hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
"sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.3.0",
"sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
"hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
},
{
"pname": "runtime.native.System.Net.Http",
"version": "4.3.0",
"sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"
"hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
},
{
"pname": "runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"
"hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
"hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
"hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
"hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"
"hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
"hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
"hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
"hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
"hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "runtime.unix.Microsoft.Win32.Primitives",
"version": "4.3.0",
"sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"
"hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
},
{
"pname": "runtime.unix.System.Console",
"version": "4.3.0",
"sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"
"hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
"sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"
"hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
},
{
"pname": "runtime.unix.System.IO.FileSystem",
"version": "4.3.0",
"sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"
"hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
},
{
"pname": "runtime.unix.System.Net.Primitives",
"version": "4.3.0",
"sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"
"hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
},
{
"pname": "runtime.unix.System.Net.Sockets",
"version": "4.3.0",
"sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"
"hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
"sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
},
{
"pname": "runtime.unix.System.Runtime.Extensions",
"version": "4.3.0",
"sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"
"hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
},
{
"pname": "System.AppContext",
"version": "4.3.0",
"sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"
"hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
},
{
"pname": "System.Buffers",
"version": "4.3.0",
"sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
},
{
"pname": "System.Collections",
"version": "4.3.0",
"sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
"hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
},
{
"pname": "System.Collections.Concurrent",
"version": "4.3.0",
"sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"
"hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
},
{
"pname": "System.Console",
"version": "4.3.0",
"sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"
"hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.3.0",
"sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
"hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "4.3.0",
"sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"
"hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.3.0",
"sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"
"hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
},
{
"pname": "System.Diagnostics.Tracing",
"version": "4.3.0",
"sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"
"hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
},
{
"pname": "System.Globalization",
"version": "4.3.0",
"sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
"hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
},
{
"pname": "System.Globalization.Calendars",
"version": "4.3.0",
"sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"
"hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
},
{
"pname": "System.Globalization.Extensions",
"version": "4.3.0",
"sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"
"hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
},
{
"pname": "System.IO",
"version": "4.3.0",
"sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
"hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
},
{
"pname": "System.IO.Compression",
"version": "4.3.0",
"sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
"hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
},
{
"pname": "System.IO.Compression.ZipFile",
"version": "4.3.0",
"sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"
"hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
},
{
"pname": "System.IO.FileSystem",
"version": "4.3.0",
"sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"
"hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.3.0",
"sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
"hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
},
{
"pname": "System.Linq",
"version": "4.3.0",
"sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"
"hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
},
{
"pname": "System.Linq.Expressions",
"version": "4.3.0",
"sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"
"hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
},
{
"pname": "System.Net.Http",
"version": "4.3.0",
"sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"
"hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
},
{
"pname": "System.Net.NameResolution",
"version": "4.3.0",
"sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"
"hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
},
{
"pname": "System.Net.Primitives",
"version": "4.3.0",
"sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"
"hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
},
{
"pname": "System.Net.Sockets",
"version": "4.3.0",
"sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"
"hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
},
{
"pname": "System.ObjectModel",
"version": "4.3.0",
"sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"
"hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
"sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Reflection",
"version": "4.3.0",
"sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
},
{
"pname": "System.Reflection.Emit",
"version": "4.3.0",
"sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"
"hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.3.0",
"sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"
"hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.3.0",
"sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"
"hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.3.0",
"sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"
"hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
"sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.3.0",
"sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"
"hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
"sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
"hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
"sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
"sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
"sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
"hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.3.0",
"sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"
"hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
},
{
"pname": "System.Runtime.Numerics",
"version": "4.3.0",
"sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"
"hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Security.Claims",
"version": "4.3.0",
"sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"
"hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
},
{
"pname": "System.Security.Cryptography.Algorithms",
"version": "4.3.0",
"sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"
"hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.3.0",
"sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"
"hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
},
{
"pname": "System.Security.Cryptography.Csp",
"version": "4.3.0",
"sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"
"hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
},
{
"pname": "System.Security.Cryptography.Encoding",
"version": "4.3.0",
"sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"
"hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
},
{
"pname": "System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"
"hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
},
{
"pname": "System.Security.Cryptography.Primitives",
"version": "4.3.0",
"sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"
"hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
},
{
"pname": "System.Security.Cryptography.X509Certificates",
"version": "4.3.0",
"sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"
"hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
},
{
"pname": "System.Security.Principal",
"version": "4.3.0",
"sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"
"hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.3.0",
"sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"
"hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
"sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.3.0",
"sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
"hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.3.0",
"sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"
"hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
},
{
"pname": "System.Threading",
"version": "4.3.0",
"sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
"sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.3.0",
"sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"
"hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
},
{
"pname": "System.Threading.ThreadPool",
"version": "4.3.0",
"sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"
"hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
},
{
"pname": "System.Threading.Timer",
"version": "4.3.0",
"sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"
"hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.3.0",
"sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"
"hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
},
{
"pname": "System.Xml.XDocument",
"version": "4.3.0",
"sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"
"hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
}
]
+24 -13
View File
@@ -1,6 +1,13 @@
{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, unstableGitUpdater }:
{
lib,
stdenvNoCC,
fetchFromGitHub,
buildDotnetModule,
dotnetCorePackages,
unstableGitUpdater,
}:
buildDotnetModule rec {
buildDotnetModule (finalAttrs: {
pname = "formula-dotnet";
version = "2.0";
@@ -8,22 +15,26 @@ buildDotnetModule rec {
owner = "VUISIS";
repo = "formula-dotnet";
rev = "8ee2e6abfd4ce038e1d9cb9c8602dec1ed6c0163";
sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8=";
hash = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8=";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
patches = [ ./dotnet-8-upgrade.patch ];
dotnet-sdk = dotnetCorePackages.sdk_8_0;
nugetDeps = ./nuget.json;
projectFile = "Src/CommandLine/CommandLine.csproj";
postFixup = if stdenv.hostPlatform.isLinux then ''
mv $out/bin/CommandLine $out/bin/formula
'' else lib.optionalString stdenv.hostPlatform.isDarwin ''
makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \
--add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
--prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
'';
postFixup =
lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
mv $out/bin/CommandLine $out/bin/formula
''
+ lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \
--add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
--prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
'';
passthru.updateScript = unstableGitUpdater { url = meta.homepage; };
passthru.updateScript = unstableGitUpdater { url = finalAttrs.meta.homepage; };
meta = with lib; {
description = "Formal Specifications for Verification and Synthesis";
@@ -33,4 +44,4 @@ buildDotnetModule rec {
platforms = platforms.unix;
mainProgram = "formula";
};
}
})
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "goread";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "TypicalAM";
repo = "goread";
rev = "v${version}";
hash = "sha256-tWQVqHtuTCHrsZu3CfTWUQzvUYbQrrdJoWHp43dfPEE=";
hash = "sha256-8QjroS0aKALcrDJkpihD70iJJBdiVP4Q2j2n3BsY71w=";
};
vendorHash = "sha256-S/0uuy/G7ZT239OgKaOT1dmY+u5/lnZKL4GtbEi2zCI=";
+3 -3
View File
@@ -10,16 +10,16 @@
}:
buildGoModule rec {
pname = "goreleaser";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${version}";
hash = "sha256-DWxYcviI/J9SlHe81UU8yw19pz671C+BsUnrId4JbDE=";
hash = "sha256-W3f/1nn2gZhNloZNEg4ucTKt7B0K6NIYcBsPJyEhaKc=";
};
vendorHash = "sha256-Dbd7zKmzaMixD7AsWjsdiSXUebyjFvPfmwMjozMnaUQ=";
vendorHash = "sha256-lEtuEtz0FMTiUYHiOhPlH78IXHjXCj0Y9Uf2lLgJw/o=";
ldflags = [
"-s"
+35 -10
View File
@@ -2,18 +2,44 @@
lib,
stdenv,
fetchurl,
easel,
perl,
python3,
versionCheckHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
version = "3.4";
pname = "hmmer";
src = fetchurl {
url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M=";
url = "http://eddylab.org/software/hmmer/hmmer-${finalAttrs.version}.tar.gz";
hash = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M=";
};
meta = with lib; {
enableParallelBuilding = true;
doCheck = true;
nativeCheckInputs = [
perl
python3
];
preCheck = ''
install -Dm755 ${easel.src}/devkit/sqc easel/devkit/sqc
patchShebangs easel/devkit/sqc testsuite/* src/hmmpress.itest.pl
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/hmmalign";
versionCheckProgramArg = [ "-h" ];
meta = {
description = "Biosequence analysis using profile hidden Markov models";
longDescription = ''
HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs).
@@ -22,10 +48,9 @@ stdenv.mkDerivation rec {
HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute.
'';
homepage = "http://hmmer.org/";
changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md";
license = licenses.gpl3;
maintainers = [ maintainers.iimog ];
# at least SSE is *required*
platforms = platforms.x86_64;
changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${finalAttrs.version}/release-notes/RELEASE-${finalAttrs.version}.md";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.iimog ];
platforms = lib.platforms.unix;
};
}
})
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-12-23";
version = "0-unstable-2025-01-02";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "f1b1786ea77739dcd181b920d430e30fb1608b8a";
hash = "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=";
rev = "5f6aa268e419d053c3d5025da740e390b12ac936";
hash = "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=";
};
nativeBuildInputs = [
@@ -0,0 +1,65 @@
diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj
index d729fee..ea3e9e6 100644
--- a/InkTestBed/InkTestBed.csproj
+++ b/InkTestBed/InkTestBed.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<RootNamespace>InkTestBed</RootNamespace>
<AssemblyName>InkTestBed</AssemblyName>
diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj
index a6dd06b..c4708cc 100644
--- a/compiler/ink_compiler.csproj
+++ b/compiler/ink_compiler.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>Ink</RootNamespace>
<AssemblyName>ink_compiler</AssemblyName>
</PropertyGroup>
diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj
index caba6df..777c109 100644
--- a/ink-engine-runtime/ink-engine-runtime.csproj
+++ b/ink-engine-runtime/ink-engine-runtime.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net6.0</TargetFrameworks>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>Ink.Runtime</RootNamespace>
<AssemblyName>ink-engine-runtime</AssemblyName>
</PropertyGroup>
diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj
index 0a02264..cf7b254 100644
--- a/inklecate/inklecate.csproj
+++ b/inklecate/inklecate.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>Ink</RootNamespace>
<AssemblyName>inklecate</AssemblyName>
</PropertyGroup>
diff --git a/tests/tests.csproj b/tests/tests.csproj
index 8d3bd6b..a9731c5 100644
--- a/tests/tests.csproj
+++ b/tests/tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RootNamespace>tests</RootNamespace>
<AssemblyName>ink-tests</AssemblyName>
+9 -7
View File
@@ -1,8 +1,9 @@
{ lib
, stdenv
, buildDotnetModule
, dotnetCorePackages
, fetchFromGitHub
{
lib,
stdenv,
buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub,
}:
buildDotnetModule rec {
@@ -16,14 +17,15 @@ buildDotnetModule rec {
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
};
patches = [ ./dotnet-8-upgrade.patch ];
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
projectFile = "inklecate/inklecate.csproj";
nugetDeps = ./deps.json;
executables = [ "inklecate" ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
meta = with lib; {
description = "Compiler for ink, inkle's scripting language";
+87
View File
@@ -0,0 +1,87 @@
{
lib,
pnpm_9,
fetchFromGitHub,
stdenv,
makeWrapper,
nodejs_20,
python3,
sqlite,
nix-update-script,
}:
let
nodejs = nodejs_20;
pnpm = pnpm_9.override { inherit nodejs; };
in
stdenv.mkDerivation rec {
pname = "jellyseerr";
version = "2.1.0";
src = fetchFromGitHub {
owner = "Fallenbagel";
repo = "jellyseerr";
rev = "v${version}";
hash = "sha256-5kaeqhjUy9Lgx4/uFcGRlAo+ROEOdTWc2m49rq8R8Hs=";
};
pnpmDeps = pnpm.fetchDeps {
inherit pname version src;
hash = "sha256-xu6DeaBArQmnqEnIgjc1DTZujQebSkjuai9tMHeQWCk=";
};
buildInputs = [ sqlite ];
nativeBuildInputs = [
python3
nodejs
makeWrapper
pnpm.configHook
];
preBuild = ''
export npm_config_nodedir=${nodejs}
pushd node_modules
pnpm rebuild bcrypt sqlite3
popd
'';
buildPhase = ''
runHook preBuild
pnpm build
pnpm prune --prod --ignore-scripts
rm -rf .next/cache
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share
cp -r -t $out/share .next node_modules dist public package.json overseerr-api.yml
runHook postInstall
'';
postInstall = ''
mkdir -p $out/bin
makeWrapper '${nodejs}/bin/node' "$out/bin/jellyseerr" \
--add-flags "$out/share/dist/index.js" \
--chdir "$out/share" \
--set NODE_ENV production
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Fork of overseerr for jellyfin support";
homepage = "https://github.com/Fallenbagel/jellyseerr";
longDescription = ''
Jellyseerr is a free and open source software application for managing
requests for your media library. It is a a fork of Overseerr built to
bring support for Jellyfin & Emby media servers!
'';
license = licenses.mit;
maintainers = with maintainers; [ camillemndn ];
platforms = platforms.linux;
mainProgram = "jellyseerr";
};
}
-5
View File
@@ -504,11 +504,6 @@
"version": "4.7.1",
"hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
@@ -0,0 +1,39 @@
diff --git a/IonKiwi.lz4/IonKiwi.lz4.csproj b/IonKiwi.lz4/IonKiwi.lz4.csproj
index 312984f..804be5c 100644
--- a/IonKiwi.lz4/IonKiwi.lz4.csproj
+++ b/IonKiwi.lz4/IonKiwi.lz4.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net60</TargetFrameworks>
+ <TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageId>IonKiwi.lz4.managed</PackageId>
<Version>1.0.7</Version>
diff --git a/Knossos.NET/Knossos.NET.csproj b/Knossos.NET/Knossos.NET.csproj
index 501faaa..4b563f1 100644
--- a/Knossos.NET/Knossos.NET.csproj
+++ b/Knossos.NET/Knossos.NET.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
<TrimMode>copyused</TrimMode>
diff --git a/VP.NET/VP.NET.csproj b/VP.NET/VP.NET.csproj
index 11fa155..2eef420 100644
--- a/VP.NET/VP.NET.csproj
+++ b/VP.NET/VP.NET.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
+2 -2
View File
@@ -17,9 +17,9 @@ buildDotnetModule rec {
hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U=";
};
patches = [ ./targetframework.patch ];
patches = [ ./dotnet-8-upgrade.patch ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
nugetDeps = ./deps.json;
executables = [ "Knossos.NET" ];
@@ -1,12 +0,0 @@
diff -Naur Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj
--- Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj 2023-10-18 15:17:20.000000000 -0400
+++ Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj 2024-01-03 17:39:56.809971086 -0500
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net60</TargetFrameworks>
+ <TargetFramework>net6.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageId>IonKiwi.lz4.managed</PackageId>
<Version>1.0.7</Version>
+3 -4
View File
@@ -23,16 +23,15 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.66.0";
format = "other";
version = "1.67.0";
pyproject = false;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-hrQZZ0pZhn+Ph7it6LPFtRMN9mvgFkG//zEi+pVb8n4=";
hash = "sha256-vWAYsImJseEQvgq7vreqS76M963zfuL56R87P3od9m4=";
};
nativeBuildInputs = [
+3 -2
View File
@@ -11,13 +11,13 @@ telegram-desktop.override {
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
finalAttrs: previousAttrs: {
pname = "materialgram-unwrapped";
version = "5.7.0.1";
version = "5.9.0.1";
src = fetchFromGitHub {
owner = "kukuruzka165";
repo = "materialgram";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-YdLUwXMATla64KSYnXLXwLl0KktNoB/IuHIIY44R1VY=";
hash = "sha256-QmXwO8Dn+ATWGwN5smxOB2kxmJZETSMbqwFoR0t3luc=";
fetchSubmodules = true;
};
@@ -32,6 +32,7 @@ telegram-desktop.override {
maintainers = with lib.maintainers; [
oluceps
aleksana
stellessia
];
mainProgram = "materialgram";
};
+49
View File
@@ -0,0 +1,49 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,11 @@ AM_CPPFLAGS = \
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/sdk/include
+if DARWIN
+AM_LIBTOOLFLAGS="--tag=CXX"
+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -I$(top_srcdir)/sdk/include/mega/osx
+endif
+
if WIN32
AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/win32
else
--- a/src/megacmdshell/megacmdshellcommunications.cpp
+++ b/src/megacmdshell/megacmdshellcommunications.cpp
@@ -306,10 +306,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
#endif
const char executable2[] = "./mega-cmd-server";
#else
- #ifdef __MACH__
- const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd";
- const char executable2[] = "./mega-cmd";
- #else
const char executable[] = "mega-cmd-server";
#ifdef __linux__
char executable2[PATH_MAX];
@@ -317,7 +313,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
#else
const char executable2[] = "./mega-cmd-server";
#endif
- #endif
#endif
std::vector<char*> argsVector{
--- a/sdk/Makefile.am
+++ b/sdk/Makefile.am
@@ -27,6 +27,11 @@ AM_CPPFLAGS = \
include m4/aminclude.am
+if DARWIN
+AM_LIBTOOLFLAGS="--tag=CXX"
+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx
+endif
+
if WIN32
AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/win32
else
+29
View File
@@ -0,0 +1,29 @@
--- a/sdk/src/gfx/freeimage.cpp
+++ b/sdk/src/gfx/freeimage.cpp
@@ -216,11 +216,13 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s
#ifdef HAVE_FFMPEG
+#if LIBAVCODEC_VERSION_MAJOR < 60
#ifdef AV_CODEC_CAP_TRUNCATED
#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
#else
#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
#endif
+#endif
const char *GfxProviderFreeImage::supportedformatsFfmpeg()
{
@@ -323,10 +325,12 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size
// Force seeking to key frames
formatContext->seek2any = false;
+#if LIBAVCODEC_VERSION_MAJOR < 60
if (decoder->capabilities & CAP_TRUNCATED)
{
codecContext->flags |= CAP_TRUNCATED;
}
+#endif
AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
+88 -53
View File
@@ -1,66 +1,85 @@
{ lib
, stdenv
, autoreconfHook
, c-ares
, cryptopp
, curl
, fetchFromGitHub
# build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523.
# to be re-enabled when patch available
# , ffmpeg
, gcc-unwrapped
, icu
, libmediainfo
, libraw
, libsodium
, libuv
, libzen
, pcre-cpp
, pkg-config
, readline
, sqlite
{
lib,
stdenv,
autoreconfHook,
c-ares,
cryptopp,
curl,
fetchFromGitHub,
ffmpeg,
freeimage,
gcc-unwrapped,
icu,
libmediainfo,
libraw,
libsodium,
libuv,
libzen,
pcre-cpp,
pkg-config,
readline,
sqlite,
withFreeImage ? false, # default to false because freeimage is insecure
}:
stdenv.mkDerivation rec {
let
pname = "megacmd";
version = "1.7.0";
srcOptions =
if stdenv.isLinux then
{
tag = "${version}_Linux";
hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
}
else
{
tag = "${version}_macOS";
hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
};
in
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAcmd";
rev = "${version}_Linux";
hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
fetchSubmodules = true;
};
src = fetchFromGitHub (
srcOptions
// {
owner = "meganz";
repo = "MEGAcmd";
fetchSubmodules = true;
}
);
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
c-ares
cryptopp
curl
# ffmpeg
icu
gcc-unwrapped
libmediainfo
libraw
libsodium
libuv
libzen
pcre-cpp
readline
sqlite
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs =
lib.optionals stdenv.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a
++ [
c-ares
cryptopp
curl
ffmpeg
icu
libmediainfo
libraw
libsodium
libuv
libzen
pcre-cpp
readline
sqlite
]
++ lib.optionals withFreeImage [ freeimage ];
configureFlags = [
"--disable-curl-checks"
"--disable-examples"
"--with-cares"
"--with-cryptopp"
"--with-curl"
# "--with-ffmpeg"
"--without-freeimage" # disabled as freeimage is insecure
"--with-ffmpeg"
"--with-icu"
"--with-libmediainfo"
"--with-libuv"
@@ -69,13 +88,29 @@ stdenv.mkDerivation rec {
"--with-readline"
"--with-sodium"
"--with-termcap"
] ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
# On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
postConfigure = ''
echo '#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0' >> sdk/include/mega/config.h
'';
patches = [
./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085
./fix-darwin.patch # fix: libtool tag not found; MacFileSystemAccess not declared; server cannot init
];
meta = with lib; {
meta = {
description = "MEGA Command Line Interactive and Scriptable Application";
homepage = "https://mega.io/cmd";
license = with licenses; [ bsd2 gpl3Only ];
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ lunik1 ];
license = with lib.licenses; [
bsd2
gpl3Only
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [
lunik1
ulysseszhan
];
};
}
@@ -1,11 +1,11 @@
{
lib,
stdenv,
stdenvNoCC,
fetchFromGitHub,
fontforge,
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "navilu-font";
version = "1.2";
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "omnictl";
version = "0.45.0";
version = "0.45.1";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "omni";
rev = "v${version}";
hash = "sha256-FA2lGSeTbJXc/BEWOu43sV2xS9tTwQ+iKrDW2tFAsJ4=";
hash = "sha256-a9lp/XDet4CcMadMHj1ia4tdsK/Y8Sfd2f6/A2j1liQ=";
};
vendorHash = "sha256-U/cserG37gM1XDN9HcPqnq4hPJSaOaLBoIs5OcsocYw=";
+9
View File
@@ -1,6 +1,7 @@
{
stdenv,
fetchFromGitHub,
fetchpatch2,
lib,
}:
@@ -15,6 +16,14 @@ stdenv.mkDerivation rec {
hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA=";
};
patches = [
(fetchpatch2 {
url = "https://github.com/leahneukirchen/outils/commit/50877e1bf7c905044e0b50b227ecff48cfec394b.patch?full_index=1";
name = "outils-add-recallocarray-prototype.patch";
hash = "sha256-jOnCMPcHKMRR3J0Yh+ZTHAn7P85FO80yXVX0K2vtlVk=";
})
];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
+1
View File
@@ -12,6 +12,7 @@ let
pypdf2 = super.pypdf2.overridePythonAttrs (oldAttrs: rec {
version = "2.11.1";
format = "setuptools";
pyproject = null;
src = fetchPypi {
pname = "PyPDF2";
inherit version;
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb";
stripRoot = false;
}
+ /profont-x11;
+ "/profont-x11";
srcOtb =
fetchzip {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
sha256 = "18rfhfqrsj3510by0w1a7ak5as6r2cxh8xv02xc1y30mfa6g24x6";
stripRoot = false;
}
+ /profont-otb;
+ "/profont-otb";
dontBuild = true;
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.18.19";
version = "1.18.26";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-J7bghty2F54pdd/maWMWtG1kDm/sETgY1bR/jMy23e4=";
hash = "sha256-G7I2r/jZ3Ht8Is2TagNnyQolasfLlO57qzGcVT4QvkI=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
+5 -5
View File
@@ -7,17 +7,17 @@ let
pname = "rquickshare";
version = "0.11.2";
src = fetchurl {
url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-main_v${version}_glibc-2.39_amd64.AppImage";
hash = "sha256-7w1zybCPRg4RK5bKHoHLDUDXVDQL23ox/6wh8H9vTPg=";
url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-legacy_v${version}_glibc-2.31_amd64.AppImage";
hash = "sha256-VXYiYrTSedH8xFjuxbdplzVdfnO6s3ftY2I121Unlfw=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
install -Dm444 ${appimageContents}/rquickshare.desktop -t $out/share/applications
substituteInPlace $out/share/applications/rquickshare.desktop \
--replace-fail 'Exec=rquickshare' 'Exec=rquickshare %u'
install -Dm444 ${appimageContents}/r-quick-share.desktop -t $out/share/applications
substituteInPlace $out/share/applications/r-quick-share.desktop \
--replace-fail 'Exec=r-quick-share' 'Exec=r-quick-share %u'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
+33
View File
@@ -0,0 +1,33 @@
{
lib,
stdenvNoCC,
fetchurl,
}:
stdenvNoCC.mkDerivation {
pname = "tai-ahom";
version = "unstable-2015-07-06";
src = fetchurl {
url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf";
hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4=";
};
dontUnpack = true;
installPhase = ''
runHook preInstall
install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/enabling-languages/tai-languages";
description = "Unicode-compliant Tai Ahom font";
maintainers = with maintainers; [ mathnerd314 ];
license = licenses.ofl; # See font metadata
platforms = platforms.all;
};
}
+4 -4
View File
@@ -141,8 +141,8 @@
},
{
"pname": "Sandreas.AudioMetadata",
"version": "0.2.5",
"hash": "sha256-4FrW1QV4okSEswTpgj/dhFurR/2AHyTgqDgMBjRproI="
"version": "0.2.7",
"hash": "sha256-GYD+nAURuU99/3JH/4QTthhzAVsau/qpcvih4eiJxtk="
},
{
"pname": "Sandreas.Files",
@@ -241,7 +241,7 @@
},
{
"pname": "z440.atl.core",
"version": "6.9.0",
"hash": "sha256-lme55hhVwZ9Y/wVmekA0gVIsw3RUoyYuL9gMEHXuWMU="
"version": "6.11.0",
"hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg="
}
]
+2 -2
View File
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "tone";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "sandreas";
repo = "tone";
tag = "v${version}";
hash = "sha256-NBFAPEeUKZgyfNlvcOBS1IpktEnI+fOd9WLj0ByzpLY=";
hash = "sha256-DX54NSlqAZzVQObm9qjUsYatjxjHKGcSLHH1kVD4Row=";
};
projectFile = "tone/tone.csproj";
+3 -3
View File
@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "vopono";
version = "0.10.10";
version = "0.10.11";
src = fetchCrate {
inherit pname version;
hash = "sha256-HjubzbRsmRU33oI1p1kzCFUjC2YQJhVqljd/FHzAnMw=";
hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY=";
};
cargoHash = "sha256-YBDB1g8cUOo1hS8Fi03Bvpe63bolbPmhGbvT16G73js=";
cargoHash = "sha256-/z4qBBY/Htlv55vNKj2c1frWsUFTRweJh/G0T2jHLr4=";
meta = with lib; {
description = "Run applications through VPN connections in network namespaces";
-82
View File
@@ -1,82 +0,0 @@
{
lib,
stdenvNoCC,
fetchurl,
mkfontdir,
mkfontscale,
}:
let
version = "0.2.20080216.2";
in
{
arphic-ukai = stdenvNoCC.mkDerivation rec {
pname = "arphic-ukai";
inherit version;
src = fetchurl {
url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I=";
};
nativeBuildInputs = [
mkfontscale
mkfontdir
];
installPhase = ''
runHook preInstall
install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
cd $out/share/fonts
mkfontdir
mkfontscale
runHook postInstall
'';
meta = with lib; {
description = "CJK Unicode font Kai style";
homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
license = licenses.arphicpl;
maintainers = [ maintainers.changlinli ];
platforms = platforms.all;
};
};
arphic-uming = stdenvNoCC.mkDerivation rec {
pname = "arphic-uming";
inherit version;
src = fetchurl {
url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds=";
};
nativeBuildInputs = [
mkfontscale
mkfontdir
];
installPhase = ''
runHook preInstall
install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
cd $out/share/fonts
mkfontdir
mkfontscale
runHook postInstall
'';
meta = with lib; {
description = "CJK Unicode font Ming style";
homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
license = licenses.arphicpl;
maintainers = [ maintainers.changlinli ];
platforms = platforms.all;
};
};
}
-38
View File
@@ -1,38 +0,0 @@
{
lib,
stdenvNoCC,
fetchurl,
}:
{
tai-ahom = stdenvNoCC.mkDerivation rec {
pname = "tai-ahom";
version = "unstable-2015-07-06";
src = fetchurl {
url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf";
hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4=";
};
dontUnpack = true;
installPhase = ''
runHook preInstall
install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/enabling-languages/tai-languages";
description = "Unicode-compliant Tai Ahom font";
maintainers = with maintainers; [ mathnerd314 ];
license = licenses.ofl; # See font metadata
platforms = platforms.all;
};
};
# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai)
}
@@ -19,31 +19,42 @@ let
inherit version;
hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4=";
};
patches = [ ./dotnet-8-upgrade.patch ];
# This buildDotnetModule is used only to get nuget sources, the actual
# build is done in `buildPythonPackage` below.
dotnet-build = buildDotnetModule {
inherit pname version src;
inherit
pname
version
src
patches
;
projectFile = [
"netfx_loader/ClrLoader.csproj"
"example/example.csproj"
];
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
};
in
buildPythonPackage {
inherit pname version src;
inherit
pname
version
src
patches
;
format = "pyproject";
buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps;
buildInputs = dotnetCorePackages.sdk_8_0.packages ++ dotnet-build.nugetDeps;
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
dotnetCorePackages.sdk_6_0
dotnetCorePackages.sdk_8_0
];
propagatedBuildInputs = [ cffi ];
+6 -6
View File
@@ -2,31 +2,31 @@
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies",
"version": "1.0.0",
"sha256": "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"
"hash": "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net461",
"version": "1.0.0",
"sha256": "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"
"hash": "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net47",
"version": "1.0.0",
"sha256": "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6"
"hash": "sha256-Jh40dua+AQpSUGTOCQG493sJzbfqH+yIgyoA6+A1ZQM="
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
"sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
},
{
"pname": "NXPorts",
"version": "1.0.0",
"sha256": "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj"
"hash": "sha256-kpqQDljgsCBRDqbuJkgwClG3dkgjrBAhtXoPZlJR+ws="
}
]
@@ -0,0 +1,31 @@
diff --git a/example/example.csproj b/example/example.csproj
index fd6d566..ed76d15 100644
--- a/example/example.csproj
+++ b/example/example.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net60;netstandard20</TargetFrameworks>
+ <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
<ItemGroup>
diff --git a/tests/test_common.py b/tests/test_common.py
index 8a9e36d..8370024 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -8,12 +8,12 @@ from pathlib import Path
@pytest.fixture(scope="session")
def example_netstandard(tmpdir_factory):
- return build_example(tmpdir_factory, "netstandard20")
+ return build_example(tmpdir_factory, "netstandard2.0")
@pytest.fixture(scope="session")
def example_netcore(tmpdir_factory):
- return build_example(tmpdir_factory, "net60")
+ return build_example(tmpdir_factory, "net8.0")
def build_example(tmpdir_factory, framework):
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "orange-canvas-core";
version = "0.2.4";
version = "0.2.5";
pyproject = true;
src = fetchFromGitHub {
owner = "biolab";
repo = "orange-canvas-core";
tag = version;
hash = "sha256-tLFWOXsAhqxFV0wdlAKestO/F/rDtdFnKDd0FXPeNpg=";
hash = "sha256-uh9wNqgLYRcnCSOdpeLx6ZTRC0cpq6lG/sqmrYLR+3g=";
};
build-system = [ setuptools ];
+30 -23
View File
@@ -1,33 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, buildDotnetModule
, dotnetCorePackages
, powershell
, autoSignDarwinBinariesHook
, glibcLocales
{
lib,
stdenvNoCC,
fetchFromGitHub,
buildDotnetModule,
dotnetCorePackages,
powershell,
autoSignDarwinBinariesHook,
glibcLocales,
}:
buildDotnetModule rec {
buildDotnetModule (finalAttrs: rec {
pname = "ilspycmd";
version = "8.0";
version = "9.0-preview3";
src = fetchFromGitHub {
owner = "icsharpcode";
repo = "ILSpy";
rev = "v${version}";
hash = "sha256-ERBYXgpBRXISfqBSBEydEQuD/5T1dvJ+wNg2U5pKip4=";
hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M=";
};
nativeBuildInputs = [
powershell
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];
nativeBuildInputs =
[
powershell
]
++ lib.optionals (stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isAarch64) [
autoSignDarwinBinariesHook
];
# https://github.com/NixOS/nixpkgs/issues/38991
# bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive";
env.LOCALE_ARCHIVE = lib.optionalString stdenvNoCC.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive";
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj";
nugetDeps = ./deps.json;
@@ -35,18 +39,21 @@ buildDotnetModule rec {
# see: https://github.com/tunnelvisionlabs/ReferenceAssemblyAnnotator/issues/94
linkNugetPackages = true;
meta = with lib; {
meta = {
description = "Tool for decompiling .NET assemblies and generating portable PDBs";
mainProgram = "ilspycmd";
homepage = "https://github.com/icsharpcode/ILSpy";
changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${src.rev}";
license = with licenses; [
changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${finalAttrs.src.rev}";
license = with lib.licenses; [
mit
# third party dependencies
mspl
asl20
];
sourceProvenance = with sourceTypes; [ fromSource binaryBytecode ];
maintainers = with maintainers; [ emilytrau ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode
];
maintainers = with lib.maintainers; [ emilytrau ];
};
}
})
+237 -277
View File
@@ -1,367 +1,327 @@
[
{
"pname": "K4os.Compression.LZ4",
"version": "1.3.5",
"sha256": "1nv9inhz0n25lhkw9xgp6g5xbqmcdccdhx6mwrli0pdp6hjmlh9k"
"version": "1.3.8",
"hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA="
},
{
"pname": "McMaster.Extensions.CommandLineUtils",
"version": "3.1.0",
"sha256": "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"
"version": "4.1.1",
"hash": "sha256-K10ukfRqcRIKJT7PFxc7NFpKWRT+FIDg8IJAR8HA5Eo="
},
{
"pname": "McMaster.Extensions.Hosting.CommandLine",
"version": "4.1.1",
"hash": "sha256-Qz4rSwi0vE5CmwGolmASB92/XZsKlz/QC+pdRITVKHA="
},
{
"pname": "Microsoft.Build.Tasks.Git",
"version": "1.1.1",
"sha256": "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"
"version": "8.0.0",
"hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="
},
{
"pname": "Microsoft.Extensions.Configuration",
"version": "8.0.0",
"hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "6.0.0",
"hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "8.0.0",
"hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
"version": "8.0.2",
"hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
},
{
"pname": "Microsoft.Extensions.Configuration.CommandLine",
"version": "8.0.0",
"hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="
},
{
"pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
"version": "8.0.0",
"hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
},
{
"pname": "Microsoft.Extensions.Configuration.FileExtensions",
"version": "8.0.1",
"hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
},
{
"pname": "Microsoft.Extensions.Configuration.Json",
"version": "8.0.1",
"hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
},
{
"pname": "Microsoft.Extensions.Configuration.UserSecrets",
"version": "8.0.1",
"hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "8.0.1",
"hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "6.0.0",
"hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.2",
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
},
{
"pname": "Microsoft.Extensions.Diagnostics",
"version": "8.0.1",
"hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
},
{
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
"version": "8.0.1",
"hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
},
{
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
"version": "6.0.0",
"hash": "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="
},
{
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
"version": "8.0.0",
"hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
},
{
"pname": "Microsoft.Extensions.FileProviders.Physical",
"version": "8.0.0",
"hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
},
{
"pname": "Microsoft.Extensions.FileSystemGlobbing",
"version": "8.0.0",
"hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
},
{
"pname": "Microsoft.Extensions.Hosting",
"version": "8.0.1",
"hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4="
},
{
"pname": "Microsoft.Extensions.Hosting.Abstractions",
"version": "6.0.0",
"hash": "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="
},
{
"pname": "Microsoft.Extensions.Hosting.Abstractions",
"version": "8.0.1",
"hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
},
{
"pname": "Microsoft.Extensions.Logging",
"version": "8.0.1",
"hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "6.0.0",
"hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.2",
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
"version": "8.0.1",
"hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
},
{
"pname": "Microsoft.Extensions.Logging.Console",
"version": "8.0.1",
"hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU="
},
{
"pname": "Microsoft.Extensions.Logging.Debug",
"version": "8.0.1",
"hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg="
},
{
"pname": "Microsoft.Extensions.Logging.EventLog",
"version": "8.0.1",
"hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8="
},
{
"pname": "Microsoft.Extensions.Logging.EventSource",
"version": "8.0.1",
"hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA="
},
{
"pname": "Microsoft.Extensions.Options",
"version": "8.0.2",
"hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
},
{
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
"version": "8.0.0",
"hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "6.0.0",
"hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "8.0.0",
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "6.0.0",
"sha256": "1skgkralqkg2srvgvrmbsmya67f37gzk40lg28j8nz5mg8k8g0ia"
"version": "8.0.0",
"hash": "sha256-yTkWSH0P4IsKl+fAX9tapyug3omJQ4wxMWcMYhBc20M="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.SourceLink.Common",
"version": "1.1.1",
"sha256": "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"
"version": "8.0.0",
"hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
},
{
"pname": "Microsoft.SourceLink.GitHub",
"version": "1.1.1",
"sha256": "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"
"version": "8.0.0",
"hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
},
{
"pname": "Mono.Cecil",
"version": "0.11.4",
"sha256": "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"
"version": "0.11.6",
"hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU="
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
"sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
"sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"
"pname": "Newtonsoft.Json",
"version": "13.0.3",
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "runtime.any.System.Globalization",
"version": "4.3.0",
"sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"
"pname": "NuGet.Common",
"version": "6.11.1",
"hash": "sha256-UyZtDyTuymC+sKSX+ripOI6MmJZn11loVapVs4uzaGo="
},
{
"pname": "runtime.any.System.IO",
"version": "4.3.0",
"sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"
"pname": "NuGet.Configuration",
"version": "6.11.1",
"hash": "sha256-JH2UCpjYg8pkqxQ4j4BrWiTKhGzgfn55NMr32wf6+FQ="
},
{
"pname": "runtime.any.System.Reflection",
"version": "4.3.0",
"sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"
"pname": "NuGet.Frameworks",
"version": "6.11.1",
"hash": "sha256-p25Oa7wJjwF+2puIhBkZZkKSuk4jGq7xikYSCdfp9Vc="
},
{
"pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0",
"sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"
"pname": "NuGet.Packaging",
"version": "6.11.1",
"hash": "sha256-1yY3p5hQwbUgYCyHnBcuGWiiIib1ppPYt2ntxwXSJW0="
},
{
"pname": "runtime.any.System.Resources.ResourceManager",
"version": "4.3.0",
"sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"
"pname": "NuGet.Protocol",
"version": "6.11.1",
"hash": "sha256-/zFvBV83Q5oMNu68BjmrHtZMAxf/YkDJV8HSsl5GjsY="
},
{
"pname": "runtime.any.System.Runtime",
"version": "4.3.0",
"sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"
},
{
"pname": "runtime.any.System.Runtime.Handles",
"version": "4.3.0",
"sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"
},
{
"pname": "runtime.any.System.Runtime.InteropServices",
"version": "4.3.0",
"sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
"sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"
},
{
"pname": "runtime.any.System.Text.Encoding.Extensions",
"version": "4.3.0",
"sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"
},
{
"pname": "runtime.any.System.Threading.Tasks",
"version": "4.3.0",
"sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
"sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.3.0",
"sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
"sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
"sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"
},
{
"pname": "runtime.unix.System.Runtime.Extensions",
"version": "4.3.0",
"sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"
"pname": "NuGet.Versioning",
"version": "6.11.1",
"hash": "sha256-fl8lyChMjV7Sp8keAP7CdXZh7ARN/mU39T3gG74jDWY="
},
{
"pname": "System.Buffers",
"version": "4.5.1",
"sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
},
{
"pname": "System.Collections",
"version": "4.3.0",
"sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
},
{
"pname": "System.Collections.Immutable",
"version": "6.0.0",
"sha256": "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"
},
{
"pname": "System.Collections.Immutable",
"version": "7.0.0",
"sha256": "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"
"hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
},
{
"pname": "System.ComponentModel.Annotations",
"version": "5.0.0",
"sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"
},
{
"pname": "System.Composition",
"version": "6.0.0",
"sha256": "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"
"hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
},
{
"pname": "System.Composition.AttributedModel",
"version": "8.0.0",
"hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
},
{
"pname": "System.Diagnostics.EventLog",
"version": "8.0.1",
"hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
},
{
"pname": "System.Formats.Asn1",
"version": "6.0.0",
"sha256": "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"
},
{
"pname": "System.Composition.Convention",
"version": "6.0.0",
"sha256": "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"
},
{
"pname": "System.Composition.Hosting",
"version": "6.0.0",
"sha256": "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"
},
{
"pname": "System.Composition.Runtime",
"version": "6.0.0",
"sha256": "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"
},
{
"pname": "System.Composition.TypedParts",
"version": "6.0.0",
"sha256": "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.3.0",
"sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
},
{
"pname": "System.Globalization",
"version": "4.3.0",
"sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
},
{
"pname": "System.IO",
"version": "4.3.0",
"sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
},
{
"pname": "System.IO.Compression",
"version": "4.3.0",
"sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.3.0",
"sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
"hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
},
{
"pname": "System.Memory",
"version": "4.5.4",
"sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
"hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
"sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"
},
{
"pname": "System.Reflection",
"version": "4.3.0",
"sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{
"pname": "System.Reflection.Metadata",
"version": "6.0.0",
"sha256": "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"
"hash": "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="
},
{
"pname": "System.Reflection.Metadata",
"version": "7.0.0",
"sha256": "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
"sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
"sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
},
{
"pname": "System.Runtime",
"version": "4.3.0",
"sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
"version": "8.0.1",
"hash": "sha256-Swip1XuTs/r2m4RKuG5BXXxcaNGRh+jbMnjFRNdL87U="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
"sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
"pname": "System.Security.Cryptography.Pkcs",
"version": "6.0.4",
"hash": "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
"pname": "System.Security.Cryptography.ProtectedData",
"version": "4.4.0",
"hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
"sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
},
{
"pname": "System.Runtime.Loader",
"version": "4.3.0",
"sha256": "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
"sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.3.0",
"sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
},
{
"pname": "System.Threading",
"version": "4.3.0",
"sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
"sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
"pname": "TomsToolbox.Composition.Analyzer",
"version": "2.20.0",
"hash": "sha256-xjWXdkXF8X9nDdzLNA2H1WcpPZV4NDiKf//TeQbLUtc="
},
{
"pname": "TunnelVisionLabs.ReferenceAssemblyAnnotator",
"version": "1.0.0-alpha.160",
"sha256": "1wvfa3098a984kydjgjvx43gncnr89fw20if2gqvz8kqn9pxqjbq"
"hash": "sha256-eEncb7J4or/xEy4CwV1C2TL7BulbPtn8JCgplMBQbvM="
}
]
-96
View File
@@ -1,96 +0,0 @@
{
lib,
mkYarnPackage,
fetchFromGitHub,
fetchYarnDeps,
makeWrapper,
node-pre-gyp,
nodejs,
python3,
sqlite,
}:
mkYarnPackage rec {
pname = "jellyseerr";
version = "1.9.2";
src = fetchFromGitHub {
owner = "Fallenbagel";
repo = "jellyseerr";
rev = "v${version}";
hash = "sha256-TXe/k/pb7idu7G1wGu6TZksnoFQ5/PN0voVlve3k1UI=";
};
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-2iRxguxEI+YKm8ddhRgZMvfZuUgQmCK5ER4jMCFJQMQ=";
};
nativeBuildInputs = [
nodejs
makeWrapper
];
# Fixes "SQLite package has not been found installed" at launch
pkgConfig.sqlite3 = {
nativeBuildInputs = [
node-pre-gyp
python3
sqlite
];
postInstall = ''
export CPPFLAGS="-I${nodejs}/include/node"
node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node --sqlite=${sqlite.dev}
rm -r build-tmp-napi-v6
'';
};
pkgConfig.bcrypt = {
nativeBuildInputs = [
node-pre-gyp
python3
];
postInstall = ''
export CPPFLAGS="-I${nodejs}/include/node"
node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node
'';
};
buildPhase = ''
runHook preBuild
(
shopt -s dotglob
cd deps/jellyseerr
rm -r config/*
yarn build
rm -r .next/cache
)
runHook postBuild
'';
postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/jellyseerr" \
--add-flags "$out/libexec/jellyseerr/deps/jellyseerr/dist/index.js" \
--set NODE_ENV production
'';
doDist = false;
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Fork of overseerr for jellyfin support";
homepage = "https://github.com/Fallenbagel/jellyseerr";
longDescription = ''
Jellyseerr is a free and open source software application for managing
requests for your media library. It is a a fork of Overseerr built to
bring support for Jellyfin & Emby media servers!
'';
license = licenses.mit;
maintainers = with maintainers; [ camillemndn ];
platforms = platforms.linux;
mainProgram = "jellyseerr";
};
}
-247
View File
@@ -1,247 +0,0 @@
{
"name": "jellyseerr",
"version": "1.9.2",
"private": true,
"scripts": {
"dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
"build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
"build:next": "next build",
"build": "yarn build:next && yarn build:server",
"lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache",
"lintfix": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --fix",
"start": "NODE_ENV=production node dist/index.js",
"i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
"migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts",
"migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts",
"migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts",
"format": "prettier --loglevel warn --write --cache .",
"format:check": "prettier --check --cache .",
"typecheck": "yarn typecheck:server && yarn typecheck:client",
"typecheck:server": "tsc --project server/tsconfig.json --noEmit",
"typecheck:client": "tsc --noEmit",
"prepare": "husky install",
"cypress:open": "cypress open",
"cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts",
"cypress:build": "yarn build && yarn cypress:prepare"
},
"repository": {
"type": "git",
"url": "https://github.com/fallenbagel/jellyseerr.git"
},
"license": "MIT",
"dependencies": {
"@formatjs/intl-displaynames": "6.2.6",
"@formatjs/intl-locale": "3.1.1",
"@formatjs/intl-pluralrules": "5.1.10",
"@formatjs/intl-utils": "3.8.4",
"@headlessui/react": "1.7.12",
"@heroicons/react": "2.0.16",
"@supercharge/request-ip": "1.2.0",
"@svgr/webpack": "6.5.1",
"@tanem/react-nprogress": "5.0.30",
"ace-builds": "1.15.2",
"axios": "1.3.4",
"axios-rate-limit": "1.3.0",
"bcrypt": "5.1.0",
"bowser": "2.11.0",
"cacheable-lookup": "^7.0.0",
"connect-typeorm": "1.1.4",
"cookie-parser": "1.4.6",
"copy-to-clipboard": "3.3.3",
"country-flag-icons": "1.5.5",
"cronstrue": "2.23.0",
"csurf": "1.11.0",
"date-fns": "2.29.3",
"dayjs": "1.11.7",
"email-templates": "9.0.0",
"email-validator": "2.0.4",
"express": "4.18.2",
"express-openapi-validator": "4.13.8",
"express-rate-limit": "6.7.0",
"express-session": "1.17.3",
"formik": "2.2.9",
"gravatar-url": "3.1.0",
"intl": "1.2.5",
"lodash": "4.17.21",
"next": "12.3.4",
"node-cache": "5.1.2",
"node-gyp": "9.3.1",
"node-schedule": "2.1.1",
"nodemailer": "6.9.1",
"openpgp": "5.7.0",
"plex-api": "5.3.2",
"pug": "3.0.2",
"react": "18.2.0",
"react-ace": "10.1.0",
"react-animate-height": "2.1.2",
"react-aria": "3.23.0",
"react-dom": "18.2.0",
"react-intersection-observer": "9.4.3",
"react-intl": "6.2.10",
"react-markdown": "8.0.5",
"react-popper-tooltip": "4.4.2",
"react-select": "5.7.0",
"react-spring": "9.7.1",
"react-tailwindcss-datepicker-sct": "1.3.4",
"react-toast-notifications": "2.5.1",
"react-truncate-markup": "5.1.2",
"react-use-clipboard": "1.0.9",
"reflect-metadata": "0.1.13",
"secure-random-password": "0.2.3",
"semver": "7.3.8",
"sqlite3": "5.1.4",
"swagger-ui-express": "4.6.2",
"swr": "2.0.4",
"typeorm": "0.3.12",
"web-push": "3.5.0",
"winston": "3.8.2",
"winston-daily-rotate-file": "4.7.1",
"xml2js": "0.4.23",
"yamljs": "0.3.0",
"yup": "0.32.11",
"zod": "3.20.6"
},
"devDependencies": {
"@babel/cli": "7.21.0",
"@commitlint/cli": "17.4.4",
"@commitlint/config-conventional": "17.4.4",
"@semantic-release/changelog": "6.0.2",
"@semantic-release/commit-analyzer": "9.0.2",
"@semantic-release/exec": "6.0.3",
"@semantic-release/git": "10.0.1",
"@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.3",
"@tailwindcss/typography": "0.5.9",
"@types/bcrypt": "5.0.0",
"@types/cookie-parser": "1.4.3",
"@types/country-flag-icons": "1.2.0",
"@types/csurf": "1.11.2",
"@types/email-templates": "8.0.4",
"@types/express": "4.17.17",
"@types/express-session": "1.17.6",
"@types/lodash": "4.14.191",
"@types/node": "17.0.36",
"@types/node-schedule": "2.1.0",
"@types/nodemailer": "6.4.7",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"@types/react-transition-group": "4.4.5",
"@types/secure-random-password": "0.2.1",
"@types/semver": "7.3.13",
"@types/swagger-ui-express": "4.1.3",
"@types/web-push": "3.3.2",
"@types/xml2js": "0.4.11",
"@types/yamljs": "0.2.31",
"@types/yup": "0.29.14",
"@typescript-eslint/eslint-plugin": "5.54.0",
"@typescript-eslint/parser": "5.54.0",
"autoprefixer": "10.4.13",
"babel-plugin-react-intl": "8.2.25",
"babel-plugin-react-intl-auto": "3.3.0",
"commitizen": "4.3.0",
"copyfiles": "2.4.1",
"cy-mobile-commands": "0.3.0",
"cypress": "12.7.0",
"cz-conventional-changelog": "3.3.0",
"eslint": "8.35.0",
"eslint-config-next": "12.3.4",
"eslint-config-prettier": "8.6.0",
"eslint-plugin-formatjs": "4.9.0",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-no-relative-import-paths": "1.5.2",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"extract-react-intl-messages": "4.1.1",
"husky": "8.0.3",
"lint-staged": "13.1.2",
"nodemon": "2.0.20",
"postcss": "8.4.21",
"prettier": "2.8.4",
"prettier-plugin-organize-imports": "3.2.2",
"prettier-plugin-tailwindcss": "0.2.3",
"semantic-release": "19.0.5",
"semantic-release-docker-buildx": "1.0.1",
"tailwindcss": "3.2.7",
"ts-node": "10.9.1",
"tsc-alias": "1.8.2",
"tsconfig-paths": "4.1.2",
"typescript": "4.9.5"
},
"resolutions": {
"sqlite3/node-gyp": "8.4.1",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"@types/express-session": "1.17.6"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"lint-staged": {
"**/*.{ts,tsx,js}": [
"prettier --write",
"eslint"
],
"**/*.{json,md,css}": [
"prettier --write"
]
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
]
},
"release": {
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
[
"@semantic-release/changelog",
{
"changelogFile": "CHANGELOG.md"
}
],
"@semantic-release/npm",
[
"@semantic-release/git",
{
"assets": [
"package.json",
"CHANGELOG.md"
],
"message": "chore(release): ${nextRelease.version}"
}
],
"semantic-release-docker-buildx",
[
"@semantic-release/github",
{
"addReleases": "bottom"
}
]
],
"branches": [
"main"
],
"npmPublish": false,
"publish": [
{
"path": "semantic-release-docker-buildx",
"buildArgs": {
"COMMIT_TAG": "$GIT_SHA"
},
"imageNames": [
"fallenbagel/jellyseerr"
],
"platforms": [
"linux/amd64",
"linux/arm64",
"linux/arm/v7"
]
},
"@semantic-release/github"
]
}
}
-16
View File
@@ -1,16 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts nix prefetch-yarn-deps
set -eu -o pipefail
version=${1:-$(curl -s https://api.github.com/repos/Fallenbagel/jellyseerr/releases/latest | jq --raw-output '.tag_name[1:]')}
update-source-version jellyseerr $version
nix_file=$(nix-instantiate --eval --strict -A "jellyseerr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
nix_dir=$(dirname $nix_file)
cp $(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/package.json"' | sed 's/"//g') $nix_dir
old_yarn_hash=$(nix-instantiate --eval --strict -A "jellyseerr.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
lock_file=$(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/yarn.lock"' | sed 's/"//g')
new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps $lock_file))
sed -i "$nix_file" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
@@ -3,6 +3,8 @@
fetchurl,
lib,
nodejs,
node-pre-gyp,
node-gyp,
python3,
util-linux,
ffmpeg,
@@ -36,7 +38,7 @@ let
in
stdenv.mkDerivation rec {
pname = "nextcloud-app-recognise";
pname = "nextcloud-app-recognize";
version = currentVersionInfo.version;
srcs =
@@ -80,11 +82,11 @@ stdenv.mkDerivation rec {
# Replace all occurences of node (and check that we actually remved them all)
test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -gt 0
substituteInPlace recognize/lib/**/*.php \
--replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${nodejs}/bin/node'" \
--replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${nodejs}/bin/node'" \
--replace-quiet "\$this->config->getAppValueString('node_binary')" "'${nodejs}/bin/node'" \
--replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${nodejs}/bin/node'" \
--replace-quiet "\$this->config->getAppValue('node_binary')" "'${nodejs}/bin/node'"
--replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValue('node_binary')" "'${lib.getExe nodejs}'"
test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0
@@ -92,13 +94,13 @@ stdenv.mkDerivation rec {
# Skip trying to install it... (less warnings in the log)
sed -i '/public function run/areturn ; //skip' recognize/lib/Migration/InstallDeps.php
ln -s ${ffmpeg}/bin/ffmpeg recognize/node_modules/ffmpeg-static/ffmpeg
ln -s ${lib.getExe ffmpeg} recognize/node_modules/ffmpeg-static/ffmpeg
'';
nativeBuildInputs = lib.optionals useLibTensorflow [
nodejs
nodejs.pkgs.node-pre-gyp
nodejs.pkgs.node-gyp
node-pre-gyp
node-gyp
python3
util-linux
];
@@ -107,7 +109,7 @@ stdenv.mkDerivation rec {
cd recognize
# Install tfjs dependency
export CPPFLAGS="-I${nodejs}/include/node -Ideps/include"
export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include"
cd node_modules/@tensorflow/tfjs-node
node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node
cd -
@@ -133,5 +135,7 @@ stdenv.mkDerivation rec {
This app goes through your media collection and adds fitting tags, automatically categorizing your photos and music.
'';
homepage = "https://apps.nextcloud.com/apps/recognize";
description = "Smart media tagging for Nextcloud: recognizes faces, objects, landscapes, music genres";
changelog = "https://github.com/nextcloud/recognize/blob/v${version}/CHANGELOG.md";
};
}
+1 -1
View File
@@ -31,7 +31,7 @@ buildNpmPackage {
prisma
];
npmDepsHash = "sha256-BkwFQVHpg7PuMU5MaW73S6R+wbdGOJ62PR9EE2ghQFg=";
npmDepsHash = "sha256-zzN4r2hednmm5DFnK/RRTKPq0vWiGhG+WyNTPNNP1vc=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+2 -2
View File
@@ -5,12 +5,12 @@
}:
let
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "stonith404";
repo = "pingvin-share";
rev = "v${version}";
hash = "sha256-wZV3PKnGoD3g4PjSDPwMm4ftUTlEZykNkWlwLCDJfuM=";
hash = "sha256-cgB2cnpWdQFqdz9Lxyl87MOvhELge0YwwY0AoKqL8BU=";
};
in
+1 -1
View File
@@ -23,7 +23,7 @@ buildNpmPackage {
buildInputs = [ vips ];
nativeBuildInputs = [ pkg-config ];
npmDepsHash = "sha256-uu/JX039QjVwMtGI8lOjuzPC7kM1knhKycbJ/4cc1o4=";
npmDepsHash = "sha256-wQIQHRVj8weUh/VOBdYVr8Q4ZE9u4rGJbQr0+NE6XG0=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
@@ -5,7 +5,7 @@
fetchFromGitHub,
}:
let
version = "0.5.0";
version = "0.5.1";
self = ghidra.buildGhidraExtension {
pname = "ghidra-delinker-extension";
inherit version;
@@ -14,7 +14,7 @@ let
owner = "boricj";
repo = "ghidra-delinker-extension";
rev = "v${version}";
hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0=";
hash = "sha256-h6F50Z7S6tPOl9mIhChLKoFxHuAkq/n36ysUEFwWGxI=";
};
postPatch = ''
+1 -34
View File
@@ -1645,9 +1645,6 @@ with pkgs;
arpack-mpi = arpack.override { useMpi = true; };
inherit (callPackages ../data/fonts/arphic {})
arphic-ukai arphic-uming;
asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
atomicparsley = callPackage ../tools/video/atomicparsley {
@@ -2404,8 +2401,6 @@ with pkgs;
jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
jellyseerr = callPackage ../servers/jellyseerr { };
juce = callPackage ../development/misc/juce {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
@@ -4378,8 +4373,6 @@ with pkgs;
mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { });
netcdf-mpi = netcdf.override {
@@ -10489,7 +10482,7 @@ with pkgs;
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
inherit stdenv;
});
@@ -12674,9 +12667,6 @@ with pkgs;
andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { };
ankacoder = callPackage ../data/fonts/ankacoder { };
ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { };
ant-theme = callPackage ../data/themes/ant-theme/ant.nix { };
ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
@@ -12735,9 +12725,6 @@ with pkgs;
inherit (nodePackages) svgo;
};
fira-code = callPackage ../data/fonts/fira-code { };
fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
@@ -12779,22 +12766,10 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};
hackgen-font = callPackage ../data/fonts/hackgen { };
hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { };
inconsolata = callPackage ../data/fonts/inconsolata { };
inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { };
input-fonts = callPackage ../data/fonts/input-fonts { };
iosevka = callPackage ../data/fonts/iosevka { };
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { };
iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {});
joypixels = callPackage ../data/fonts/joypixels { };
kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { };
kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
@@ -12880,10 +12855,6 @@ with pkgs;
papis = with python3Packages; toPythonApplication papis;
paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { };
paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { };
paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { };
plata-theme = callPackage ../data/themes/plata {
inherit (mate) marco;
};
@@ -12894,8 +12865,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
profont = callPackage ../data/fonts/profont { };
qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { };
ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
@@ -12936,8 +12905,6 @@ with pkgs;
source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
gtk = res.gtk2;
};
+3 -1
View File
@@ -5,6 +5,7 @@
# this file.
{ lib
, config
, __splicedPackages
, makeScopeWithSplicing'
, generateSplicesForMkScope
@@ -27,7 +28,6 @@ makeScopeWithSplicing' {
inherit (self) callPackage;
noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ];
in (noExtraAttrs qt6) // {
stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv;
# LIBRARIES
accounts-qt = callPackage ../development/libraries/accounts-qt { };
@@ -125,4 +125,6 @@ makeScopeWithSplicing' {
xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
});
} // lib.optionalAttrs config.allowAliases {
stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
}