Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -27942,6 +27942,12 @@
|
||||
githubId = 131159000;
|
||||
name = "Nitin Passa";
|
||||
};
|
||||
twoneis = {
|
||||
email = "nix@chpu.eu";
|
||||
github = "twoneis";
|
||||
githubId = 48321566;
|
||||
name = "Mira Chacku Purakal";
|
||||
};
|
||||
twz123 = {
|
||||
name = "Tom Wieczorek";
|
||||
email = "tom@bibbu.net";
|
||||
|
||||
@@ -64,6 +64,7 @@ let
|
||||
eval = nixos-lib.evalTest {
|
||||
# Avoid evaluating a NixOS config prototype.
|
||||
config.node.type = types.deferredModule;
|
||||
config.hostPkgs = pkgs;
|
||||
options._module.args = mkOption { internal = true; };
|
||||
};
|
||||
in
|
||||
|
||||
@@ -211,6 +211,9 @@
|
||||
"test-opt-nodeDefaults": [
|
||||
"index.html#test-opt-nodeDefaults"
|
||||
],
|
||||
"test-opt-pythonTestDriverPackage": [
|
||||
"index.html#test-opt-pythonTestDriverPackage"
|
||||
],
|
||||
"test-opt-rawTestDerivationArg": [
|
||||
"index.html#test-opt-rawTestDerivationArg"
|
||||
],
|
||||
|
||||
@@ -9,15 +9,10 @@ let
|
||||
|
||||
# Reifies and correctly wraps the python test driver for
|
||||
# the respective qemu version and with or without ocr support
|
||||
testDriver = hostPkgs.python3Packages.callPackage ../test-driver {
|
||||
testDriver = config.pythonTestDriverPackage.override {
|
||||
inherit (config) enableOCR extraPythonPackages;
|
||||
qemu_pkg = config.qemu.package;
|
||||
imagemagick_light = hostPkgs.imagemagick_light.override { inherit (hostPkgs) libtiff; };
|
||||
tesseract4 = hostPkgs.tesseract4.override { enableLanguages = [ "eng" ]; };
|
||||
|
||||
enableNspawn = config.containers != { };
|
||||
# We want `pkgs.systemd`, *not* `python3Packages.system`.
|
||||
systemd = hostPkgs.systemd;
|
||||
};
|
||||
|
||||
vlans = map (
|
||||
@@ -135,6 +130,12 @@ let
|
||||
in
|
||||
{
|
||||
options = {
|
||||
pythonTestDriverPackage = mkOption {
|
||||
description = "Package containing the python NixOS test driver implemetnation";
|
||||
type = types.package;
|
||||
default = hostPkgs.nixos-test-driver;
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
driver = mkOption {
|
||||
description = "Package containing a script that runs the test.";
|
||||
|
||||
@@ -35,6 +35,8 @@
|
||||
users.manageLingering = lib.mkDefault false;
|
||||
# Relies on the gzip command which depends on bash
|
||||
services.logrotate.enable = lib.mkDefault false;
|
||||
# The resize helper pulls in bash
|
||||
services.lvm.resizeHelper.enable = false;
|
||||
|
||||
# Check that the system does not contain a Nix store path that contains the
|
||||
# string "bash".
|
||||
|
||||
@@ -80,14 +80,6 @@ in
|
||||
|
||||
openFirewall = mkEnableOption "the default ports in the firewall for the WiVRn server";
|
||||
|
||||
defaultRuntime = mkEnableOption ''
|
||||
WiVRn as the default OpenXR runtime on the system.
|
||||
The config can be found at `/etc/xdg/openxr/1/active_runtime.json`.
|
||||
|
||||
Note that applications can bypass this option by setting an active
|
||||
runtime in a writable XDG_CONFIG_DIRS location like `~/.config`
|
||||
'';
|
||||
|
||||
autoStart = mkEnableOption "starting the service by default";
|
||||
|
||||
highPriority = mkEnableOption "high priority capability for asynchronous reprojection";
|
||||
@@ -106,6 +98,10 @@ in
|
||||
};
|
||||
|
||||
steam = {
|
||||
enable = lib.mkEnableOption "Steam support" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
importOXRRuntimes = mkEnableOption ''
|
||||
Sets `PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES` system-wide to allow Steam to automatically discover the WiVRn server.
|
||||
|
||||
@@ -211,12 +207,12 @@ in
|
||||
}
|
||||
);
|
||||
# Needs Steam in the PATH to allow launching games from the headset
|
||||
path = [ cfg.steam.package ];
|
||||
path = mkIf cfg.steam.enable [ cfg.steam.package ];
|
||||
wantedBy = mkIf cfg.autoStart [ "default.target" ];
|
||||
restartTriggers = [
|
||||
cfg.package
|
||||
cfg.steam.package
|
||||
];
|
||||
]
|
||||
++ lib.optionals cfg.steam.enable [ cfg.steam.package ];
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -247,9 +243,6 @@ in
|
||||
PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = "1";
|
||||
};
|
||||
pathsToLink = [ "/share/openxr" ];
|
||||
etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
|
||||
source = "${cfg.package}/share/openxr/1/openxr_wivrn.json";
|
||||
};
|
||||
};
|
||||
};
|
||||
meta.maintainers = with maintainers; [ passivelemon ];
|
||||
|
||||
@@ -22,6 +22,10 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
resizeHelper.enable = mkEnableOption "lvresize_fs_helper" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.lvm2;
|
||||
@@ -60,7 +64,7 @@ in
|
||||
|
||||
services.udev.packages = [ cfg.package.out ];
|
||||
environment.etc."lvm/lvm.conf".text =
|
||||
"global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";
|
||||
mkIf cfg.resizeHelper.enable "global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";
|
||||
})
|
||||
(mkIf config.boot.initrd.services.lvm.enable {
|
||||
# We need lvm2 for the device-mapper rules
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
vimUtils,
|
||||
}:
|
||||
let
|
||||
version = "0.4.3-nightly.dd56a3a-unstable-2026-03-20";
|
||||
version = "0.4.3-nightly.0a18692-unstable-2026-03-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
rev = "dd56a3a8a8a5a85522badaf6485f28c8f7a7c840";
|
||||
hash = "sha256-F9fnjCwBEJfuK0TuRr7XjMcacMep5K0SuzGft2IFXtQ=";
|
||||
rev = "eb577ea4f39f7b9296ff8c6b4bf2b2899d017ded";
|
||||
hash = "sha256-m/KykUyhE3xUVmmE84xUaqW0T4fbuRp6iAVBbCioiCI=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-Xhn+EpVF7XQOgHQpmoHHrZ/swi2xgdEFYh8D6mYJMSc=";
|
||||
cargoHash = "sha256-hMwPyPc4V0pTxpn1U3ay31KttFeoU54h6Z4HGv8nFYQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
+2
-2
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
pname = "rainbow-delimiters.nvim";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "HiPhish";
|
||||
repo = "rainbow-delimiters.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-E0ZPi9Vzc3TwhNHsGyABY+sgn/vO6Oyun6eRd7/RFgU=";
|
||||
hash = "sha256-zQgnNN8QvboOHWaMcLw1uRt/9AxV1asvTnpCcJ/qVS4=";
|
||||
};
|
||||
|
||||
nvimSkipModules = [
|
||||
|
||||
@@ -24,13 +24,13 @@ let
|
||||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.33.0-beta.01";
|
||||
version = "2.33.1";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-jCz7m3X38SM4DwBDYu7J7rxzLECKftETrXvZwzWjfXA=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-kM4RD1hqa1JOcsDmPcGeojL5wu359UZkJnVbwlpEgFM=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-CWYKsd3TpTUaORgXrM1CVjBMJPPhMvSAb7kJARy+oVo=" "zip";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-rBXJ5BT/1TFySOgC1wpgOz4tcOF9flHplfonYGOA9Ac=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-2Hh+ML+hewwZATrh01kPXoNBdYWN3dI2ZqfLBiH/gK8=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-ge+4thdTnymQYFQ2G9qwh9i3zsY13W1M5za1CXybUqI=" "zip";
|
||||
aarch64-darwin =
|
||||
fetch "apple_universal" "sha256-+rdXdnpX0ucoecv/dNRA5L/GOe0bVgEPKl7pn0qNxm8="
|
||||
fetch "apple_universal" "sha256-+3NI4BIazI21m6teLBvKalCTN8cx6RhFqwXnkNK6tjQ="
|
||||
"pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
flutter332,
|
||||
flutter341,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
libayatana-appindicator,
|
||||
@@ -12,18 +12,16 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
flutter341.buildFlutterApplication (finalAttrs: {
|
||||
pname = "alisthelper";
|
||||
version = "0.2.0-unstable-2026-03-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xmarmalade";
|
||||
repo = "alisthelper";
|
||||
rev = "84a4f025ce184eb9cd910b90397eef8edaa95127";
|
||||
hash = "sha256-Ju7AnUq59sk15YCvXhunr5r2/e2i26lWF3+pVY3oWzo=";
|
||||
rev = "6d7e1acb86a5c67bcf86d99bc6034f130b1d04c2";
|
||||
hash = "sha256-EIE90R4lCnCLAi6D0YFdntB/tIhqKnoVhbqzk/4bj/k=";
|
||||
};
|
||||
in
|
||||
flutter332.buildFlutterApplication {
|
||||
pname = "alisthelper";
|
||||
version = "0.2.0-unstable-2025-08-05";
|
||||
inherit src;
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -35,7 +33,8 @@ flutter332.buildFlutterApplication {
|
||||
buildInputs = [ libayatana-appindicator ];
|
||||
|
||||
preBuild = ''
|
||||
packageRun build_runner build
|
||||
packageRun slang
|
||||
packageRun build_runner build --delete-conflicting-outputs
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
@@ -56,7 +55,7 @@ flutter332.buildFlutterApplication {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
inherit src;
|
||||
inherit (finalAttrs) src;
|
||||
nativeBuildInputs = [ yq-go ];
|
||||
}
|
||||
''
|
||||
@@ -81,4 +80,4 @@ flutter332.buildFlutterApplication {
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,13 +9,13 @@
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "amqpcat";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudamqp";
|
||||
repo = "amqpcat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fdDdMjeAlJ0H05LNVdRxwq6RK41d6rXLFQMw6RSlXZM=";
|
||||
hash = "sha256-wUsDqatZVcfvtTlK4eOYvFFCyyO8nkrBksvN6Od4DG0=";
|
||||
};
|
||||
|
||||
format = "shards";
|
||||
@@ -23,6 +23,12 @@ crystal.buildCrystalPackage rec {
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace "./src/version.cr" --replace-fail \
|
||||
'VERSION = {{ `git describe 2>/dev/null || shards version`.stringify.gsub(/(^v|\n)/, "") }}' \
|
||||
'VERSION = "${version}"'
|
||||
'';
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
amq-protocol = {
|
||||
"amq-protocol" = {
|
||||
url = "https://github.com/cloudamqp/amq-protocol.cr.git";
|
||||
tag = "v1.1.14";
|
||||
sha256 = "1pr5h3lxfhjmarfqpvfldn8d6425g3i56k4p4szk2jkffa0z38nz";
|
||||
rev = "v1.1.15";
|
||||
sha256 = "0zjwhgr1rz1kwrh8qpawqspv8qnyk3khqprhgr4h6gqgckqxkkli";
|
||||
};
|
||||
amqp-client = {
|
||||
"amqp-client" = {
|
||||
url = "https://github.com/cloudamqp/amqp-client.cr.git";
|
||||
tag = "v1.2.3";
|
||||
sha256 = "1pbiq5srni87hd8q2x3vs4s2hpajlzzlwgalgnmb35dcyih1ff9k";
|
||||
rev = "v1.3.1";
|
||||
sha256 = "00gkfsa20ilbawbhg0c6rxgaf2s2lz4paikwizn182fm7vx67b16";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
cargo,
|
||||
desktop-file-utils,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
libadwaita,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
rustc,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "app-icon-preview";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
group = "World";
|
||||
owner = "design";
|
||||
repo = "app-icon-preview";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sfQFmQ27JUu92ArCi1dTnD3sWoUl/0tJguMvR1BoK/Q=";
|
||||
forceFetchGit = true;
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-WGzXjIgZBwuBbSWK+EWDMW2kfqeoYHMsP4TXglR2Sc4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libxml2
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Tool for designing applications icons";
|
||||
homepage = "https://gitlab.gnome.org/World/design/app-icon-preview";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "app-icon-preview";
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
Generated
+56
-56
@@ -46,8 +46,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Cpp2IL.Core",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-qS58t3OD2l/a1PJmfmKnHd9JXQEciMIgCnoVW70p5Dk="
|
||||
"version": "1.0.1",
|
||||
"hash": "sha256-K9+jeW0joMJGP+bC5wt5ru+gAvIPwAEGauFQ6r/MThE="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Gee.External.Capstone",
|
||||
@@ -71,13 +71,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.IO.Endian",
|
||||
"version": "2.0.2",
|
||||
"hash": "sha256-/oxfkQpCaERReRha+2fkPQaW9JNAyJdiujp1326Pcmw="
|
||||
"version": "2.1.0",
|
||||
"hash": "sha256-8wpIi9wYBkyeOSWb+HnLemqk9/Y9M3Bh+xX6B06WxMU="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.LibCpp2IL",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-yZxcQSP5252fNeRUVUVfILXTxU54QrPb8G8GRKKS3bQ="
|
||||
"version": "1.0.1",
|
||||
"hash": "sha256-79mq6iK6fs8fx3CzYWaAtS+2LLqozCRSsLKb6L61Wws="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Mining.PredefinedAssets",
|
||||
@@ -86,8 +86,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.NativeDialogs",
|
||||
"version": "1.1.1",
|
||||
"hash": "sha256-6ShudCx1WwuzmbElus3NxyxuNY5e8NthujoKkkgLFyE="
|
||||
"version": "1.1.2",
|
||||
"hash": "sha256-FiLz2N5gjpNi5vIiuO/FtL2okjkTdBNOSAvrZ5ZcAWY="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Primitives",
|
||||
@@ -121,8 +121,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.SourceGenerated",
|
||||
"version": "1.3.10",
|
||||
"hash": "sha256-CU8mSe7+vEmQ7QjRv0UDE9REOWniFz38BAtiKAtGsvo="
|
||||
"version": "1.3.11.1",
|
||||
"hash": "sha256-ZIVM61VLFQT4q8jnnZlmNcsLAPb0QsVN4V4LEGv+FKA="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Text.Html",
|
||||
@@ -131,13 +131,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Text.SourceGeneration",
|
||||
"version": "1.2.2",
|
||||
"hash": "sha256-CsJuv8agq57DsjChX5CC9gyhnr0hwNpCdeCxxu62w48="
|
||||
"version": "1.2.3",
|
||||
"hash": "sha256-Og4v0ebFfqYKVK2xzlEdzUeHDcL6HgkOAVxB+RZpcmo="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.TextureDecoder",
|
||||
"version": "2.6.0",
|
||||
"hash": "sha256-qoecWzCXQq82wUTaw6A65pJYId/GxxkiKGZZ9AlbgWo="
|
||||
"version": "2.6.1",
|
||||
"hash": "sha256-m7X0ozt3x8I3ivS8dHRY24IdjF16KaYPcSnse8Ev9Cs="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Tpk",
|
||||
@@ -146,14 +146,14 @@
|
||||
},
|
||||
{
|
||||
"pname": "Disarm",
|
||||
"version": "2022.1.0-master.57",
|
||||
"hash": "sha256-KtLpcS+n+HVkHc/CKBoyx+PWKpxkkVvtsqf002KSbPI=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/disarm/2022.1.0-master.57/disarm.2022.1.0-master.57.nupkg"
|
||||
"version": "2022.1.0-master.99",
|
||||
"hash": "sha256-g8JqGyig6M9TVM6OgK+2QVQBfdO7jTyCS3rEUxciuEw=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/disarm/2022.1.0-master.99/disarm.2022.1.0-master.99.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Fmod5Sharp",
|
||||
"version": "3.0.1",
|
||||
"hash": "sha256-Od9D7s20ONwuD1V6ZUCKkCyLR57pX8GRDuDs5oZzc+I="
|
||||
"version": "3.1.0",
|
||||
"hash": "sha256-C4tAa3rRqh/0bUjSoTiMT2HWhuMm2EWMvGTrRPzEDGQ="
|
||||
},
|
||||
{
|
||||
"pname": "Iced",
|
||||
@@ -162,8 +162,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "IndexRange",
|
||||
"version": "1.0.2",
|
||||
"hash": "sha256-bsoOY0HLG+nsjdeA3XiTOq0NSvXIz/xasFdSMe6svWQ="
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-WUBDXlrTDb2KbhoFFGSab6tqr+SL6wv5yamZ35PXD/k="
|
||||
},
|
||||
{
|
||||
"pname": "K4os.Compression.LZ4",
|
||||
@@ -172,28 +172,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.OpenApi",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-FU57fPXL4NUDRqi+rLresi4yKttv1KcAnLuEdPCyTos="
|
||||
"version": "10.0.5",
|
||||
"hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-3lrCf7HOpbkZkQx4/JSpKi8Rl+hp9NAaRi9dp6xqMaQ="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-+wTcmczUD1qSnnWZ1miijr62/glcRbNWRpEZh/OBU2g="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.Memory",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-ECgyZ53XqJoRcZexQpctEq1nHFXuW4YqFSx7Elsae7U="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "4.14.0",
|
||||
"hash": "sha256-zmTSI77qeBKTmb0m79mbVaW3/94t7AWPO1A2Tchowng="
|
||||
"version": "5.3.0",
|
||||
"hash": "sha256-eUjU7MDekcbDQxUButcWK7siHx6HmrgdDMLnpGYRVLM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-g4ALvBSNyHEmSb1l5TFtWW7zEkiRmhqLx4XWZu9sr2U="
|
||||
"version": "5.3.0",
|
||||
"hash": "sha256-O5RVbqAWXL2FcCNtn+dPAVJ/5aiaxc8nQWojJSsx61w="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-ctBCkQGFpH/xT5rRE3xibu9YxPD108RuC4a4Z25koG8="
|
||||
"version": "5.3.0",
|
||||
"hash": "sha256-A3jxlZEyfgEn9unhoQqbOsA0wd/mA8aak6dRlu5mHIU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.ApiDescription.Server",
|
||||
@@ -212,8 +217,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
"version": "2.3.0",
|
||||
"hash": "sha256-nfg+g85wy5q1dnRnCYXrINogyspNNTKr9Jd6bj7tXXM="
|
||||
"version": "2.4.1",
|
||||
"hash": "sha256-DXdbXq5Gpg3MJVBM0C8uF6mcLczVJAUFp6LAdFojgPs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
@@ -225,11 +230,6 @@
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-rD5ubdSgpufNjNyCerO0N5Gg2brUMhjEOL5qaNwFhBM="
|
||||
},
|
||||
{
|
||||
"pname": "NAudio.Core",
|
||||
"version": "2.1.0",
|
||||
"hash": "sha256-cVfdq9B7wwojGiTOOrcnweQyI9q7U9+uDirqjisWrd8="
|
||||
},
|
||||
{
|
||||
"pname": "NAudio.Core",
|
||||
"version": "2.2.1",
|
||||
@@ -252,8 +252,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "OggVorbisEncoder",
|
||||
"version": "1.2.0",
|
||||
"hash": "sha256-5UhHf3JJUTG968Bst/cLR30qMTe1AntntDIv8w1IkFY="
|
||||
"version": "1.2.2",
|
||||
"hash": "sha256-bT1OTDkotU1eN/AvNFzsP7jRm4y3GNGl7FjXChVhNB8="
|
||||
},
|
||||
{
|
||||
"pname": "Ookii.CommandLine",
|
||||
@@ -282,8 +282,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "SharpCompress",
|
||||
"version": "0.44.4",
|
||||
"hash": "sha256-woh8cQz+Qc6MiYhCSXmMERxzhqYDWoqo7qDfRh3Od/o="
|
||||
"version": "0.47.1",
|
||||
"hash": "sha256-rRzSU1SCGOj0E0or5odH7yEExH0IasSSx9RALH7QFYw="
|
||||
},
|
||||
{
|
||||
"pname": "SourceGenerator.Foundations",
|
||||
@@ -297,23 +297,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore",
|
||||
"version": "10.1.0",
|
||||
"hash": "sha256-28kzcCMc9Ypv/g0z8mexB2bKMS7vRw3ZU61p3QKMnlk="
|
||||
"version": "10.1.5",
|
||||
"hash": "sha256-Xyh9X/naQzXrQ/S6iij/NTCM+jRIWBJzT7qAiSIcHTI="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.Swagger",
|
||||
"version": "10.1.0",
|
||||
"hash": "sha256-UTNuin8H71zlm1RGqyV2Spk/K+2UeAt6nM3QPyXJSk4="
|
||||
"version": "10.1.5",
|
||||
"hash": "sha256-XXz1DIP7wD3tRJXOsL9qhzOaEAP2kyKIbwZFJdLhI2A="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.SwaggerGen",
|
||||
"version": "10.1.0",
|
||||
"hash": "sha256-lDWEOYrgJWskM45+XvDmaxSZRU/ZFfGEr2bTh7eZsqE="
|
||||
"version": "10.1.5",
|
||||
"hash": "sha256-4NAg4PW934OglxtKgl5x0kvzRlNJThGDpyMX+8NFE+E="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.SwaggerUI",
|
||||
"version": "10.1.0",
|
||||
"hash": "sha256-qxIhoxk9dfzRo4lX5I5J5WWFagVYqgjbjY4Q/yJr6dA="
|
||||
"version": "10.1.5",
|
||||
"hash": "sha256-/XIglebzW9xLEzX19K+lL9/rQDhrBGbfhPP4ZNPcIx0="
|
||||
},
|
||||
{
|
||||
"pname": "System.Buffers",
|
||||
@@ -337,8 +337,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-Guh0w9aMQ5wNSI9ecuoH4tGOX4VFnlNgepvBTPGFgzc="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-+LsHlaUFMFVb60U7GFcvD1l7IpEcjdm1+Iw2g+qrUik="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
@@ -402,13 +402,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-DWbSR+d8DJtkMclrKKbS5Ghlvi6YYrrxgHGfyDJx50o="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-TuOSPfi9dfFnHvH5++zIi30JpRERp35HFpm2R0NWUAk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-Gf6L3mxsdvmN8gDyoUhfZDSFWKpmn9UjJ2v/p1CDFmk="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-E1gPHMAuk2tR4cyScCfsSlDDerhlLAQCUZZMiByIk18="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks.Extensions",
|
||||
|
||||
@@ -6,17 +6,18 @@
|
||||
fetchFromGitHub,
|
||||
dbus,
|
||||
dotnetCorePackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "assetripper";
|
||||
version = "1.3.10";
|
||||
version = "1.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssetRipper";
|
||||
repo = "AssetRipper";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sqlZsUTeLyHHESNtC07F2FjgLXnuqgoPYRcgE57sq5k=";
|
||||
hash = "sha256-pBza6yuMdExKqzhds8Ib5SzRzXRdD5TdEN/Yz7V+zGA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -47,8 +48,8 @@ buildDotnetModule (finalAttrs: {
|
||||
fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
runHook preFixup
|
||||
|
||||
autoPatchelf $out/lib/${finalAttrs.pname}/libnfd.so
|
||||
autoPatchelf $out/lib/${finalAttrs.pname}/libTexture2DDecoderNative.so
|
||||
autoPatchelf $out/lib/assetripper/libnfd.so
|
||||
autoPatchelf $out/lib/assetripper/libTexture2DDecoderNative.so
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
@@ -67,6 +68,8 @@ buildDotnetModule (finalAttrs: {
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
dotnet-runtime = finalAttrs.dotnet-sdk.aspnetcore;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Tool for extracting assets from Unity serialized files and asset bundles";
|
||||
homepage = "https://github.com/AssetRipper/AssetRipper";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "chirpstack-concentratord";
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-concentratord";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7wTXotxf9tFSyIrBqn6EVpQJpz5XAPNxJMeaYN7k/so=";
|
||||
hash = "sha256-945ZJZ/OLoR/3dAC/PZHRRziyuLDZ+xfitF8jpvZ420=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QYmAFJEHLcgFuq34r9XLEwlpbzjAr4CpfluDW5MbfT0=";
|
||||
cargoHash = "sha256-cwm8ZSfml9B/OO5QzH1eUhoF/3DPUEEV0T/YL427X80=";
|
||||
|
||||
buildInputs = [
|
||||
libloragw-2g4
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fasmg";
|
||||
version = "l45p";
|
||||
version = "l4gs";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip";
|
||||
sha256 = "sha256-0/P20DiRZbqZHoxWiBPs6wXqpbvRroisyF0dCdmd+j8=";
|
||||
sha256 = "sha256-lx46RKXVu6z3+luIizSfGf697wJvS+ccwZaOgGwGXr4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -24,18 +24,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "flare";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vkN7XkViJI+GndhKZ403JGbCJ+Z+wfa09avzMQ3ducQ=";
|
||||
hash = "sha256-DVbN+VUk7K2CBwQ4rOGIJj+KYOlB9TeDUGE+s5docok=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-nfUGyPjR6Q35YXs+v1WWkJ58mNFj8o+Vj+evJ1d5uvg=";
|
||||
hash = "sha256-/3xcouWXUxoVFHV05eD4IEuQbPAn+iFIwB8tP+jJm+4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
let
|
||||
pname = "flclash";
|
||||
version = "0.8.91";
|
||||
version = "0.8.92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chen08209";
|
||||
@@ -24,7 +24,7 @@ let
|
||||
export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
|
||||
export GIT_CONFIG_VALUE_0=git@github.com:
|
||||
'';
|
||||
hash = "sha256-jQ0phrTWlZZj5sVvnHAuC5h1nbJCcr/0wKw61mZMtes=";
|
||||
hash = "sha256-bPz2QNwhlCZBmjU0ZpRTwNk0TKVTIHH4E6ZJ5+rtaTk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -41,7 +41,7 @@ let
|
||||
|
||||
modRoot = "core";
|
||||
|
||||
vendorHash = "sha256-/natNGWXF6be7kyLYF2fHg0o0C1zkBAg1k8BAH5Dl9E=";
|
||||
vendorHash = "sha256-/p/Z5vIstuerR5jA0vXXLURSoPqS7IDEIXCa/SFCrLc=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -220,6 +220,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"charcode": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "charcode",
|
||||
"sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"checked_yaml": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -460,6 +470,36 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"drift": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "drift",
|
||||
"sha256": "83290a32ae006a7535c5ecf300722cb77177250d9df4ee2becc5fa8a36095114",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.29.0"
|
||||
},
|
||||
"drift_dev": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "drift_dev",
|
||||
"sha256": "6019f827544e77524ffd5134ae0cb75dfd92ef5ef3e269872af92840c929cd43",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.29.0"
|
||||
},
|
||||
"drift_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "drift_flutter",
|
||||
"sha256": "b7534bf320aac5213259aac120670ba67b63a1fd010505babc436ff86083818f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.7"
|
||||
},
|
||||
"dynamic_color": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -665,6 +705,16 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"fractional_indexing": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "fractional_indexing",
|
||||
"sha256": "d883a3c0cfd21cb66889e26c7db4366f1097c20dd7615b24269a8a17d76320f2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"freezed": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
@@ -939,11 +989,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "js",
|
||||
"sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
|
||||
"sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.2"
|
||||
"version": "0.6.7"
|
||||
},
|
||||
"json_annotation": {
|
||||
"dependency": "direct main",
|
||||
@@ -1324,6 +1374,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.0.3"
|
||||
},
|
||||
"recase": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "recase",
|
||||
"sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"riverpod": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1660,6 +1720,36 @@
|
||||
"source": "hosted",
|
||||
"version": "2.4.0"
|
||||
},
|
||||
"sqlite3": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqlite3",
|
||||
"sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.9.4"
|
||||
},
|
||||
"sqlite3_flutter_libs": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqlite3_flutter_libs",
|
||||
"sha256": "1e800ebe7f85a80a66adacaa6febe4d5f4d8b75f244e9838a27cb2ffc7aec08d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.41"
|
||||
},
|
||||
"sqlparser": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqlparser",
|
||||
"sha256": "162435ede92bcc793ea939fdc0452eef0a73d11f8ed053b58a89792fba749da5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.42.1"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "functionalplus";
|
||||
version = "0.2.25";
|
||||
version = "0.2.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dobiasd";
|
||||
repo = "FunctionalPlus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LlWdzxfFkbfkb9wAmpb86Ah97pWlW3w7DdW6JPu1xdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcli";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herrhotzenplotz";
|
||||
repo = "gcli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2L6/ZYxRY2xrTxr/oD02xCRqdk7VWrPlFwr8wU8C2x8=";
|
||||
hash = "sha256-KTXAmwLTOGvFlJ52w6PplVlF72CC5JJheGlhJirh2+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-cover-treemap";
|
||||
version = "1.4.2";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolaydubina";
|
||||
repo = "go-cover-treemap";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MSkPot8uYcr8pxsIkJh2FThVK9xpzkN9Y69KeiQnQlA=";
|
||||
hash = "sha256-y5hy+2uqMjeACjmel16Uf0vgiMSVySdxpSDKOBuxVds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-k/k+EGkuBnZFHrcWxnzLG8efWgb2i35Agf/sWbgTc4g=";
|
||||
vendorHash = "sha256-JWeCwsPFbQWI60i60GFSQcy7MJ0nDraRb0xf1t4H8RY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
version = "3.6.7";
|
||||
version = "3.6.8";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gg86aV/7/VoLHGLO40kxng6tYOMpbmSCwV1BRlrW+qc=";
|
||||
hash = "sha256-KyTuVNpBsjsO/0jkhuDzdvrCWQGIf27KGFni8k4aqZ4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.9.0";
|
||||
version = "22.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
tag = "intel-gmmlib-${finalAttrs.version}";
|
||||
hash = "sha256-hgVdUTbPLEKVZpg+73kxpeMQ5gOjBHeRAJgTYds9lYQ=";
|
||||
hash = "sha256-1JF9zb5aqvUkiPVyDxrmhEC90NwRi/AGQEamEub3gS4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kanban";
|
||||
version = "0.2.0";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fulsomenko";
|
||||
repo = "kanban";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w1NoWgaUBny//3t1S5z/juPOYFomwJKtTq/M4qKoNv0=";
|
||||
hash = "sha256-MIj1wSCKYg7bLj9sPGU/5peZX0i3J5crUzjcuJeF6O8=";
|
||||
};
|
||||
|
||||
env.GIT_COMMIT_HASH = finalAttrs.src.rev;
|
||||
|
||||
cargoHash = "sha256-N+c2jnJ7a+Nh2UibkaOByh4tKDX52VovYIpeHTpawXo=";
|
||||
cargoHash = "sha256-vCBHnYUpyyZcatAVaBVslng9EBrRkk5BzePcPZ07vtc=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -25,26 +25,40 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "katawa-shoujo-re-engineered";
|
||||
desktopName = "Katawa Shoujo: Re-Engineered";
|
||||
type = "Application";
|
||||
icon = finalAttrs.meta.mainProgram;
|
||||
icon = "katawa-shoujo-re-engineered";
|
||||
categories = [ "Game" ];
|
||||
exec = finalAttrs.meta.mainProgram;
|
||||
exec = "katawa-shoujo-re-engineered";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
renpy
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
postPatch = ''
|
||||
substituteInPlace game/config.rpy --replace-fail 0.0.0-localbuild ${finalAttrs.version}
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
renpy . compile
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${lib.getExe' renpy "renpy"} $out/bin/${finalAttrs.meta.mainProgram} \
|
||||
--add-flags ${finalAttrs.src} --add-flags run
|
||||
install -D $src/web-icon.png $out/share/icons/hicolor/512x512/apps/${finalAttrs.meta.mainProgram}.png
|
||||
phome=$out/share/kataswa-shoujo-re-engineered
|
||||
mkdir -p $phome
|
||||
cp -r game $phome
|
||||
find $phome -type f -name "*.rpy" -delete
|
||||
makeWrapper ${lib.getExe renpy} $out/bin/katawa-shoujo-re-engineered \
|
||||
--add-flags $phome --add-flags run
|
||||
install -D $src/web-icon.png $out/share/icons/hicolor/512x512/apps/katawa-shoujo-re-engineered.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -64,6 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
quantenzitrone
|
||||
rapiteanu
|
||||
ulysseszhan
|
||||
];
|
||||
platforms = renpy.meta.platforms;
|
||||
};
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "librelane";
|
||||
version = "3.0.0rc1";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librelane";
|
||||
repo = "librelane";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oEMybXxnOyCbUEsJWtBMuV+6XSg9Y8wKrbR9pm/GI5U=";
|
||||
hash = "sha256-BZmoneeMpnnQ2wUb5sorLFsFZsLaKclhAtCIiMsW8Qc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -20,16 +20,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "magic-vlsi";
|
||||
version = "8.3.602";
|
||||
version = "8.3.628";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RTimothyEdwards";
|
||||
repo = "magic";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jNcuTdBHyVUEvdavIaB2LfMBKhHZkCxFOYyA2kBezqc=";
|
||||
hash = "sha256-Zs9M2UgN+tIty7/DwLKVLjrPZxfd0qpM90F9QjUI6wM=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-buffer-overflow-runstats.patch";
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
libcosmicAppHook,
|
||||
pkg-config,
|
||||
fontconfig,
|
||||
wayland,
|
||||
libxkbcommon,
|
||||
libglvnd,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -26,26 +24,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
libcosmicAppHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland
|
||||
fontconfig
|
||||
libxkbcommon
|
||||
libglvnd
|
||||
];
|
||||
|
||||
env.RUSTFLAGS = toString (
|
||||
map (a: "-C link-arg=${a}") [
|
||||
"-Wl,--push-state,--no-as-needed"
|
||||
"-lEGL"
|
||||
"-lwayland-client"
|
||||
"-lxkbcommon"
|
||||
"-Wl,--pop-state"
|
||||
]
|
||||
);
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,12 @@
|
||||
diff --git a/forge.config.ts b/forge.config.ts
|
||||
index 0b0b282..d732b68 100644
|
||||
--- a/forge.config.ts
|
||||
+++ b/forge.config.ts
|
||||
@@ -14,6 +14,7 @@ const config: ForgeConfig = {
|
||||
icon: path.resolve(__dirname, "res/logo"),
|
||||
executableName: "MusicFree",
|
||||
extraResource: [path.resolve(__dirname, "res")],
|
||||
+ electronZipDir: path.resolve(__dirname, ".electron-packager/electron-zips"),
|
||||
protocols: [
|
||||
{
|
||||
name: "MusicFree",
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/src/main/window-manager/index.ts b/src/main/window-manager/index.ts
|
||||
index 42fd81c..45f93ab 100644
|
||||
--- a/src/main/window-manager/index.ts
|
||||
+++ b/src/main/window-manager/index.ts
|
||||
@@ -129,13 +129,6 @@ class WindowManager implements IWindowManager {
|
||||
initUrl.hash = `/main/musicsheet/${localPluginName}/favorite`;
|
||||
mainWindow.loadURL(initUrl.toString()).then(voidCallback);
|
||||
|
||||
- // 3. 开发者工具
|
||||
- if (!app.isPackaged) {
|
||||
- mainWindow.on("ready-to-show", () => {
|
||||
- mainWindow.webContents.openDevTools();
|
||||
- });
|
||||
- }
|
||||
-
|
||||
// 4. 主窗口http hack逻辑
|
||||
mainWindow.webContents.session.webRequest.onBeforeSendHeaders(
|
||||
(details, callback) => {
|
||||
@@ -0,0 +1,168 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
electron,
|
||||
python3,
|
||||
nodejs,
|
||||
vips,
|
||||
gitMinimal,
|
||||
removeReferencesTo,
|
||||
xcodebuild,
|
||||
zip,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "musicfree-desktop";
|
||||
version = "0.0.8";
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maotoumao";
|
||||
repo = "MusicFreeDesktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gGGlWzd6LRrB5EbkXZWqg2cwMyZ5OMQm6otpnZFUbvo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# update sharp to recognize SHARP_FORCE_GLOBAL_LIBVIPS
|
||||
# update node-abi to support newer Electron
|
||||
# update nan to fix build with newer Electron (https://github.com/nodejs/nan/issues/921)
|
||||
# see update.sh for how this patch was generated
|
||||
./bump-deps.patch
|
||||
|
||||
# tell electron-packager to look for Electron zips in a local dir
|
||||
# instead of downloading them from the internet
|
||||
./electron-zip-dir.patch
|
||||
|
||||
# Do not open devtools on startup.
|
||||
# ELECTRON_FORCE_IS_PACKAGED=1 should also do the trick,
|
||||
# but it causes weird problem of being unable to look up the resource dir
|
||||
./no-startup-dev-tools.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
(python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp
|
||||
gitMinimal # Used by electron-forge
|
||||
zip
|
||||
removeReferencesTo
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; # Used by better-sqlite3
|
||||
|
||||
npmDepsHash = "sha256-lxDEbf++QH1/DaIEgXMnmqMD9d5Ak7IJMc5pQjysKBA=";
|
||||
|
||||
postConfigure = ''
|
||||
# use Electron's headers to make node-gyp compile against the Electron ABI
|
||||
export npm_config_nodedir="${electron.headers}"
|
||||
|
||||
# override the detected electron version
|
||||
substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \
|
||||
--replace-fail "return version" "return '${electron.version}'"
|
||||
|
||||
# create the electron archive to be used by electron-packager
|
||||
# the contents do not matter, but some files must be present, such as a file named "electron" intended to be the executable
|
||||
electron_zip=$(pwd)/.electron-packager/electron-zips/electron-v${electron.version}-${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}.zip
|
||||
mkdir -p $(dirname $electron_zip)
|
||||
${
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
for app in Electron.app{,/Contents/Frameworks/Electron\ Helper.app}; do
|
||||
mkdir -p "$app/Contents/MacOS"
|
||||
cp "${electron.dist}/$app/Contents/Info.plist" "$app/Contents/Info.plist"
|
||||
chmod +w "$app/Contents/Info.plist"
|
||||
echo dummy > "$app/Contents/MacOS/$(basename "$app" .app)"
|
||||
done
|
||||
zip -r $electron_zip Electron.app
|
||||
rm -r Electron.app
|
||||
''
|
||||
else
|
||||
''
|
||||
echo dummy > electron
|
||||
zip $electron_zip electron
|
||||
rm electron
|
||||
''
|
||||
}
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
vips # for sharp
|
||||
];
|
||||
|
||||
# sharp tries to write to npm-deps/_libvips when compiling
|
||||
makeCacheWritable = true;
|
||||
|
||||
npmBuildScript = "package";
|
||||
|
||||
env = {
|
||||
SHARP_FORCE_GLOBAL_LIBVIPS = "1";
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
# Have more info in build logs and also prevent the fancy UI of electron-forge spamming the build logs
|
||||
DEBUG = "electron-forge:*,electron-packager,@electron/get:*";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "musicfree-desktop";
|
||||
desktopName = "MusicFree";
|
||||
exec = "MusicFree %U";
|
||||
icon = "musicfree-desktop";
|
||||
type = "Application";
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [ "Utility" ];
|
||||
mimeTypes = [ "x-scheme-handler/musicfree" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# the output of electron-forge is here
|
||||
build_dir=$(find out -type d -maxdepth 1 -mindepth 1 | head -n1)
|
||||
build_dir=$build_dir/${
|
||||
if stdenv.hostPlatform.isDarwin then "MusicFree.app/Contents/Resources" else "resources"
|
||||
}
|
||||
|
||||
phome=$out/lib/node_modules/musicfree-desktop
|
||||
mkdir -p $(dirname $phome)
|
||||
cp -ar $build_dir/app $phome
|
||||
cp -ar $build_dir/res $phome
|
||||
find $phome/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/MusicFree \
|
||||
--add-flags $phome \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s $phome/res/logo.png $out/share/pixmaps/musicfree-desktop.png
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications/MusicFree.app/Contents/{MacOS,Resources}
|
||||
cp $build_dir/../Info.plist $out/Applications/MusicFree.app/Contents
|
||||
ln -s $out/bin/MusicFree $out/Applications/MusicFree.app/Contents/MacOS/MusicFree
|
||||
ln -s $phome/res/logo.icns $out/Applications/MusicFree.app/Contents/Resources/electron.icns
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Customizable music player with plugin support";
|
||||
homepage = "https://musicfree.catcat.work";
|
||||
changelog = "https://github.com/maotoumao/MusicFreeDesktop/blob/${finalAttrs.src.tag}/changelog.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
mainProgram = "MusicFree";
|
||||
platforms = electron.meta.platforms;
|
||||
};
|
||||
})
|
||||
Executable
+34
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nodejs nix-update jq curl patch diffutils
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
old_version=$(nix-instantiate --eval -A musicfree-desktop.version | tr -d '"')
|
||||
new_version=$(curl -sL ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/maotoumao/MusicFreeDesktop/releases/latest | jq -r .tag_name | tr -d v)
|
||||
if [ "$old_version" == "$new_version" ]; then
|
||||
echo "Already up to date" >&2
|
||||
exit
|
||||
fi
|
||||
|
||||
patch=$(dirname $(nix-instantiate --eval -A musicfree-desktop.meta.position | tr -d '"' | cut -d : -f 1))/bump-deps.patch
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
pushd $HOME
|
||||
|
||||
curl -L https://github.com/maotoumao/MusicFreeDesktop/raw/v$new_version/package.json -o package.json
|
||||
curl -L https://github.com/maotoumao/MusicFreeDesktop/raw/v$new_version/package-lock.json -o package-lock.json
|
||||
|
||||
if patch --batch --dry-run -p1 -i $patch; then
|
||||
echo "Old patch works, no need to update" >&2
|
||||
else
|
||||
mv package.json package.json.old
|
||||
jq '.dependencies.sharp |= (if . != null and . < "^0.33.4" then "^0.33.4" else . end)' package.json.old > package.json
|
||||
cp package-lock.json package-lock.json.old
|
||||
npm update sharp node-abi nan --package-lock-only
|
||||
diff -u --label a/package.json package.json.old --label b/package.json package.json > $patch || true
|
||||
diff -u --label a/package-lock.json package-lock.json.old --label b/package-lock.json package-lock.json >> $patch || true
|
||||
fi
|
||||
|
||||
popd
|
||||
|
||||
nix-update musicfree-desktop --version $new_version
|
||||
@@ -123,18 +123,31 @@ stdenv.mkDerivation (
|
||||
|
||||
inherit lua;
|
||||
treesitter-parsers =
|
||||
treesitter-parsers
|
||||
// {
|
||||
markdown = treesitter-parsers.markdown // {
|
||||
location = "tree-sitter-markdown";
|
||||
};
|
||||
}
|
||||
// {
|
||||
markdown_inline = treesitter-parsers.markdown // {
|
||||
language = "markdown_inline";
|
||||
location = "tree-sitter-markdown-inline";
|
||||
};
|
||||
};
|
||||
lib.mapAttrs
|
||||
(
|
||||
language: grammar:
|
||||
tree-sitter.buildGrammar {
|
||||
inherit (grammar) src;
|
||||
version = "neovim-${finalAttrs.version}";
|
||||
language = grammar.language or language;
|
||||
location = grammar.location or null;
|
||||
}
|
||||
)
|
||||
(
|
||||
treesitter-parsers
|
||||
|
||||
// {
|
||||
markdown = treesitter-parsers.markdown // {
|
||||
location = "tree-sitter-markdown";
|
||||
};
|
||||
}
|
||||
// {
|
||||
markdown_inline = treesitter-parsers.markdown // {
|
||||
language = "markdown_inline";
|
||||
location = "tree-sitter-markdown-inline";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
buildInputs = [
|
||||
libuv
|
||||
@@ -226,14 +239,7 @@ stdenv.mkDerivation (
|
||||
+ lib.concatStrings (
|
||||
lib.mapAttrsToList (language: grammar: ''
|
||||
ln -s \
|
||||
${
|
||||
tree-sitter.buildGrammar {
|
||||
inherit (grammar) src;
|
||||
version = "neovim-${finalAttrs.version}";
|
||||
language = grammar.language or language;
|
||||
location = grammar.location or null;
|
||||
}
|
||||
}/parser \
|
||||
${grammar}/parser \
|
||||
$out/lib/nvim/parser/${language}.so
|
||||
'') finalAttrs.treesitter-parsers
|
||||
);
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nextcloud-spreed-signaling";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strukturag";
|
||||
repo = "nextcloud-spreed-signaling";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WEA5sbQzcsnHGVeog3lZXF3/veJxw39rF1++ejS4aWA=";
|
||||
hash = "sha256-thXTIvaEufGOYWFMiqZxUcqhZbXRQgTj2FeZ2s/gqaI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-osxQW5nR37bLKHOuC7jAWNjSgJZy8KzWDgC2Mo36ovA=";
|
||||
vendorHash = "sha256-qLyehDoZZBCzlc8X/il1+8gtX6M/nhjqUKccebuxLVE=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
patchelf,
|
||||
undmg,
|
||||
makeWrapper,
|
||||
libpulseaudio,
|
||||
}:
|
||||
let
|
||||
pname = "nextcloud-talk-desktop";
|
||||
@@ -102,11 +103,17 @@ let
|
||||
libxrandr
|
||||
libxfixes
|
||||
libxcursor
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
# Required to launch the application and proceed past the zygote_linux fork() process
|
||||
# Fixes `Zygote could not fork`
|
||||
runtimeDependencies = [ systemd ];
|
||||
runtimeDependencies = [
|
||||
# Required to launch the application and proceed past the zygote_linux fork() process
|
||||
# Fixes `Zygote could not fork`
|
||||
systemd
|
||||
|
||||
# Fixes input/output audio device selection
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From ee192f35d29ecae64dc00b4736e1870274b58cc8 Mon Sep 17 00:00:00 2001
|
||||
From: azban <me@azban.net>
|
||||
Date: Sat, 21 Mar 2026 18:41:34 -0600
|
||||
Subject: [PATCH] handle result from DcoKeyConfig_ParseFromString
|
||||
|
||||
This previously failed with error unused-result. This checks the result and throws an exception if the parsing fails.
|
||||
---
|
||||
src/netcfg/netcfg-dco.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/netcfg/netcfg-dco.cpp b/src/netcfg/netcfg-dco.cpp
|
||||
index 290c12a8..f41836bf 100644
|
||||
--- a/src/netcfg/netcfg-dco.cpp
|
||||
+++ b/src/netcfg/netcfg-dco.cpp
|
||||
@@ -265,7 +265,9 @@ void NetCfgDCO::method_new_key(GVariant *params)
|
||||
std::string key_config = glib2::Value::Extract<std::string>(params, 1);
|
||||
|
||||
DcoKeyConfig dco_kc;
|
||||
- dco_kc.ParseFromString(base64->decode(key_config));
|
||||
+ if (!dco_kc.ParseFromString(base64->decode(key_config))) {
|
||||
+ throw NetCfgException("Failed to parse DCO key config");
|
||||
+ }
|
||||
|
||||
auto copyKeyDirection = [](const DcoKeyConfig_KeyDirection &src, KoRekey::KeyDirection &dst)
|
||||
{
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# Should be fixed in v26: https://codeberg.org/OpenVPN/openvpn3-linux/issues/70
|
||||
./v25-latest-linux-fix.patch
|
||||
./0001-handle-result-from-DcoKeyConfig_ParseFromString.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
crystal,
|
||||
jq,
|
||||
libxml2,
|
||||
@@ -10,22 +9,15 @@
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "oq";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blacksmoke16";
|
||||
repo = "oq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE=";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-AgUVHlk39J1V1Vv91FjglT4mSbP4IHiRlTrlfmrJxfY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Blacksmoke16/oq/commit/4f9ef2a73770465bfe2348795461fc8a90a7b9b0.diff";
|
||||
hash = "sha256-Ljvf2+1vsGv6wJHl27T7DufI9rTUCY/YQZziOWpW8Do=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ libxml2 ];
|
||||
nativeCheckInputs = [ jq ];
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
makeShellWrapper,
|
||||
autoPatchelfHook,
|
||||
libgcc,
|
||||
libx11,
|
||||
libxext,
|
||||
libxcb,
|
||||
libGL,
|
||||
ffmpeg,
|
||||
glib,
|
||||
dbus,
|
||||
pango,
|
||||
libxcomposite,
|
||||
libxdamage,
|
||||
libxrandr,
|
||||
libxkbcommon,
|
||||
libgbm,
|
||||
nss,
|
||||
nspr,
|
||||
gtk3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmium";
|
||||
version = "0.0.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updater.osmium.chat/Osmium-${version}-alpha-x64.tar.gz";
|
||||
hash = "sha256-dMOyZ9oPVnLt6MHeQwsMJ03wgvaKzalynwAL/PRfI28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeShellWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcc
|
||||
libx11
|
||||
libxext
|
||||
libxcb
|
||||
ffmpeg
|
||||
glib
|
||||
dbus
|
||||
pango
|
||||
libxcomposite
|
||||
libxdamage
|
||||
libxrandr
|
||||
libxkbcommon
|
||||
libgbm
|
||||
nss
|
||||
nspr
|
||||
gtk3
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,opt,share/{pixmaps,icons/hicolor/256x256/apps}}
|
||||
|
||||
mv * $out/opt/
|
||||
chmod +x $out/opt/osmium
|
||||
|
||||
ln -s $out/opt/osmium $out/bin/
|
||||
|
||||
wrapProgramShell $out/opt/osmium \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
|
||||
|
||||
ln -s $out/opt/resources/assets/icons/256x256.png $out/share/pixmaps/osmium.png
|
||||
ln -s $out/opt/resources/assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/osmium.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "osmium";
|
||||
exec = "osmium";
|
||||
icon = "osmium";
|
||||
desktopName = "Osmium";
|
||||
genericName = "A globally distributed community messaging and voice/video platform.";
|
||||
categories = [
|
||||
"Network"
|
||||
"InstantMessaging"
|
||||
];
|
||||
mimeTypes = [ "x-scheme-handler/osmium" ];
|
||||
startupWMClass = "Osmium";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Globally distributed community messaging and voice/video platform";
|
||||
homepage = "https://osmium.chat/";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "osmium";
|
||||
maintainers = with lib.maintainers; [
|
||||
twoneis
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
appstream,
|
||||
desktop-file-utils,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
libadwaita,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
vala,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palette";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
group = "World";
|
||||
owner = "design";
|
||||
repo = "palette";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DfLK5a2wJnwC8N90qOjSDNpMbM0jpauGTlgDwjQ5+kU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Colour Palette tool";
|
||||
homepage = "https://gitlab.gnome.org/World/design/palette";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "org.gnome.design.Palette";
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,96 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
desktopToDarwinBundle,
|
||||
cmake,
|
||||
ninja,
|
||||
libogg,
|
||||
libjpeg,
|
||||
libopenmpt,
|
||||
libpng,
|
||||
libvorbis,
|
||||
libmpg123,
|
||||
SDL2,
|
||||
python3,
|
||||
imagemagick,
|
||||
libicns,
|
||||
nix-update-script,
|
||||
pvzDebug ? false, # cheat keys and other debug features
|
||||
limboPage ? true, # access to limbo page with hidden minigame levels
|
||||
doFixBugs ? false, # fix bugs (which are usually considered features)
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pvz-portable-unwrapped";
|
||||
version = "0.1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wszqkzqk";
|
||||
repo = "PvZ-Portable";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-G+otMVg/RYpRSEGSvMYocMyN27ixJW9w+bNXCU9Otl0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
imagemagick
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
|
||||
|
||||
buildInputs = [
|
||||
libogg
|
||||
libjpeg
|
||||
libopenmpt
|
||||
libpng
|
||||
libvorbis
|
||||
libmpg123
|
||||
SDL2
|
||||
(python3.withPackages (ps: [ ps.pyyaml ]))
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "PVZ_DEBUG" pvzDebug)
|
||||
(lib.cmakeBool "LIMBO_PAGE" limboPage)
|
||||
(lib.cmakeBool "DO_FIX_BUGS" doFixBugs)
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 pvz-portable $out/bin/pvz-portable
|
||||
|
||||
cd .. # exit cmake build dir
|
||||
|
||||
install -Dm755 scripts/pvzp-v4-converter.py $out/bin/pvzp-v4-converter
|
||||
install -Dm644 LICENSE $out/share/licenses/pvz-portable/LICENSE
|
||||
install -Dm644 COPYING $out/share/licenses/pvz-portable/COPYING
|
||||
|
||||
install -Dm664 archlinux/io.github.wszqkzqk.pvz-portable.desktop $out/share/applications/io.github.wszqkzqk.pvz-portable.desktop
|
||||
substituteInPlace $out/share/applications/io.github.wszqkzqk.pvz-portable.desktop --replace-fail /usr/bin/ ""
|
||||
install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/io.github.wszqkzqk.pvz-portable.png
|
||||
for size in 16 32 48 64 128 256; do
|
||||
mkdir -p $out/share/icons/hicolor/''${size}x$size/apps
|
||||
magick icon.png -resize ''${size}x$size $out/share/icons/hicolor/''${size}x$size/apps/io.github.wszqkzqk.pvz-portable.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform community-driven reimplementation of Plants vs. Zombies GOTY";
|
||||
homepage = "https://github.com/wszqkzqk/PvZ-Portable";
|
||||
changelog = "https://github.com/wszqkzqk/PvZ-Portable/releases";
|
||||
downloadPage = "https://github.com/wszqkzqk/PvZ-Portable/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
lgpl3Plus
|
||||
free # PopCap Games Framework License: redistribution with or without modifications allowed
|
||||
];
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "pvz-portable";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,68 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenvNoCC,
|
||||
symlinkJoin,
|
||||
makeWrapper,
|
||||
p7zip,
|
||||
pvz-portable-unwrapped,
|
||||
# set it to a dir or a zip containing main.pak and properties; can be a path or a derivation
|
||||
# example: ./Plants_vs._Zombies_1.2.0.1073_EN.zip
|
||||
# https://github.com/wszqkzqk/PvZ-Portable/blob/main/archlinux/README.md#prepare-game-assets
|
||||
gameAssets ? fetchurl {
|
||||
url = "https://web.archive.org/web/20220717170711/http://static-www.ec.popcap.com/binaries/popcap_downloads/PlantsVsZombiesSetup.exe";
|
||||
hash = "sha256-S0u00Z+2OeVpiYPjnXrQYcdme87BkFZWBTLHrQ1n0OQ=";
|
||||
meta.license = lib.licenses.unfree;
|
||||
},
|
||||
pvzDebug ? false,
|
||||
limboPage ? true,
|
||||
doFixBugs ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
unwrapped = pvz-portable-unwrapped.override { inherit pvzDebug limboPage doFixBugs; };
|
||||
|
||||
assets = stdenvNoCC.mkDerivation {
|
||||
name = "pvz-portable-assets";
|
||||
|
||||
src = gameAssets;
|
||||
|
||||
nativeBuildInputs = [ p7zip ];
|
||||
|
||||
unpackCmd = ''
|
||||
[[ -d $curSrc ]] && cp -ar $curSrc source || 7z x $curSrc -osource -ba -bd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
dir="$(find -type f -name main.pak -printf %h -execdir test -d properties \; | head -n 1)"
|
||||
if [[ -z "$dir" ]]; then
|
||||
echo "main.pak and properties not found in $src"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p $out/share/pvz-portable
|
||||
cp -ar "$dir"/{main.pak,properties} $out/share/pvz-portable
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
symlinkJoin (finalAttrs: {
|
||||
pname = "pvz-portable";
|
||||
inherit (finalAttrs.passthru.unwrapped) version meta;
|
||||
|
||||
paths = [
|
||||
finalAttrs.passthru.unwrapped
|
||||
finalAttrs.passthru.assets
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/pvz-portable --add-flags -resdir=$out/share/pvz-portable
|
||||
'';
|
||||
|
||||
passthru = { inherit unwrapped assets; };
|
||||
})
|
||||
@@ -0,0 +1,33 @@
|
||||
const { app, BrowserWindow } = require('electron/main')
|
||||
|
||||
function createWindow() {
|
||||
const win = new BrowserWindow({
|
||||
useContentSize: true,
|
||||
width: 975,
|
||||
height: 608,
|
||||
minWidth: 515,
|
||||
minHeight: 304,
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
enableRemoteModule: true,
|
||||
contextIsolation: false,
|
||||
},
|
||||
});
|
||||
win.loadFile('index.html');
|
||||
win.removeMenu();
|
||||
}
|
||||
|
||||
app.whenReady().then(() => {
|
||||
createWindow();
|
||||
app.on('activate', () => {
|
||||
if (BrowserWindow.getAllWindows().length === 0) {
|
||||
createWindow();
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
app.on('window-all-closed', () => {
|
||||
if (process.platform !== 'darwin') {
|
||||
app.quit();
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,105 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
desktopToDarwinBundle,
|
||||
electron,
|
||||
imagemagick,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "pvzge";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gzh0821";
|
||||
repo = "pvzge_web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IZaJBbliudkVLOEgOwxXkUn9aET+NJrgdPi8FAA7HCE=";
|
||||
};
|
||||
|
||||
iconSrc = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Gzh0821/pvzg_site/refs/tags/${finalAttrs.version}/src/.vuepress/public/pvz_logo.webp";
|
||||
hash = "sha256-PkUS4iESw+R8o+tZMDJ+PTyu6PTmKeRkq/VG3+egsQY=";
|
||||
meta.license = lib.licenses.unfree;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
imagemagick
|
||||
]
|
||||
++ lib.optional stdenvNoCC.hostPlatform.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s|<title>.*</title>|<title>PvZ2: Gardendless</title>|" docs/index.html
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
phome=$out/share/pvzge
|
||||
mkdir -p $(dirname $phome)
|
||||
cp -r docs $phome
|
||||
|
||||
tee $phome/package.json <<JSON
|
||||
{
|
||||
"name": "pvzge",
|
||||
"version": "${finalAttrs.version}",
|
||||
"description": "${finalAttrs.meta.description}",
|
||||
"main": "main.js",
|
||||
"author": "Gaozih"
|
||||
}
|
||||
JSON
|
||||
# adapted from Electron tutorial: https://www.electronjs.org/docs/latest/tutorial/tutorial-first-app
|
||||
# some boilerplate code to get Electron running
|
||||
cp ${./main.js} $phome/main.js
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/pvzge \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags $phome \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
for size in 16 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/''${size}x$size/apps
|
||||
magick $iconSrc -resize ''${size}x$size $out/share/icons/hicolor/''${size}x$size/apps/pvzge.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "pvzge";
|
||||
exec = finalAttrs.meta.mainProgram;
|
||||
icon = "pvzge";
|
||||
desktopName = "PvZ2: Gardendless";
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Completely remastered PvZ2 for all desktop platforms";
|
||||
homepage = "https://pvzge.com";
|
||||
downloadPage = "https://pvzge.com/en/download";
|
||||
# upstream repo has GPL-3.0 in the LICENSE file,
|
||||
# but only obfuscated code is available, and it contains proprietary assets
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "pvzge";
|
||||
};
|
||||
})
|
||||
@@ -18,13 +18,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdmr";
|
||||
version = "0.13.3";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hmatuschek";
|
||||
repo = "qdmr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nw5B0vbYlGkH/8SAAT4DdTp2qiiLst3hWV4n6uF7oUo=";
|
||||
hash = "sha256-9YYMU64AWBp3YAyWEQiER0lH8OeI7AczEztw6UHqmOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rclone";
|
||||
version = "1.73.2";
|
||||
version = "1.73.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,10 +28,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "rclone";
|
||||
repo = "rclone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ICq0VEy0i5Q/9Fd9rsZmMZGMnAW2tGsIhluHFGlmI/Q=";
|
||||
hash = "sha256-jPY+sPNQwashbbrjt4RewFRc5FwsvCZBQwMy+kLpCUQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4WLtVzlboBRO5HVYUVfwt6xGaaG2mt8GVHcS4K+fgvA=";
|
||||
vendorHash = "sha256-XRIwSMwq8SwgZuIXNHJtasFtUbE3U2YgdVjN+DiXDlg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sail";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lakehq";
|
||||
repo = "sail";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z2XOce95VTlZSTaxRMkTYoXVRiT8cgAk/lK/zLu2Zpo=";
|
||||
hash = "sha256-PPtA/I2M99wiO7XRsR5UfPejjDXk/6sag5lhqwCctqo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aZBABAFA3vVxTImRqZAZ/RwUQIQU+VvKzbRfIM0k8FU=";
|
||||
cargoHash = "sha256-/NnaXzXvTT7ZRGGLjDpKFjcX65rz++MrWZYYO3JvBUU=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
perl,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "samloader-rs";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topjohnwu";
|
||||
repo = "samloader-rs";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LgN/vGfb5hdy9/YH4x3+vFUjH97omGu2iNtkDJRMmsk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o0+Kb8teYhuhvl8U6FiAq8Z6vd4IWA8k4Z104Z9BkMw=";
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Download firmware for Samsung devices";
|
||||
homepage = "https://github.com/topjohnwu/samloader-rs";
|
||||
changelog = "https://github.com/topjohnwu/samloader-rs/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ungeskriptet ];
|
||||
mainProgram = "samloader";
|
||||
};
|
||||
})
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "stackit-cli";
|
||||
version = "0.56.0";
|
||||
version = "0.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4//JuIlGbYUPGr8Zc3fgDl4AMhWZoLYuBSvGhn3Ev5w=";
|
||||
hash = "sha256-rkgDMS2Blc5RSRP/Itx4yOOfzYO9n092dWbPPC6gGmI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IW0pWghQ4GHwanGciCCZ+2/9xUtMUbgHJE8KAOU/k04=";
|
||||
vendorHash = "sha256-WnGLi2C6Vk26I/Uzh/bvcnLVRPxUJFt19MUqasov/iU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "textcompare";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josephmawa";
|
||||
repo = "TextCompare";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N4oFAfYUYWaFeAVyuf/bKz+540bOzRiltPfHXFydzzc=";
|
||||
hash = "sha256-/K+aBcaC5N24RkduWf2VMyF6oPxKnLyDDdTA+Iucen0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tiscamera";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheImagingSource";
|
||||
repo = "tiscamera";
|
||||
rev = "v-tiscamera-${finalAttrs.version}";
|
||||
hash = "sha256-33U/8CbqNWIRwfDHXCZSN466WEQj9fip+Z5EJ7kIwRM=";
|
||||
hash = "sha256-3qAPUcP+Rh1aA1qNWq0NWMpJftinm32r52esikH804Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,20 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
flutter329,
|
||||
flutter341,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
yq-go,
|
||||
nix-update-script,
|
||||
_experimental-update-script-combinators,
|
||||
}:
|
||||
|
||||
flutter329.buildFlutterApplication rec {
|
||||
flutter341.buildFlutterApplication (finalAttrs: {
|
||||
pname = "tts-mod-vault";
|
||||
version = "1.3.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markomijic";
|
||||
repo = "TTS-Mod-Vault";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BTs+4QeyVJeg415uiNXww8twQwUInHfB8voWJjeVs20=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vreamzu+jzlgzjbEro5kE5bM1k6cL6XCG6Tsv+LEiyI=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
@@ -32,10 +36,36 @@ flutter329.buildFlutterApplication rec {
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
preBuild = ''
|
||||
echo 'SUPABASE_URL=https://pdrmmvvtindfbpxlcdps.supabase.co' > .env
|
||||
echo 'SUPABASE_PUBLISHABLE_KEY=sb_publishable_CF6qzs1W8zd_hcVWHSCdVw__2SRB60p' >> .env
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/hicolor/1024x1024/apps/tts_mod_vault.png
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
inherit (finalAttrs) src;
|
||||
nativeBuildInputs = [ yq-go ];
|
||||
}
|
||||
''
|
||||
yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script { })
|
||||
(
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "tts-mod-vault.pubspecSource" ./pubspec.lock.json)
|
||||
// {
|
||||
supportedFeatures = [ ];
|
||||
}
|
||||
)
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Download and backup assets for your Tabletop Simulator mods";
|
||||
homepage = "https://github.com/markomijic/TTS-Mod-Vault";
|
||||
@@ -44,4 +74,4 @@ flutter329.buildFlutterApplication rec {
|
||||
mainProgram = "tts_mod_vault";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,49 @@
|
||||
{
|
||||
appstream,
|
||||
desktop-file-utils,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
libadwaita,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "typography";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
group = "World";
|
||||
owner = "design";
|
||||
repo = "typography";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XAoqB3Gvd/sRrbM4m5s3aYia7bZgPB9UEJ26Bzkj8Ws=";
|
||||
forceFetchGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Tool for looking up text styles";
|
||||
homepage = "https://gitlab.gnome.org/World/design/typography";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "org.gnome.design.Typography";
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -14,18 +14,18 @@
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "umu-launcher-unwrapped";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Open-Wine-Components";
|
||||
repo = "umu-launcher";
|
||||
tag = version;
|
||||
hash = "sha256-ELFOffP3KabvyOu4Fl7Z4zvPhamZrmhuuqz1aTYdbnE=";
|
||||
hash = "sha256-7BdA/iAAIn2NR/uLzxdvsIh5/1SZacSfkiXJVJBT3EQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-qGkEc4VPShMMNgSB4JmSf7Mq4jEOxEK+BqlR680ZO9k=";
|
||||
hash = "sha256-CVcbktCBRZGnEuDVvl2iJpRgKh+ShFe5mjT6oMHIjtQ=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
Generated
+59
-69
@@ -11,19 +11,14 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-M5eDqPQ1Vt6dteY3ecgpffy5L6245TJcxaovpRF8PtA="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.7",
|
||||
"hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.25547.20250602",
|
||||
@@ -31,8 +26,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.AvaloniaEdit",
|
||||
"version": "11.3.0",
|
||||
"hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
|
||||
"version": "11.4.1",
|
||||
"hash": "sha256-OOozpi/5bq3dbZlXvFoXEtxTndJer0AjBYWPwgLR1xk="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
@@ -56,33 +51,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-d8VTsT6yYAa8uZAodX7SWgf4+izVHrP/hy/pDpT91Wk="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-M1o7/n7VR/TbeKNd/+mkG0ck+1vrRhkyjOuBzcuqW6g="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-xuAL5FOvonyaY9CwEhjtMnurPcA0lYe0dyLLK0GEzd8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-ps3trTNzHClRg9VrupTd7+cIShkd0dA+Awy/39IHsjE="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-IY6TkpVh0GiCkKbestdwH8KEJ0Embxy+JYe7lww0xBA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-9tvHMi/D6eJLC1K1jmQMvT6LbljojK94rVlfY8zNJug="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-XEmzwLsndS+l76quLpddzuBPL+BQie0Rv5HN3I5V2kA="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-nd44zlwFNDrFa9OAT3zd2Yg12TOykQW2smXza6ZNmN4="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-1ujLmYaL1zTgtlsNerBDtTuoaJX7c7HukNLJIalrB4Q="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
@@ -96,38 +91,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-DB7JzQjJs5XkPyUjQL4N0Bbm84QG20IZf8UEs7mhcqg="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.7",
|
||||
"hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-XJXyK19ow9mvcssdmjPvh8zyh4VExcVEoiIauqPNC5s="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-5xOBZ+dHye75R28iQLieQgCPlcfQBHF7tzQsHIhTiDg="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-jV0VrDKLS8GqQkgyescrOfJPg4r/YQBJHbpmfRh0qFw="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-haIKvJ1SD17+EUJHILoFJMy+WJJtXr9I+ZYMFtwEuTc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.3.10",
|
||||
"hash": "sha256-fgp68h5siTweduPxKeKYwb4LJ7lhmtf7Fw2b1B4FrKo="
|
||||
"version": "11.3.12",
|
||||
"hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
|
||||
},
|
||||
{
|
||||
"pname": "CliWrap",
|
||||
@@ -141,8 +131,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Downloader",
|
||||
"version": "4.0.3",
|
||||
"hash": "sha256-QBSvvVmejnnK8QlS/OEkDXOpbrUW5pGpbPR+6zzFstg="
|
||||
"version": "5.1.0",
|
||||
"hash": "sha256-c5D5G3BYm79UrOsBX2UJahVrRYAvSi44o1uRDob4ZoI="
|
||||
},
|
||||
{
|
||||
"pname": "DynamicData",
|
||||
@@ -181,8 +171,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "MessageBox.Avalonia",
|
||||
"version": "3.3.1",
|
||||
"hash": "sha256-W726OnJQA0x7RJ6bzaLWKw1PSIL50WsVC5FIYXwOZ9U="
|
||||
"version": "3.3.1.1",
|
||||
"hash": "sha256-UvWCbuMuCxFpHvuUqJIfcOS/Vw57+ZdrZfSKRgPiNm0="
|
||||
},
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
@@ -191,13 +181,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.3",
|
||||
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.Registry",
|
||||
@@ -211,8 +201,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "NLog",
|
||||
"version": "6.0.7",
|
||||
"hash": "sha256-Le6ocjCN29rtgRiAroVfjUbMXCrjk0pSv2GEtZZy0qU="
|
||||
"version": "6.1.1",
|
||||
"hash": "sha256-4pxy5z5FyRxBmZNBw+n32SjgEQzMsgSHTuSSn+vxLzk="
|
||||
},
|
||||
{
|
||||
"pname": "QRCoder",
|
||||
@@ -221,13 +211,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "ReactiveUI",
|
||||
"version": "22.3.1",
|
||||
"hash": "sha256-NltfWhlz+99yaYEDkPXeBgPtqbqW5xJDEhedH5cesUk="
|
||||
"version": "23.1.8",
|
||||
"hash": "sha256-Of17kTxTQGTKUFv0fx7V90i06y9jQY9q5zkauPKZ+YQ="
|
||||
},
|
||||
{
|
||||
"pname": "ReactiveUI.Avalonia",
|
||||
"version": "11.3.8",
|
||||
"hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo="
|
||||
"version": "11.4.12",
|
||||
"hash": "sha256-QU9wchlOJtc6LqlksNhRW+2US30soucJIw5y4Wz7tYU="
|
||||
},
|
||||
{
|
||||
"pname": "ReactiveUI.Fody",
|
||||
@@ -236,18 +226,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Semi.Avalonia",
|
||||
"version": "11.3.7.1",
|
||||
"hash": "sha256-LMf15T7QxgcQ43OG9NgfQGMwJ0IJkTdr42jI/Y3PAGg="
|
||||
"version": "11.3.7.3",
|
||||
"hash": "sha256-oIkE57AGb6FlUiFMnQZ/9uwwPxHaE8VsWHzYtEEvYQo="
|
||||
},
|
||||
{
|
||||
"pname": "Semi.Avalonia.AvaloniaEdit",
|
||||
"version": "11.2.0.1",
|
||||
"hash": "sha256-W0gAoDPlStqsznFS6eLDI4GFAlIDGyQq2L+DG/WKY1I="
|
||||
"version": "11.2.0.2",
|
||||
"hash": "sha256-60kyFqWVqz58W+sWcVFTD/o4CqXFZ01hr2Tp5HnslR0="
|
||||
},
|
||||
{
|
||||
"pname": "Semi.Avalonia.DataGrid",
|
||||
"version": "11.3.7.1",
|
||||
"hash": "sha256-xZAvVT8Sb9evv5DubKPUi3uYGWlx/KnCKqQgoghGX0A="
|
||||
"version": "11.3.7.3",
|
||||
"hash": "sha256-++8ksHadX5MO42CIU2GoC2Cub+9J4NstBUrbRk/4MjM="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
@@ -291,23 +281,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Splat",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo="
|
||||
"version": "19.3.1",
|
||||
"hash": "sha256-ri8qniMdAzAO4cjjVfuSFxMM6MvxFrG6+d2cPWJeLUE="
|
||||
},
|
||||
{
|
||||
"pname": "Splat.Builder",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI="
|
||||
"version": "19.3.1",
|
||||
"hash": "sha256-XN/3+5BEaq6v17eWKFUOqqCmVWJLEVQBm5cvejxetw8="
|
||||
},
|
||||
{
|
||||
"pname": "Splat.Core",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0="
|
||||
"version": "19.3.1",
|
||||
"hash": "sha256-Fav212nMhUGO5/1zFKevXVm21MH+x7NTqgq1jD1WRKw="
|
||||
},
|
||||
{
|
||||
"pname": "Splat.Logging",
|
||||
"version": "17.1.1",
|
||||
"hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY="
|
||||
"version": "19.3.1",
|
||||
"hash": "sha256-rTXD2bqIa/IjeN/mFv9n9mkL2rujEg1iIUPimVpYLBQ="
|
||||
},
|
||||
{
|
||||
"pname": "sqlite-net-pcl",
|
||||
@@ -339,6 +329,11 @@
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "10.0.3",
|
||||
"hash": "sha256-YQzu50E7/1slw8IcFkVpQd33/IyWw1hJapTIscnoF5Q="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
"version": "6.0.0",
|
||||
@@ -359,11 +354,6 @@
|
||||
"version": "4.5.3",
|
||||
"hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reactive",
|
||||
"version": "6.0.2",
|
||||
"hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reactive",
|
||||
"version": "6.1.0",
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "v2rayn";
|
||||
version = "7.16.9";
|
||||
version = "7.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "2dust";
|
||||
repo = "v2rayN";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-co2JLOlt2TafpSwxD6E/Q0dMbXADBdTL7C4DZTJQCNs=";
|
||||
hash = "sha256-MkLJi+rMHhLjZ1huappvdxziYCNlKkoWTjjmvSPznFg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -75,6 +75,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals withOpenVR [ "openvr" ];
|
||||
|
||||
postInstall = ''
|
||||
install -D wayvr/wayvr.desktop -t $out/share/applications
|
||||
install -D wayvr/wayvr.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.testVersion = testers.testVersion { package = wayvr; };
|
||||
|
||||
|
||||
@@ -28,8 +28,10 @@ mkDerivation {
|
||||
|
||||
qmakeFlags = [ "ldutils.pro" ];
|
||||
|
||||
LDUTILS_LIB = placeholder "out";
|
||||
LDUTILS_INCLUDE = placeholder "out";
|
||||
env = {
|
||||
LDUTILS_LIB = placeholder "out";
|
||||
LDUTILS_INCLUDE = placeholder "out";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Headers and link library for other ldutils projects";
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
setOutputFlags = false;
|
||||
NIX_QT_SUBMODULE = true;
|
||||
env.NIX_QT_SUBMODULE = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -185,7 +185,9 @@ let
|
||||
cl-ana_dot_hdf-cffi = super.cl-ana_dot_hdf-cffi.overrideLispAttrs (o: {
|
||||
nativeBuildInputs = [ pkgs.hdf5 ];
|
||||
nativeLibs = [ pkgs.hdf5 ];
|
||||
NIX_LDFLAGS = [ "-lhdf5" ];
|
||||
env = o.env or { } // {
|
||||
NIX_LDFLAGS = toString [ "-lhdf5" ];
|
||||
};
|
||||
});
|
||||
# The antik source archive contains a broken documentation.pdf symlink
|
||||
# pointing to documentation/build/latex/Antik.pdf which doesn't exist.
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arcam-fmj";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elupus";
|
||||
repo = "arcam_fmj";
|
||||
tag = version;
|
||||
hash = "sha256-OiBTlAcSLhaMWbp5k+0yU1amSpLKnJA+3Q56lyiSDUA=";
|
||||
hash = "sha256-qcSqsfbA5maGDTf07fz4dwlrMUF5wnWPsWcYWbsFiwQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
+57
-57
@@ -77,9 +77,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.56"
|
||||
version = "1.2.57"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
|
||||
checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"shlex",
|
||||
@@ -141,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
|
||||
|
||||
[[package]]
|
||||
name = "css-inline"
|
||||
version = "0.20.0"
|
||||
version = "0.20.1"
|
||||
dependencies = [
|
||||
"cssparser",
|
||||
"html5ever",
|
||||
@@ -157,7 +157,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "css-inline-python"
|
||||
version = "0.20.0"
|
||||
version = "0.20.1"
|
||||
dependencies = [
|
||||
"built",
|
||||
"css-inline",
|
||||
@@ -371,9 +371,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "html5ever"
|
||||
version = "0.38.0"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
|
||||
checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
|
||||
dependencies = [
|
||||
"log",
|
||||
"markup5ever",
|
||||
@@ -617,15 +617,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ipnet"
|
||||
version = "2.11.0"
|
||||
version = "2.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
|
||||
checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
|
||||
|
||||
[[package]]
|
||||
name = "iri-string"
|
||||
version = "0.7.10"
|
||||
version = "0.7.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
|
||||
checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"serde",
|
||||
@@ -633,15 +633,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
|
||||
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.89"
|
||||
version = "0.3.91"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4eacb0641a310445a4c513f2a5e23e19952e269c6a38887254d5f837a305506"
|
||||
checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
@@ -649,9 +649,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.182"
|
||||
version = "0.2.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
|
||||
checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
|
||||
|
||||
[[package]]
|
||||
name = "litemap"
|
||||
@@ -691,9 +691,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
|
||||
|
||||
[[package]]
|
||||
name = "markup5ever"
|
||||
version = "0.38.0"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
|
||||
checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
|
||||
dependencies = [
|
||||
"log",
|
||||
"tendril",
|
||||
@@ -734,9 +734,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.21.3"
|
||||
version = "1.21.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
|
||||
checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
@@ -822,9 +822,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.16"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
|
||||
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
@@ -957,9 +957,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quinn-proto"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
|
||||
checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"getrandom 0.3.4",
|
||||
@@ -992,9 +992,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.44"
|
||||
version = "1.0.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
|
||||
checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@@ -1134,9 +1134,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustls"
|
||||
version = "0.23.36"
|
||||
version = "0.23.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
|
||||
checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"ring",
|
||||
@@ -1158,9 +1158,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustls-webpki"
|
||||
version = "0.103.9"
|
||||
version = "0.103.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
|
||||
checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
|
||||
dependencies = [
|
||||
"ring",
|
||||
"rustls-pki-types",
|
||||
@@ -1187,9 +1187,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "selectors"
|
||||
version = "0.35.0"
|
||||
version = "0.36.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fdfed56cd634f04fe8b9ddf947ae3dc493483e819593d2ba17df9ad05db8b2"
|
||||
checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cssparser",
|
||||
@@ -1313,12 +1313,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.6.2"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
|
||||
checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.60.2",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1436,9 +1436,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.10.0"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
|
||||
checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
|
||||
dependencies = [
|
||||
"tinyvec_macros",
|
||||
]
|
||||
@@ -1451,9 +1451,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.49.0"
|
||||
version = "1.50.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
|
||||
checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"libc",
|
||||
@@ -1646,9 +1646,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.112"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05d7d0fce354c88b7982aec4400b3e7fcf723c32737cef571bd165f7613557ee"
|
||||
checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
@@ -1659,9 +1659,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.62"
|
||||
version = "0.4.64"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee85afca410ac4abba5b584b12e77ea225db6ee5471d0aebaae0861166f9378a"
|
||||
checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
@@ -1673,9 +1673,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.112"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55839b71ba921e4f75b674cb16f843f4b1f3b26ddfcb3454de1cf65cc021ec0f"
|
||||
checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@@ -1683,9 +1683,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.112"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "caf2e969c2d60ff52e7e98b7392ff1588bffdd1ccd4769eba27222fd3d621571"
|
||||
checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
@@ -1696,18 +1696,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.112"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0861f0dcdf46ea819407495634953cdcc8a8c7215ab799a7a7ce366be71c7b30"
|
||||
checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.89"
|
||||
version = "0.3.91"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10053fbf9a374174094915bbce141e87a6bf32ecd9a002980db4b638405e8962"
|
||||
checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
@@ -1961,9 +1961,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.7.14"
|
||||
version = "0.7.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
|
||||
checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@@ -2005,18 +2005,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.8.39"
|
||||
version = "0.8.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
|
||||
checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.8.39"
|
||||
version = "0.8.47"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
|
||||
checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "css-inline";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stranger6667";
|
||||
repo = "css-inline";
|
||||
rev = "python-v${version}";
|
||||
hash = "sha256-T/oNrRZjW8GMzdf1I00y2nylaCrl6oVdSv2bEVADKsY=";
|
||||
hash = "sha256-8Se0Ehzsh5TWwdfpwriTOjEY50eTFuA2qOonLK/XuNk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||
cd bindings/python
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
hash = "sha256-XX4R+HRXw2sGJwZPW+qaaE2eGLkFFaaWjZfAYvHs9qQ=";
|
||||
hash = "sha256-mj+/WTm/etglMj32gwhOmpW3/DyrvQ+TxUBSYDd7YZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
@@ -28,14 +29,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "devpi-web";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devpi";
|
||||
repo = "devpi";
|
||||
tag = "web-${finalAttrs.version}";
|
||||
hash = "sha256-p52uwkXeCPPsnD9BLfqEa8NK4bAfIdpYIzdNgmwucms=";
|
||||
hash = "sha256-rAku3oHcmzFNA/MP/64382gCTgqopwjjy4S4HTEFZiY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
@@ -70,6 +71,11 @@ buildPythonPackage (finalAttrs: {
|
||||
webtest
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# https://github.com/devpi/devpi/issues/1114
|
||||
"test_dont_index_deleted_mirror"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "devpi_web" ];
|
||||
|
||||
# devpi uses a monorepo for server, common, client and web
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "gliner";
|
||||
version = "0.2.25";
|
||||
version = "0.2.26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "urchade";
|
||||
repo = "GLiNER";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4IPT8mW3I998T9W/qDJRZifZYRJUyjeu54gtsOnFNWY=";
|
||||
hash = "sha256-tiQrb04SfloVJySyKu5XhOaE8Y3RcwBbW2l13UtZL0w=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,18 +1,22 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
|
||||
# build
|
||||
pdm-backend,
|
||||
|
||||
# propagates
|
||||
aiohttp,
|
||||
aiohttp-retry,
|
||||
authlib,
|
||||
pydantic,
|
||||
python-dateutil,
|
||||
toml,
|
||||
typing-extensions,
|
||||
|
||||
# tests
|
||||
openapi-spec-validator,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
@@ -20,34 +24,41 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.8.5";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanidm";
|
||||
repo = "kanidm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lJX/eObXi468iFOzeFjAnNkPiQ8VbBnfqD1518LDm2s=";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KlUxW/bJByQnzPdRd9Z5pStH27SpWrCijZc5jlVT5jE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/pykanidm";
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
aiohttp-retry
|
||||
authlib
|
||||
pydantic
|
||||
python-dateutil
|
||||
toml
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
openapi-spec-validator
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestMarks = [ "network" ];
|
||||
disabledTests = [
|
||||
"test_tokenstuff"
|
||||
];
|
||||
|
||||
disabledTestMarks = [
|
||||
"network"
|
||||
"openapi"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "kanidm" ];
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonAtLeast,
|
||||
dill,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
@@ -12,6 +13,10 @@ buildPythonPackage rec {
|
||||
version = "0.4.4";
|
||||
pyproject = true;
|
||||
|
||||
# AttributeError: module 'ast' has no attribute 'Num'
|
||||
# https://docs.python.org/3/whatsnew/3.14.html#id9
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "latexify_py";
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-abstractions";
|
||||
version = "1.9.8";
|
||||
version = "1.9.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-abstractions-v${version}";
|
||||
hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA=";
|
||||
hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/abstractions/";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-authentication-azure";
|
||||
version = "1.9.8";
|
||||
version = "1.9.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-authentication-azure-v${version}";
|
||||
hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA=";
|
||||
hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/authentication/azure/";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "microsoft-kiota-serialization-json";
|
||||
version = "1.9.8";
|
||||
version = "1.9.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "kiota-python";
|
||||
tag = "microsoft-kiota-serialization-json-v${version}";
|
||||
hash = "sha256-05/I06p3zBc/Kb7H8dMEbUxFr0dOXSSBuIyEGZ4twhA=";
|
||||
hash = "sha256-J9OLxZ3vQpChhfwjXzrGF691zco/bKv51FG20VFieN0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/serialization/json/";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pynintendoparental";
|
||||
version = "2.3.2.1";
|
||||
version = "2.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantherale0";
|
||||
repo = "pynintendoparental";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dQoYollXElYU1j/O5D6kt3d1lpbVyhAtekA9o5eV0Ws=";
|
||||
hash = "sha256-2qcupx+x578E+n+YsmB81XrVE5M0QFZPP82H5KxEkss=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,21 +2,21 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "w3lib";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XIrAKjAnV2F0wrYeuaIXC6Gxl8rnZwgHcbbx/r2iSaQ=";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-4jOtIWSbadDgR6EPMBga6Wd1JKKfb3H288dY3AyNJkg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -25,8 +25,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Library of web-related functions";
|
||||
homepage = "https://github.com/scrapy/w3lib";
|
||||
changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS";
|
||||
changelog = "https://github.com/scrapy/w3lib/blob/${finalAttrs.version}/NEWS";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.19";
|
||||
hash = "sha256-m0EYkUY4EfNaWKJ7XE+3CCcJubcZEBbkV8wumykZH+Y=";
|
||||
version = "6.18.20";
|
||||
hash = "sha256-CVwMRXmDq+vmepTs9Aja7+xJztz2my6Z5AZrUk3VoOA=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.19.9";
|
||||
hash = "sha256-O3R19FuTw2Q80I8HEJM3gzl/yWWF40TRZvMLUfI6N3Y=";
|
||||
version = "6.19.10";
|
||||
hash = "sha256-siYXwGPt/wO1DcYeCM7XPwwG6HkbT9c0oQai7QFJFBA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildHomeAssistantComponent,
|
||||
fetchFromGitHub,
|
||||
smllib,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "marq24";
|
||||
domain = "tibber_local";
|
||||
version = "2026.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "ha-tibber-pulse-local";
|
||||
tag = version;
|
||||
sha256 = "sha256-YHvhVAGOMkPwaxdQVv1cO6H8LitoG2PChOV1b8Z/4KU=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
smllib
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/marq24/ha-tibber-pulse-local/releases/tag/${version}";
|
||||
description = "Home Assistant integration framework for (garbage collection) schedules";
|
||||
homepage = "https://github.com/marq24/ha-tibber-pulse-local";
|
||||
maintainers = with lib.maintainers; [ hensoko ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -30,6 +30,7 @@
|
||||
, "news": "agpl3Plus"
|
||||
, "nextpod": "agpl3Only"
|
||||
, "notes": "agpl3Plus"
|
||||
, "oidc": "agpl3Only"
|
||||
, "oidc_login": "agpl3Only"
|
||||
, "onlyoffice": "asl20"
|
||||
, "phonetrack": "agpl3Plus"
|
||||
|
||||
@@ -146,6 +146,14 @@ with pkgs;
|
||||
|
||||
inherit (nix-update) nix-update-script;
|
||||
|
||||
nixos-test-driver = pkgs.python3Packages.callPackage ../../nixos/lib/test-driver {
|
||||
qemu_pkg = pkgs.qemu;
|
||||
imagemagick_light = pkgs.imagemagick_light.override { inherit (pkgs) libtiff; };
|
||||
tesseract4 = pkgs.tesseract4.override { enableLanguages = [ "eng" ]; };
|
||||
# We want `pkgs.systemd`, *not* `python3Packages.system`.
|
||||
systemd = pkgs.systemd;
|
||||
};
|
||||
|
||||
### Push NixOS tests inside the fixed point
|
||||
|
||||
# See also allTestsForSystem in nixos/release.nix
|
||||
|
||||
@@ -132,7 +132,7 @@ rec {
|
||||
};
|
||||
|
||||
# The makefile tries to link to `-llua<luaversion>`
|
||||
LUA_LIBS = "-llua";
|
||||
env.LUA_LIBS = "-llua";
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
|
||||
|
||||
Reference in New Issue
Block a user