Merge master into staging-next
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "86Box";
|
||||
pname = "86box";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -8,5 +8,5 @@ version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-)
|
||||
main_hash=$(nix-prefetch-github --json --rev "v$version" 86Box 86Box | jq -r '.hash')
|
||||
roms_hash=$(nix-prefetch-github --json --rev "v$version" 86Box roms | jq -r '.hash')
|
||||
|
||||
update-source-version _86Box "_$version" "$main_hash"
|
||||
update-source-version _86Box "$version" "$roms_hash" --source-key=roms
|
||||
update-source-version _86box "_$version" "$main_hash"
|
||||
update-source-version _86box "$version" "$roms_hash" --source-key=roms
|
||||
@@ -52,11 +52,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ linsui ];
|
||||
teams = [ lib.teams.android ];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = [
|
||||
# The linux executable only supports x86_64
|
||||
"aarch64-linux"
|
||||
];
|
||||
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
||||
+16
-192
@@ -1,218 +1,42 @@
|
||||
[
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
|
||||
}
|
||||
,
|
||||
"pname": "Serilog",
|
||||
"version": "4.0.0",
|
||||
"hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
}
|
||||
,
|
||||
"pname": "Serilog",
|
||||
"version": "4.1.0",
|
||||
"hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "11.3.2",
|
||||
"hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-Ki6O9HYbseQPV3DsvwmJ+ERimi/WmvzelNJDKP6loo0="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-p38+O0VDqZ8u5VOzImP21/U5wyP1BUp2UrLLc9HSfwE="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Fonts.Inter",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-S0DWwcZHulVUIckiv2HM1Vbqno64c/Xt+mPhZp1tfsA="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-AJS5Ls0tJ6PCr2mnr1PpxGWX4sII8mpe2R+VCFYRg44="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "CommunityToolkit.Mvvm",
|
||||
"version": "8.4.0",
|
||||
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
"version": "0.11.0",
|
||||
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
|
||||
}
|
||||
,
|
||||
"pname": "Serilog",
|
||||
"version": "4.2.0",
|
||||
"hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Async",
|
||||
"version": "2.1.0",
|
||||
"hash": "sha256-LDoLpXkleD2MVPK2KBsLGRf5yqrwckBiAnYDbuIbaUM="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Console",
|
||||
"version": "6.1.1",
|
||||
"hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.File",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux.NoDependencies",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-WjpcM78Q6kaW0eU5iqDR5+fGcF+06/tawWHsJRK57Es="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.macOS",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Win32",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus",
|
||||
"version": "0.23.0",
|
||||
"hash": "sha256-BwWQSqOOMS+Cf2fM8MIuiHey8QnGH4WvYjOn9haq5e0="
|
||||
}
|
||||
,
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.21.2",
|
||||
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "crossmacro-daemon";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alper-han";
|
||||
repo = "CrossMacro";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6Cc1mC34l+4dUPD1LAYxlXxzNF76l4HoOmbqTdTJVk0=";
|
||||
hash = "sha256-qVKlch9GxEfB9thqXdiwWgF25ljX+b5on+bZmcAjAzw=";
|
||||
};
|
||||
|
||||
projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj";
|
||||
|
||||
Generated
+50
-71
@@ -3,216 +3,195 @@
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "11.3.2",
|
||||
"hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-Ki6O9HYbseQPV3DsvwmJ+ERimi/WmvzelNJDKP6loo0="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-p38+O0VDqZ8u5VOzImP21/U5wyP1BUp2UrLLc9HSfwE="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Fonts.Inter",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-S0DWwcZHulVUIckiv2HM1Vbqno64c/Xt+mPhZp1tfsA="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-AJS5Ls0tJ6PCr2mnr1PpxGWX4sII8mpe2R+VCFYRg44="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "CommunityToolkit.Mvvm",
|
||||
"version": "8.4.0",
|
||||
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
"version": "0.11.0",
|
||||
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog",
|
||||
"version": "4.0.0",
|
||||
"hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog",
|
||||
"version": "4.1.0",
|
||||
"hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog",
|
||||
"version": "4.2.0",
|
||||
"hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Async",
|
||||
"version": "2.1.0",
|
||||
"hash": "sha256-LDoLpXkleD2MVPK2KBsLGRf5yqrwckBiAnYDbuIbaUM="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Console",
|
||||
"version": "6.1.1",
|
||||
"hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.File",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux.NoDependencies",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-WjpcM78Q6kaW0eU5iqDR5+fGcF+06/tawWHsJRK57Es="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.macOS",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Win32",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus",
|
||||
"version": "0.23.0",
|
||||
"hash": "sha256-BwWQSqOOMS+Cf2fM8MIuiHey8QnGH4WvYjOn9haq5e0="
|
||||
}
|
||||
,
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.21.2",
|
||||
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "crossmacro";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alper-han";
|
||||
repo = "CrossMacro";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6Cc1mC34l+4dUPD1LAYxlXxzNF76l4HoOmbqTdTJVk0=";
|
||||
hash = "sha256-qVKlch9GxEfB9thqXdiwWgF25ljX+b5on+bZmcAjAzw=";
|
||||
};
|
||||
|
||||
projectFile = "src/CrossMacro.UI/CrossMacro.UI.csproj";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cutemaze";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gottcode.org/cutemaze/cutemaze-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-a+QIOD0TB0AGnqIUgtkMBZuPUCQbXp4NtZ6b0vk/J0c=";
|
||||
hash = "sha256-Fl/fsKB04Kn4HwkNlpcuR3wTJFfn1gGgRGTwRUNDawY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -211,11 +211,9 @@ python.pkgs.buildPythonApplication rec {
|
||||
])
|
||||
++ lib.optionals enableBloat (
|
||||
[
|
||||
aapt
|
||||
abootimg
|
||||
apksigcopier
|
||||
apksigner
|
||||
apktool
|
||||
cbfstool
|
||||
colord
|
||||
enjarify
|
||||
@@ -259,6 +257,12 @@ python.pkgs.buildPythonApplication rec {
|
||||
])
|
||||
# oggvideotools is broken on Darwin, please put it back when it will be fixed?
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ]
|
||||
# Causes an eval failure
|
||||
# See https://github.com/NixOS/nixpkgs/issues/463873
|
||||
++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) [
|
||||
aapt
|
||||
apktool
|
||||
]
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gensio";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = "gensio";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-rgNolodA+fjnOYP1r5pwRYxngrHJ5/Lv1XUsTIlK5KQ=";
|
||||
sha256 = "sha256-5gxBz6m0tyVESeYe5L6z6PZFhrzqVmQuUFYxtd8n9Jc=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
testers,
|
||||
autoreconfHook,
|
||||
bash,
|
||||
tcl,
|
||||
tk,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hfsutils";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://fossies.org/linux/misc/old/hfsutils-${finalAttrs.version}.tar.gz"
|
||||
"https://ftp2.osuosl.org/pub/clfs/conglomeration/hfsutils/hfsutils-${finalAttrs.version}.tar.gz"
|
||||
"ftp://ftp.mars.org/hfs/hfsutils-${finalAttrs.version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-vJ0i1tJSuSDsnN8Y4At2VaYYmz809C5Y1bsVKVcomEA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# extern declarations of errno instead of errno.h include breaks linking
|
||||
(fetchDebianPatch {
|
||||
inherit (finalAttrs) pname version;
|
||||
debianRevision = "15";
|
||||
patch = "0002-Fix-FTBFS-with-gcc-3.4.patch";
|
||||
hash = "sha256-3xOuEFHJeuVBmdqT/fec1jOxdBiXoUFG7ixGztJlxic=";
|
||||
})
|
||||
|
||||
# Support files > 2GB
|
||||
(fetchDebianPatch {
|
||||
inherit (finalAttrs) pname version;
|
||||
debianRevision = "15";
|
||||
patch = "0003-Add-support-for-files-larger-than-2GB.patch";
|
||||
hash = "sha256-vXRjfJE3mJZyt739Ji5PnMnb94X50QhF0gpwCxRYqc4=";
|
||||
})
|
||||
|
||||
# Tcl-interfacing code is old, needs deprecated interp->result
|
||||
(fetchDebianPatch {
|
||||
inherit (finalAttrs) pname version;
|
||||
debianRevision = "15";
|
||||
patch = "0004-Add-DUSE_INTERP_RESULT-to-DEFINES-in-Makefile.in.patch";
|
||||
hash = "sha256-m0zDWZsMXcytaOyHUqo8Dbb5A9G2DyjX8TCGXvXVpmc=";
|
||||
})
|
||||
|
||||
# Fix missing string.h include for strcmp
|
||||
(fetchDebianPatch {
|
||||
inherit (finalAttrs) pname version;
|
||||
debianRevision = "16";
|
||||
patch = "0005-Fix-missing-inclusion-of-string.h-in-hpwd.c.patch";
|
||||
hash = "sha256-PIksZZle+FCiexvecy4IOayNZD/X+Qa8DdE8Ej/p79U=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace-fail 'exec hfssh' 'exec ${placeholder "out"}/bin/hfssh'
|
||||
''
|
||||
# Overriding AR breaks cross
|
||||
+ ''
|
||||
substituteInPlace libhfs/Makefile.in \
|
||||
--replace-fail 'AR =' '#AR =' \
|
||||
--replace-fail '$(AR) ' '$(AR) rc '
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash # allow /bin/sh shebang in hfs to get patched during fixupPhase
|
||||
tcl
|
||||
tk
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(lib.strings.withFeatureAs true "tcl" "${tcl}")
|
||||
(lib.strings.withFeatureAs true "tk" "${tk}")
|
||||
];
|
||||
|
||||
# Tcl code doesn't pass const strings to API
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Makefile.in expects already-existing target dirs
|
||||
preInstall = ''
|
||||
mkdir -p $out/{bin,share/man/man1}
|
||||
'';
|
||||
|
||||
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
installCheckPhase =
|
||||
let
|
||||
diskLabel = "Test Disk";
|
||||
in
|
||||
''
|
||||
runHook preInstallCheck
|
||||
|
||||
# current volume is tracked in $HOME/.hcwd
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# Allow pipeline to fail here
|
||||
set +o pipefail
|
||||
yes | head -c 819200 > disk.hfs
|
||||
set -o pipefail
|
||||
|
||||
$out/bin/hformat -l '${diskLabel}' disk.hfs
|
||||
|
||||
mount_output="$($out/bin/hmount disk.hfs)"
|
||||
if ! echo "$mount_output" | grep "${diskLabel}"; then
|
||||
echo "Label '${diskLabel}' not found" && exit 1
|
||||
fi
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "hvol --version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tools for reading and writing Macintosh volumes";
|
||||
longDescription = ''
|
||||
HFS is the “Hierarchical File System”, the native volume format used on modern Macintosh computers.
|
||||
hfsutils is the name of a comprehensive software package being developed to permit manipulation of
|
||||
HFS volumes from UNIX and other systems.
|
||||
'';
|
||||
homepage = "https://www.mars.org/home/rob/proj/hfs/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.OPNA2608 ];
|
||||
mainProgram = "hfs";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpwcenter";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpwcenter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Hxv5Xjlnv70Q/MGLZ4eTlhW8jYhx4gzhn3YL4oc4hN0=";
|
||||
hash = "sha256-HrmLl4Laizh4zd55H6ETNdxrYQvUB4n1/OC6mxwD+D0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libfakeXinerama";
|
||||
pname = "libfakexinerama";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.4.1-1";
|
||||
hash_aarch64-darwin = "sha256-rVmBKDejuOYprHbQ/UhiAm8PfVgGoPTXbx1Qkdi4j+g=";
|
||||
version_x86_64-linux = "0.4.1-1";
|
||||
hash_x86_64-linux = "sha256-0Y4XjK3vfWeY8Z5tQfM6KX4modKFCRy8MNqCUtGKRvA=";
|
||||
version_aarch64-darwin = "0.4.2-2";
|
||||
hash_aarch64-darwin = "sha256-JadulYyHiXK+sQdp7Y6m5lQkkPkzut9O9Lc9kcW7bR4=";
|
||||
version_x86_64-linux = "0.4.2-2";
|
||||
hash_x86_64-linux = "sha256-JxGlqgsuLcW81mOIcntVFSHv19zSFouIChgz/egc+J0=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
libarchive,
|
||||
iucode-tool,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microcode-intel";
|
||||
version = "20251111";
|
||||
version = "20260210";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${finalAttrs.version}";
|
||||
hash = "sha256-Gn3VKagfMtYbtkh70TlDmy0OBUUbsRiRxHkJtTGEVrY=";
|
||||
tag = "microcode-${finalAttrs.version}";
|
||||
hash = "sha256-c5DAcaXO8FuZtbzrNwjS5E8JEKHb4rFo0CVm1xfDtcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libarchive ];
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out kernel/x86/microcode
|
||||
${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe iucode-tool} -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/
|
||||
${stdenvNoCC.hostPlatform.emulator buildPackages} ${lib.getExe iucode-tool} -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/
|
||||
touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/GenuineIntel.bin
|
||||
echo kernel/x86/microcode/GenuineIntel.bin | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- > $out/intel-ucode.img
|
||||
|
||||
|
||||
@@ -26,16 +26,16 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/${version}/mill-dist-${suffix}-${version}.exe";
|
||||
sha256 =
|
||||
{
|
||||
aarch64-darwin = "sha256-ItoUsQ2Hu6aCrVS9GGf/m6DrQyCwJqtvWT8cTJSnZw4=";
|
||||
x86_64-darwin = "sha256-9NLsUK3H3L27a+OO2kAyApezQpkHAJqvgYgQEXT6y9U=";
|
||||
aarch64-linux = "sha256-VaBjRHMBKB83dHACQor9R0Gk/7tCpw1ITkxqWJb9+KI=";
|
||||
x86_64-linux = "sha256-BMc7sGPlTzcED5RjrTNlrBWyr89cNiKfnh3plJ24dZ4=";
|
||||
aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs=";
|
||||
x86_64-darwin = "sha256-EvIH0GHrdFtE5m6WqHAu7XDJn/8rElpmSxLrdCx5CKY=";
|
||||
aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk=";
|
||||
x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mollysocket";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mollyim";
|
||||
repo = "mollysocket";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-F80XRQn3h1Y6dE8PVLGMTY29yZomrwqFAsm7h8euHw8=";
|
||||
hash = "sha256-AmbhTjf1KhDc6Y0yrXKzL6gPMJ9Wx8e8HqdbBHr7/cY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BgmgxNxyuEXKLO9yoymJ0PUfL6/YSegGk8OMPjup/zo=";
|
||||
cargoHash = "sha256-/WUcaGrIQvPXrcOvSpEGR6mCiey1ULWcLpXzcpvEh7E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -31,9 +31,9 @@ let
|
||||
|
||||
phome = "$out/lib/olympus";
|
||||
# The following variables are to be updated by the update script.
|
||||
version = "26.02.04.01";
|
||||
buildId = "5465"; # IMPORTANT: This line is matched with regex in update.sh.
|
||||
rev = "93a53820c73b9cda123d9d5e622157d22d0873d4";
|
||||
version = "26.02.04.03";
|
||||
buildId = "5468"; # IMPORTANT: This line is matched with regex in update.sh.
|
||||
rev = "f11768c2d470d0357a7e07cd3a031b081a6593ab";
|
||||
in
|
||||
buildDotnetModule {
|
||||
pname = "olympus-unwrapped";
|
||||
@@ -46,7 +46,7 @@ buildDotnetModule {
|
||||
owner = "EverestAPI";
|
||||
repo = "Olympus";
|
||||
fetchSubmodules = true; # Required. See upstream's README.
|
||||
hash = "sha256-rzoBREMGBOh7SjzObavq5+quLlsiytV7Elp3c8Fu/k8=";
|
||||
hash = "sha256-38Rjii6+3DDvNcQQFuTAxY4Wh214QbE6q8yFLNUnAbc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ooniprobe-cli";
|
||||
version = "3.28.0";
|
||||
version = "3.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ooni";
|
||||
repo = "probe-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-94N5pOj73HERGqTt6o6MweW9W5bL2W7CBrUa7jQt7fM=";
|
||||
hash = "sha256-bh17+yMs7DMffoJstYbYnvwEAue34rPmKadFQQQxYxQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3cjohavZfK4hoOMPVLvzwp4ORQ00baqtFUhFyA7Z8OM=";
|
||||
vendorHash = "sha256-kbvdUqAz9k3AHtitoVr4q1kGMf2Jzfs6iSRUl1sp4UU=";
|
||||
|
||||
subPackages = [ "cmd/ooniprobe" ];
|
||||
|
||||
|
||||
@@ -13,8 +13,7 @@
|
||||
qemu,
|
||||
scribus,
|
||||
tigervnc,
|
||||
wlroots_0_17,
|
||||
wlroots_0_18,
|
||||
wlroots_0_19,
|
||||
xwayland,
|
||||
|
||||
gitUpdater,
|
||||
@@ -78,8 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qemu
|
||||
scribus
|
||||
tigervnc
|
||||
wlroots_0_17
|
||||
wlroots_0_18
|
||||
wlroots_0_19
|
||||
xwayland
|
||||
;
|
||||
pkg-config = testers.hasPkgConfigModules {
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ponyc";
|
||||
version = "0.60.5";
|
||||
version = "0.60.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = "ponyc";
|
||||
tag = version;
|
||||
hash = "sha256-ssKpRhMNpA4Sm8qVIZTyT4aDMn6Jz2PpOABtplARhZ4=";
|
||||
hash = "sha256-mBtSoFOX0dHtb0ojdT+uB1Lmu7Cak/3A8808dv3o1ik=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rumdl";
|
||||
version = "0.1.15";
|
||||
version = "0.1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvben";
|
||||
repo = "rumdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jIkEKFEdNbSwgYTqNvz6XM8E+cIdtsCCYCxvbCu03sc=";
|
||||
hash = "sha256-0SwXf7V1RSMgwgjaXnbE0KG5TVA7wjBi4j9tjaKYBEM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eP6IaebCj3OYunlPTJZmB4wUy5Mzh7VQNCmWz/n4MR8=";
|
||||
cargoHash = "sha256-VWgJbZbGBxAfkRiX/k13l2TttxtBx9OOJ1CypgXJgCE=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=rumdl"
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texworks";
|
||||
version = "0.6.10";
|
||||
version = "0.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TeXworks";
|
||||
repo = "texworks";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
sha256 = "sha256-tC3ADD35yrmwBJQ8JaXdr8trVf6WLt1r2/euzt0mvN8=";
|
||||
sha256 = "sha256-JygsOTryLXpFodwPGbPH3Baawl8k1Qkx2StZ1naInCc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,16 +19,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vaultwarden";
|
||||
version = "1.35.2";
|
||||
version = "1.35.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "vaultwarden";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3/Wpn84QHTQ8yoj4lR2J8iUj39elg9CKP4lkQjDVVT4=";
|
||||
hash = "sha256-Q/kMdrKMBB5Tbfi4Cy9ucI6iH8eOr+fzi876+ef2kV4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XqZOy84L6Spzd1NZf4CzZsdhDhrYNoQGToad4giFJR8=";
|
||||
cargoHash = "sha256-3wS8LoFMYhd8uwjDyNfWLMQEK3USotTzTHEJNimG3pM=";
|
||||
|
||||
# used for "Server Installed" version in admin panel
|
||||
env.VW_VERSION = finalAttrs.version;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vaultwarden-webvault";
|
||||
version = "2025.12.1.1";
|
||||
version = "2026.1.0+0";
|
||||
|
||||
# doesn't build with newer versions
|
||||
nodejs = nodejs_22;
|
||||
@@ -20,10 +20,10 @@ buildNpmPackage rec {
|
||||
owner = "vaultwarden";
|
||||
repo = "vw_web_builds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/T0UPxGITxmTxl07NYufDnVat6EIC28oD+PEmmGaXXI=";
|
||||
hash = "sha256-u0axJFwXZr3iPcDskD6oDfuh3uWjOawoWEYFfSwiN5g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-tM+jAhM+/QB+o6wNJJMSZ/HTcWnPR0DyYItdhlVVyc4=";
|
||||
npmDepsHash = "sha256-wzndpxxxgc7DfVcriAC7C8OxvhMBcXW6VcY33k0CEdc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
gst_all_1,
|
||||
gtk3,
|
||||
libappindicator,
|
||||
libfakeXinerama,
|
||||
libfakexinerama,
|
||||
librsvg,
|
||||
libvpx,
|
||||
libwebp,
|
||||
@@ -250,7 +250,7 @@ effectiveBuildPythonApplication rec {
|
||||
--set XPRA_COMMAND "$out/bin/xpra"
|
||||
--set XPRA_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb"
|
||||
--set XORG_CONFIG_PREFIX ""
|
||||
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
|
||||
--prefix LD_LIBRARY_PATH : ${libfakexinerama}/lib
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
getopt
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "yubikey-manager";
|
||||
version = "5.8.0";
|
||||
version = "5.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yubico";
|
||||
repo = "yubikey-manager";
|
||||
tag = version;
|
||||
hash = "sha256-Z3krdKP6hhhIxN7nl/k5r30jFVC0kZK9Z6Aqllp/KrA=";
|
||||
hash = "sha256-8SWuhuFeMRIskJRxeb67gA3gdhSDf/vnrYHra6t71Bc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -33,11 +33,12 @@ python3Packages.buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
cryptography
|
||||
pyscard
|
||||
fido2
|
||||
click
|
||||
cryptography
|
||||
fido2
|
||||
keyring
|
||||
pyscard
|
||||
python-pskc
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -50,8 +51,9 @@ python3Packages.buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
astroid
|
||||
makefun
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "immutabledict";
|
||||
version = "4.2.2";
|
||||
version = "4.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corenting";
|
||||
repo = "immutabledict";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ymzOSPVe0Z82FAgVIagY9lyNiMiubXjSBnXIEwzwC20=";
|
||||
hash = "sha256-Ap0Z0RCL+sjPTySa/At+SDRdCmSkooSekybugZdvUX0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -1,36 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
|
||||
# build system
|
||||
setuptools,
|
||||
|
||||
# test dependencies
|
||||
pytestCheckHook,
|
||||
packaging,
|
||||
}:
|
||||
let
|
||||
pname = "lazy-imports";
|
||||
version = "0.3.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telekom";
|
||||
owner = "bachorp";
|
||||
repo = "lazy-imports";
|
||||
tag = version;
|
||||
hash = "sha256-i+VPlBoxNqk56U4oiEgS1Ayhi1t2O8PtLZ/bzEurUY8=";
|
||||
hash = "sha256-KtKqR/e0ldpsrz3dyY1ehF4cM5k7jDziiB+8uV0HEwc=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version src;
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "lazy_imports" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
packaging
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python tool to support lazy imports";
|
||||
homepage = "https://github.com/telekom/lazy-imports";
|
||||
changelog = "https://github.com/telekom/lazy-imports/releases/tag/${version}";
|
||||
description = "Utility package to create lazy modules, deferring associated imports until attribute access";
|
||||
homepage = "https://github.com/bachorp/lazy-imports";
|
||||
changelog = "https://github.com/bachorp/lazy-imports/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
};
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyring-buffer";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "pyring-buffer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YBkBuptoOc3d746WkqoCHOr0LuG+QlORt/z1oqSf+AA=";
|
||||
hash = "sha256-woFFPb+NwYTsQ9YRETHmEnt9KxvNql8NDOBg5Rp0UGE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysrdaligateway";
|
||||
version = "0.19.3";
|
||||
version = "0.20.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maginawin";
|
||||
repo = "PySrDaliGateway";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tVnTSpEAZC7DzAiKRQWKhtrp5epnwPZQr4XimG525Rw=";
|
||||
hash = "sha256-JZ4+HJ53p28iqr62E/SCW7/ohv4/skyvRaIea24+mzM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
cryptography,
|
||||
defusedxml,
|
||||
lxml,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
setuptools,
|
||||
signxml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-pskc";
|
||||
version = "1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arthurdejong";
|
||||
repo = "python-pskc";
|
||||
tag = version;
|
||||
hash = "sha256-WBpS0EJA4arAn7O47ZHq3sBOd9D4tjYZKIi24xX5Hvs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cryptography
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
defuse = [ defusedxml ];
|
||||
lxml = [ lxml ];
|
||||
signature = [ signxml ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
|
||||
preCheck = ''
|
||||
export TZ=Europe/Amsterdam
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pskc" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/arthurdejong/python-pskc/releases/tag/${version}";
|
||||
description = "Python module for handling PSKC files";
|
||||
homepage = "https://github.com/arthurdejong/python-pskc";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
buildHomeAssistantComponent,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "Hypfer";
|
||||
domain = "valetudo";
|
||||
version = "2025.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Hypfer";
|
||||
repo = "hass-valetudo";
|
||||
tag = "${version}";
|
||||
hash = "sha256-dHrN9Bbmm3J47MRmwExZH6Mi4RvRBZdQ4R1xeCewcSc=";
|
||||
};
|
||||
meta = {
|
||||
description = "Valetudo for Home Assistant";
|
||||
homepage = "https://github.com/Hypfer/hass-valetudo";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ benediktbroich ];
|
||||
};
|
||||
}
|
||||
@@ -263,6 +263,8 @@ mapAliases {
|
||||
|
||||
_0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
|
||||
_1password = throw "'_1password' has been renamed to/replaced by '_1password-cli'"; # Converted to throw 2025-10-27
|
||||
_86Box = warnAlias "'_86Box' has been renamed to '_86box'" _86box; # Added 2026-02-08
|
||||
_86Box-with-roms = warnAlias "'_86Box-with-roms' has been renamed to '_86box-with-roms'" _86box-with-roms; # Added 2026-02-08
|
||||
_2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
|
||||
_2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
|
||||
_2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
|
||||
@@ -990,6 +992,7 @@ mapAliases {
|
||||
libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
|
||||
libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
|
||||
libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
|
||||
libfakeXinerama = warnAlias "'libfakeXinerama' has been renamed to 'libfakexinerama'" libfakexinerama; # Added 2026-02-08
|
||||
libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
|
||||
libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
|
||||
libFS = libfs; # Added 2026-02-04
|
||||
|
||||
@@ -1183,7 +1183,7 @@ with pkgs;
|
||||
|
||||
### APPLICATIONS/EMULATORS
|
||||
|
||||
_86Box-with-roms = _86Box.override {
|
||||
_86box-with-roms = _86box.override {
|
||||
unfreeEnableRoms = true;
|
||||
unfreeEnableDiscord = true;
|
||||
};
|
||||
|
||||
@@ -15649,6 +15649,8 @@ self: super: with self; {
|
||||
|
||||
python-prctl = callPackage ../development/python-modules/python-prctl { };
|
||||
|
||||
python-pskc = callPackage ../development/python-modules/python-pskc { };
|
||||
|
||||
python-ptrace = callPackage ../development/python-modules/python-ptrace { };
|
||||
|
||||
python-rabbitair = callPackage ../development/python-modules/python-rabbitair { };
|
||||
|
||||
Reference in New Issue
Block a user