Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
@@ -72,6 +72,8 @@
|
||||
|
||||
- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.
|
||||
|
||||
- `arti` has been updated to major version 2, which removed the long-deprecated `proxy.socks_port` and `proxy.dns_port` and the legacy syntax for specifying directory authorities. For more information, see the [changelog for 2.0.0](https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v2.0.0/CHANGELOG.md).
|
||||
|
||||
- `kanata` now requires `karabiner-dk` version 6.0+ or later.
|
||||
The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
|
||||
|
||||
@@ -81,6 +83,8 @@
|
||||
|
||||
- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md)
|
||||
|
||||
- `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/).
|
||||
|
||||
- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
|
||||
|
||||
- `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`.
|
||||
|
||||
@@ -384,7 +384,7 @@ let
|
||||
if pkgs.stdenv.hostPlatform.canExecute final then
|
||||
lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'')
|
||||
else if final.isWindows then
|
||||
"${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}"
|
||||
"${wine}/bin/wine"
|
||||
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null then
|
||||
"${pkgs.qemu-user}/bin/qemu-${final.qemuArch}"
|
||||
else if final.isWasi then
|
||||
|
||||
@@ -508,7 +508,6 @@
|
||||
"id": 5536808,
|
||||
"maintainers": {
|
||||
"johanot": 998763,
|
||||
"offlinehacker": 585547,
|
||||
"saschagrunert": 695473,
|
||||
"srhb": 219362
|
||||
},
|
||||
|
||||
@@ -19706,12 +19706,6 @@
|
||||
githubId = 9677399;
|
||||
name = "Ofek Lev";
|
||||
};
|
||||
offline = {
|
||||
email = "jaka@x-truder.net";
|
||||
github = "offlinehacker";
|
||||
githubId = 585547;
|
||||
name = "Jaka Hudoklin";
|
||||
};
|
||||
offsetcyan = {
|
||||
github = "offsetcyan";
|
||||
githubId = 49906709;
|
||||
|
||||
@@ -66,7 +66,6 @@ let
|
||||
serverExec = concatStringsSep " " (
|
||||
[
|
||||
serverPackageExe
|
||||
"--systemd"
|
||||
enabledConfig
|
||||
]
|
||||
++ cfg.extraServerFlags
|
||||
@@ -126,24 +125,29 @@ in
|
||||
Like upstream, the application option is a list including the application and it's flags. In the case of the NixOS module however, the first element of the list must be a package. The module will assert otherwise.
|
||||
The application can be set to a single package because it gets passed to lib.toList, though this will not allow for flags to be passed.
|
||||
|
||||
WiVRn has good default configurations and most options can be configured at runtime so it is recommended to leave this empty and try the defaults before attempting manual configuration.
|
||||
|
||||
See <https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md>
|
||||
'';
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
scale = 0.5;
|
||||
bitrate = 100000000;
|
||||
encoders = [
|
||||
# left eye, hardware; right eye, software; transparency, hardware
|
||||
encoder = [
|
||||
{
|
||||
encoder = "nvenc";
|
||||
encoder = "vulkan";
|
||||
codec = "h265";
|
||||
}
|
||||
{
|
||||
encoder = "x264";
|
||||
codec = "h264";
|
||||
width = 1.0;
|
||||
height = 1.0;
|
||||
offset_x = 0.0;
|
||||
offset_y = 0.0;
|
||||
}
|
||||
{
|
||||
encoder = "vulkan";
|
||||
codec = "h265";
|
||||
}
|
||||
];
|
||||
application = [ pkgs.wlx-overlay-s ];
|
||||
application = [ pkgs.wayvr ];
|
||||
}
|
||||
'';
|
||||
};
|
||||
@@ -206,6 +210,7 @@ in
|
||||
RestrictSUIDSGID = true;
|
||||
}
|
||||
);
|
||||
# Needs Steam in the PATH to allow launching games from the headset
|
||||
path = [ cfg.steam.package ];
|
||||
wantedBy = mkIf cfg.autoStart [ "default.target" ];
|
||||
restartTriggers = [
|
||||
|
||||
@@ -52,9 +52,6 @@
|
||||
++ lib.optionals config.systemd.package.withMachined [
|
||||
"dbus-org.freedesktop.machine1.service"
|
||||
]
|
||||
++ lib.optionals config.systemd.package.withPortabled [
|
||||
"dbus-org.freedesktop.portable1.service"
|
||||
]
|
||||
++ [
|
||||
"dbus-org.freedesktop.login1.service"
|
||||
"user@.service"
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "cadvisor";
|
||||
meta.maintainers = with lib.maintainers; [ offline ];
|
||||
|
||||
nodes = {
|
||||
machine = {
|
||||
|
||||
@@ -2,11 +2,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "docker";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
offline
|
||||
];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
docker =
|
||||
|
||||
@@ -19,7 +19,6 @@ let
|
||||
inherit name;
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
offline
|
||||
basvandijk
|
||||
];
|
||||
};
|
||||
|
||||
+35
-29
@@ -13,37 +13,43 @@ let
|
||||
{
|
||||
imports = [ ./common/user-account.nix ];
|
||||
services.espanso.enable = true;
|
||||
system.activationScripts.espanso-config = {
|
||||
deps = [ "users" ];
|
||||
text =
|
||||
let
|
||||
confdir = "${config.users.users.alice.home}/.config/espanso";
|
||||
espanso_conf =
|
||||
let
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
in
|
||||
settingsFormat.generate "base.yaml" {
|
||||
matches = [
|
||||
{
|
||||
trigger = ":nixostest";
|
||||
replace = "My NixOS Test Passed!";
|
||||
}
|
||||
];
|
||||
};
|
||||
in
|
||||
''
|
||||
mkdir -p ${confdir}/{config,match}
|
||||
touch ${confdir}/config/default.yml
|
||||
cp ${espanso_conf} ${confdir}/match/base.yml
|
||||
chown -R ${config.users.users.alice.name} ${confdir}
|
||||
'';
|
||||
};
|
||||
systemd.tmpfiles.settings.espanso =
|
||||
let
|
||||
confdir = "${config.users.users.alice.home}/.config/espanso";
|
||||
mode = "0755";
|
||||
user = config.users.users.alice.name;
|
||||
group = config.users.users.alice.group;
|
||||
in
|
||||
{
|
||||
"${config.users.users.alice.home}/.config".d = { inherit mode user group; };
|
||||
"${confdir}".d = { inherit mode user group; };
|
||||
"${confdir}/config".d = { inherit mode user group; };
|
||||
"${confdir}/match".d = { inherit mode user group; };
|
||||
"${confdir}/config/default.yml".f = {
|
||||
mode = "0644";
|
||||
inherit user group;
|
||||
};
|
||||
"${confdir}/match/base.yml".f = {
|
||||
mode = "0644";
|
||||
inherit user group;
|
||||
argument = lib.toJSON {
|
||||
matches = [
|
||||
{
|
||||
trigger = ":nixostest";
|
||||
replace = "My NixOS Test Passed!";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.mkMerge [
|
||||
base
|
||||
conf
|
||||
];
|
||||
{
|
||||
imports = [
|
||||
base
|
||||
conf
|
||||
];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
testScript = ''
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
{
|
||||
name = "flannel";
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ offline ];
|
||||
|
||||
nodes =
|
||||
let
|
||||
flannelConfig = {
|
||||
|
||||
@@ -3,9 +3,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "influxdb";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ offline ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
one =
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "influxdb2";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ offline ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ lib, ... }:
|
||||
|
||||
@@ -12,7 +12,6 @@ in
|
||||
{
|
||||
name = "mongodb";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [
|
||||
offline
|
||||
phile314
|
||||
niklaskorz
|
||||
];
|
||||
|
||||
@@ -3,9 +3,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "peerflix";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ offline ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
peerflix =
|
||||
|
||||
@@ -8,9 +8,6 @@ let
|
||||
in
|
||||
{
|
||||
name = "rabbitmq";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ offline ];
|
||||
};
|
||||
|
||||
nodes.machine = {
|
||||
services.rabbitmq = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2026-02-01";
|
||||
version = "0-unstable-2026-02-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "77f067eed8e0ea2ad9e86fbc690922f1f1671fc4";
|
||||
hash = "sha256-mIeTBcx3XK4V2+t4MGc8klhDODuDDACFlI/758zDLPc=";
|
||||
rev = "6fe60a669e8781d738150ad2353b87c1e1de7dd4";
|
||||
hash = "sha256-6hIevmWusjg8Wr9A5ov6RLovirtOIEhHtEYLQ7EHVh0=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2026-01-26";
|
||||
version = "0-unstable-2026-02-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "900e599dd26e4b292ff55738cc8881530eed46ce";
|
||||
hash = "sha256-9lr7RDSdQ/FN3mgoh8ZTsL1J8vXyab+TqhvM8yp7G7c=";
|
||||
rev = "b75abf3f5638df99d69fd9169a1a46bd325c98c0";
|
||||
hash = "sha256-KdRQPQiLnuO6RCsBjN7Ta1myrQtabrVf+rqlWypi/bw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "148.0b10";
|
||||
version = "148.0b13";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "ae20edec5b4fbeb8a55e3054c219734845fbd8eaee14e4e867df1979da508d3b8a1bc0bc22d8de677419e94ccdc06885c661494233c62615cc002874cc4adf0f";
|
||||
sha512 = "950dcb33c1d639ff54ae47c2573fbbdd9882b7d9cd7da0cab5f3fe891f2c466fb05a58fd74a941e887255b04f239eb39434f555c40999137e0ec3dbe1899c82b";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -32,7 +32,6 @@ buildGoModule rec {
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/containernetworking/cni";
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
vdemeester
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -60,7 +60,6 @@ let
|
||||
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
zimbatm
|
||||
yurrriq
|
||||
];
|
||||
|
||||
@@ -89,7 +89,6 @@ let
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
offline
|
||||
kamilchm
|
||||
illustris
|
||||
];
|
||||
|
||||
@@ -137,7 +137,7 @@ in
|
||||
meta = {
|
||||
description = "ZNC FiSH module";
|
||||
homepage = "https://github.com/oilslump/znc-fish";
|
||||
maintainers = [ lib.maintainers.offline ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -234,9 +234,7 @@ in
|
||||
description = "Push notification service module for ZNC";
|
||||
homepage = "https://github.com/jreese/znc-push";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/share/applications" "$out/share/applications" \
|
||||
--replace "/usr/share/pixmaps" "$out/share/pixmaps" \
|
||||
--replace "/usr/share/pixmaps" "$out/share/icons/hicolor/128x128/apps" \
|
||||
--replace "/usr/bin/" "$out/bin"
|
||||
'';
|
||||
|
||||
|
||||
@@ -67,7 +67,6 @@ let
|
||||
docker-meta = {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
vdemeester
|
||||
teutat3s
|
||||
];
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
mainProgram = "docker-gc";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = "https://github.com/spotify/docker-gc";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = docker.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -249,8 +249,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
dontAddStaticConfigureFlags = true;
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional enableDocs "doc" ++ lib.optional guestAgentSupport "ga";
|
||||
# On aarch64-linux we would shoot over the Hydra's 2G output limit.
|
||||
separateDebugInfo = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux);
|
||||
separateDebugInfo = true;
|
||||
|
||||
patches = [
|
||||
./fix-qemu-ga.patch
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "Script used to obtain source hashes for dockerTools.pullImage";
|
||||
mainProgram = "nix-prefetch-docker";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,9 +33,7 @@ const fixupYarnLock = async (lockContents, verbose) => {
|
||||
if (hash)
|
||||
pkg.resolved += `#${hash}`
|
||||
|
||||
// Rewrite key to remove git+ prefix and .git suffix to prevent yarn git resolver
|
||||
let fixedDep = dep.replace(/@git\+/, '@').replace(/\.git(#|$)/, '$1')
|
||||
return [fixedDep, pkg]
|
||||
return [dep, pkg]
|
||||
})
|
||||
)
|
||||
|
||||
|
||||
@@ -1,30 +1,56 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.25.10": "6ed1afe8ab7e186e94ca26c359c685d11394deb101f0d61d62ce00f1d29147edf04a441b532f2fd683484cd980973e41e0d9bca7a71fdf2d1bcf767d45d28d18",
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
|
||||
"@esbuild/android-arm64@npm:0.25.10": "3e2d57893179a673aebeeff8779e96532da0a9f204bd018f94fb7db258d65d1324e47c621a7d5399f5ae0a51337a44897e8e003d940d4120d749e57fb3b139f5",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
|
||||
"@esbuild/android-arm@npm:0.25.10": "c0785d963c24bab19a8a07cfa47c174d7be7bf46e329726686d743a14604b096f3a85f42807ff72dd918094d117396d3005ae88a20f15b2304691fa7d8d6b7fd",
|
||||
"@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
|
||||
"@esbuild/android-x64@npm:0.25.10": "f49fbfeb6f95589ecc152668266a28ce37cc24c10756c203898be07af127b09eaf077428cef86dbcbd6f207706e8917dc6d354558afcf5cf7c532ea882b13779",
|
||||
"@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
|
||||
"@esbuild/darwin-arm64@npm:0.25.10": "2d049309a05272607dda18f59ce0b262ec1ae383133697b7a0c013c0835ec72910f61fd17a1be744c17562a092b1fa0a945ee1bd2cdcd029922c6401727a46b0",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
|
||||
"@esbuild/darwin-x64@npm:0.25.10": "4eae1ae1486307a9cdc521e0416f28dff3f2693d051c81de15378bb100aef809f862526cb9c03360db69aa6832762b01b955f0a8bbcf8adc191af87d9f0e4e4f",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.10": "f4915a93ba262028f30fe5d87210ef84e1fa725cb76fbc4ab9c72c4d6a862d79c6ac2c54f6e606a8a53ab1ecf53c21fb5064571147e8a9a10aabf1a7d95f32f6",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
|
||||
"@esbuild/freebsd-x64@npm:0.25.10": "94628bffea4936e26570450348be6629b1872ad73cc4af7efdc2bd29ba95a6f3bcfd87b3ce0371f61fee22bbfa5e6f9e148a6c6b8c62c5b32a0786ec4ba7b789",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
|
||||
"@esbuild/linux-arm64@npm:0.25.10": "ec1d900010bba313b403a7350a87e10ad0eb390373b290158e98902cb3ad15738596af7ad188942db1fec027b9e73336f193d8bce821097d13c224ecaa832550",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
|
||||
"@esbuild/linux-arm@npm:0.25.10": "5459fc95b966199b27060a0926d5a1822d4c7f4132150fbbdee99eb3960b8cef8314c451c4f8c4d02e39c12b36267bbd59f030fda8a9b512ca2bd44dbb4bafe7",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
|
||||
"@esbuild/linux-ia32@npm:0.25.10": "283430e003d45a698a3d5a4e1ccb243f0134679fdb839c4ef1b48c79b2d975969fa676e261a772eaa3042a9870f7392930974cca0a779ee9950698607d174c48",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
|
||||
"@esbuild/linux-loong64@npm:0.25.10": "c8ae07926c5d31f66ae81db3267ae62c4f844abb87188a901c91f9ab7b8a88d381152a59a89c1bfef61459dafc0a066f722b3c410ef07801d2570c1497477b44",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
|
||||
"@esbuild/linux-mips64el@npm:0.25.10": "cc3828db4e00fe8ab932c896628cd193aa40dcfb03584f776d3b6be141691f2b0379b5a3070cba56375b00181a13ed955d70e2f2f3c828a5a794ac9eb06f6a07",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
|
||||
"@esbuild/linux-ppc64@npm:0.25.10": "7f2995c79a76ed739fe85773cd9933f90ef50c003b3cd340db9c738e714e05698d48b355d0495ffef92f7444018454c1c7072992e5411e9466856388b24c1417",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
|
||||
"@esbuild/linux-riscv64@npm:0.25.10": "3cba9a06e732e4c86f943699e47a2ac7dcbd225b753d2d004179069c860013a340033f1c7990e5adb62fd0930d6982baf43ce4f4e85a2cbd0d11eda30d7fdb54",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
|
||||
"@esbuild/linux-s390x@npm:0.25.10": "b3e46636050ef3fbd80696545c84fae1969c3f58b0004af07044051b88623601da280d32d146d1f7f2b534ddff764e26dfd0baa6fa098e4379d8b7c476d7b631",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
|
||||
"@esbuild/linux-x64@npm:0.25.10": "c677043cba5cf7c1953429d09ed5efa23d6cad209feae2080c3ab14b2f30d56a926ea4a5bc3cd3fa20cfdc3e2c6bca2eaa68e91ee92608819d02aba6c6beacbd",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.10": "28049c2ad9a67b366a843931742d6a5bf535deebc0b5f6918ee69980ee35a4f16d38f1e4dc2bbb1ac00e852bebb5268fff9c41939ad81bc28e4d65ad9143e51b",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
|
||||
"@esbuild/netbsd-x64@npm:0.25.10": "36d4e9ab1b9fc28b26e571b72ec4baeb639e3596a2ac7cddb86c9c812c550fbe8f860abf4915f1053280b904f1a99fd26b2d1cde3c899ba33d394b6d0bdc383a",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.10": "d477b47a4c4201c5c4b53d14299abace47f54d3f9311534bf667b14f3935cb9bfe40724e758c1ad595e29b8e8b2cd331de0d7c4a84da290261f6a48f94eb489e",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
|
||||
"@esbuild/openbsd-x64@npm:0.25.10": "15f4560420b57e548f26913d1bdbd00ae6535d912ce87b7e8e1a366b754511581fbfdf192c5622b1757bb56b082b316336853dfd6f6140a2b4c002c4ceaaff5d",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
|
||||
"@esbuild/openharmony-arm64@npm:0.25.10": "3dd9f05a63e4bcb67a9097663c03b7d917bd1ae8338bafcd2f0cd788d672d729451ad41b993567ef067c49acf8581fb2bb949a4434e48b9492b6087c2a28032c",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
|
||||
"@esbuild/sunos-x64@npm:0.25.10": "1733bda6f4f5e13aa764ff27e454f5876ff72ed36bf94600a98791c678831c736f66130d527fa330b7f6cbea3d982491e8454f65a84583eb5da85588dec260fb",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
|
||||
"@esbuild/win32-arm64@npm:0.25.10": "16fce99202539f6319f439a0db7b078b95ac4f18c1d9736a6fe0cbea1e88faf725e798af2f1a5ff3f39f9b47eb2fc70ec78b1b5dae35d06682748b245096a2e8",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
|
||||
"@esbuild/win32-ia32@npm:0.25.10": "c6db22bb001c8da006ee83b622b2ae2403583f1bc8e11ae88190801fb19e1c16da6e2356a15b0534463aac1170d6208a230a5aa26cacad4e85fda9991b77a389",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
|
||||
"@esbuild/win32-x64@npm:0.25.10": "ec3c325501843d502292cc36a6ddb08ce13fdf5accc5c73b3c2084e6862a757edc4f46677ae5c9c32a0087fcbff2a894181b7e1881137641cc91a2ca146d7cc2",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
|
||||
"@node-rs/jieba-android-arm-eabi@npm:1.10.4": "60a55caf33f914d1b6b2947c88ea5fa9a58a84d2bedfccb8639162991b9092ec86964b64979c0ca0cf0d5e5be2766236a612b67ea03b3b3c4ec4d608dde2475a",
|
||||
"@node-rs/jieba-android-arm64@npm:1.10.4": "e54d5d1c8fab348ef86c1e0aaf4aea8e2e52924ac1c4bed6ef76588b7446122c332b593e4b471b3268eae4386ab991e9eb0337962b8f17bd2dafa1baf1b7c755",
|
||||
"@node-rs/jieba-darwin-arm64@npm:1.10.4": "6ec6503fd063d03c0284210b869e31b8db306777ae7acca8be3a9fa979f57cb7729a35723eda3c76ed6366e7b4022c4b9c5f350ff65cd82925f381965640999c",
|
||||
@@ -39,22 +65,22 @@
|
||||
"@node-rs/jieba-win32-arm64-msvc@npm:1.10.4": "68146cf2b5324c461847da9fd36aa851aeb5655f94b0178a194630c80926e914b71f5fe60a6853c9197516e2b2680303bf28c405963f8655d0099d335c5178bd",
|
||||
"@node-rs/jieba-win32-ia32-msvc@npm:1.10.4": "38deadbf93c6ffb410a880f8938034635e2ca755b956b7cf0b751f287dbfb4b5e58a492f532f23b30e77a7b3889467055c4d9be4d76df8c4416d97f96c242f93",
|
||||
"@node-rs/jieba-win32-x64-msvc@npm:1.10.4": "073b499e19d211f416a604a791c7a29c99552b328d0565d8381258a49682f87014274eebdaafcc9477238a2fd555b0e18fedccb45a49715ad3332958c6f43905",
|
||||
"@oxfmt/darwin-arm64@npm:0.17.0": "71b9edea8adcd27da7dbf6fd9d9307aa2721c644ad8ebc75cc7ac94872223c3e1364fa323d979a20a483ac39e0a36dc0cf4ad5d47516a23b4d8321d4a1f6633e",
|
||||
"@oxfmt/darwin-x64@npm:0.17.0": "4c853c87f8db467c463467062eb7f083d66a5d2cd7b8aa260f62d6d1567d9cc43848f8a07fc5e98fc2376c69689098e98a90b7eb382ddab63cce23d74eae7ab6",
|
||||
"@oxfmt/linux-arm64-gnu@npm:0.17.0": "4fda05a45aac1872af2545aa66f5025ae1048277400e56aaf2fa230858d4d2dee660a095858238d14a733fe5ab2fb4630c9e4d74ac8dcccd71423b5288868629",
|
||||
"@oxfmt/linux-arm64-musl@npm:0.17.0": "3cf4c2750cc083464cd77d2f083ee0ead99a1a95330e0129d6145189d16f7a51714e61d3ab231e3a456fe09726d097d39cdcdfee3bbfae31a01a25b188049d59",
|
||||
"@oxfmt/linux-x64-gnu@npm:0.17.0": "4ff9bbf38f689e6cc4da94618249cce9c2793e0a5aea4e443d248379f3917de8fbda2b6efe847daeff52b9fbb6fe83777290168b53065eb07a0bf6ebd5f51bce",
|
||||
"@oxfmt/linux-x64-musl@npm:0.17.0": "8415da3d577bbbb95e0c590dd0ce2c9dc274ec415825c6983295635ef5a3b85de9506e970512795ee3a6f5f2ea13b55f17cc929d227248a685377fe2a696c54e",
|
||||
"@oxfmt/win32-arm64@npm:0.17.0": "9099a962667f5ae861517b8e8497ca535038b232a9018882b0ad5a033e7830ab462717a04797aa1da89f0da9b733e22f41762bf69f277ce5865a0e6a5256d5d2",
|
||||
"@oxfmt/win32-x64@npm:0.17.0": "02f95c2034b3a805d9c1e45c4b3bb957a775830ee9a31a253ea3fd8ca81f03ea50a89ba6ed06c03ec96d1094cec2be81e7ebf936c16a7d410e41caaced398899",
|
||||
"@oxlint/darwin-arm64@npm:1.32.0": "2de9d433150abc903561ff2dd058620233033647458554ac9353264e0aaa0e6ae31adcd82c67f93f08a793e578f99a05a98861a1a666f57b8fb2bcf2ec994217",
|
||||
"@oxlint/darwin-x64@npm:1.32.0": "ab6cb1af8034e49b9ef7412da12d10f93b1f0bcc50d48a5d4051f1f519f27e23ed357cccc8e74068d10b5980b667f773658f2cd1877c5d64bccd6d2a02d4589a",
|
||||
"@oxlint/linux-arm64-gnu@npm:1.32.0": "ee1b2046013e6c3f4ae6b16d87a83714ddc421a331221b884c885d46236b41a5394e8c2e6430079a5fafb874e02d70ce3953b119a9314253c48fbaaed0f73138",
|
||||
"@oxlint/linux-arm64-musl@npm:1.32.0": "21a5e03fadf0329fd570f6b0d5030134a182b56c3c76f6d45040718f441e6b7dc9faa4df28c89c03e0f00c6e1b8294619d91fd2acd2aa058895b6435b4c565b5",
|
||||
"@oxlint/linux-x64-gnu@npm:1.32.0": "e01e573538868746624ae2a45f70b9162a86654961f5baa31c76250414ffc9f46bfb277020e1af4b0c29707e388bcf3e5f299850b318089786bf56f098980fba",
|
||||
"@oxlint/linux-x64-musl@npm:1.32.0": "96f033d22630060c83eb24675fa0bfbfa6be72b1fcd735c9423a2c4300878d4051119115881058b87ceba0bd555f35c2282a6775f19567d5799909520b8a1f25",
|
||||
"@oxlint/win32-arm64@npm:1.32.0": "7d17c307a56703016e99638be262225cbecece4d4a43005cb9cccd08f0d9c385de33331a60984e855ecb5ab3de2b461ad15f095efc59251482ee9e0b6ea41a58",
|
||||
"@oxlint/win32-x64@npm:1.32.0": "b646ba637dbe9c742157b56832f49cffc80b59b28ba48f9cbf34ac59e25c219fd1795e395c68b8941199dbb5bdf78b86b0545b0baf8232b77f4fed8e0f50e027",
|
||||
"@oxfmt/darwin-arm64@npm:0.26.0": "7935654492f237b7bd24ee1a08c6455d797a97f435e93490e9a315858b4fe3cd961bbd9c81e951de8c0383cf094b0f816b316a2ff26bd1dcec3016c53b4036f1",
|
||||
"@oxfmt/darwin-x64@npm:0.26.0": "b375a2b7fe93831a1d517ce86fd275c2c67ace54b8b5de8b4195006863b17f0fe99854dd09d364000ef0a0797eaadf97476e5d30e6eb94988062851c8d3dd635",
|
||||
"@oxfmt/linux-arm64-gnu@npm:0.26.0": "a5239df32f8512334652ebc271df540e48d72e3971f6d363aab76085643f2f4324a5f5ec0c2fd3ffb8c1e84b482fc1835ac481f16790f9d2c8a9c2e70494ecbc",
|
||||
"@oxfmt/linux-arm64-musl@npm:0.26.0": "20365527d2d4fd48cd04858ab228ca62df0a6c43c6bc1b483ef42feb71c0ad54bf70b847b2495e4509843bbad8f0b82bad026d565b7890695e42f1872334cf46",
|
||||
"@oxfmt/linux-x64-gnu@npm:0.26.0": "8a0e58fc960d350c00fed4ffbc48572bc8916ffc5c837512c4b397cf91deed916410ca8353a99536943a62e45f5afaf3ed6ec7ba286be35377906eba47064936",
|
||||
"@oxfmt/linux-x64-musl@npm:0.26.0": "de6737ad58451a8203f1c5c8af797080ea9f8efdc52d00e8ad20ba3855cfdaf796cdb6840e5ac0407873aaadae680bb038313a52218332748ff470b4981e7ee5",
|
||||
"@oxfmt/win32-arm64@npm:0.26.0": "d70bf0c6117170dd3ce739276352baf59907b74c91e957f0b0fe231f12c2d459eaff37cd8e15a6c9e74c6af98cb5fbec8222948a35f9536196417b74a864c2d8",
|
||||
"@oxfmt/win32-x64@npm:0.26.0": "8a1dfa4ad594b174f44c9e5a37db585b29c2022c39609007eefb2c5705325268dd88b1bcd98087c87052d48b350205f4997b8a3763f532820491354036e2cfa8",
|
||||
"@oxlint/darwin-arm64@npm:1.41.0": "f89cbee9ac6b471aacc5f7f9ccd83488768c962da0efffbb87f3c74cd4916744119b553435900d6370c340e0f2d26641d44f073d0394a55667b1f3dda7a4f311",
|
||||
"@oxlint/darwin-x64@npm:1.41.0": "21f664015813c05f24aeeab89f1819c5b8ae732ccdce3aedf1a8e1c87db3784acd51f9c4e4a1b7368d7fe62ce22e0f5230abdbd3bbbeb01c3b9c2a0a03c5688d",
|
||||
"@oxlint/linux-arm64-gnu@npm:1.41.0": "6b4f5aa8d658f46989febb54256ab23f3ac98a74d2f23607df97af405f07a62b4e734e138dec94508057937988da33d169e91a69a016b6bfc832ed5412faa311",
|
||||
"@oxlint/linux-arm64-musl@npm:1.41.0": "3b35d850ed96305fdbb565bbcf065796558624107456c28dee1728230f53f6e10d39564b86c5c716b11d6056fe75614358e5c607ce186084ad077fc298336c80",
|
||||
"@oxlint/linux-x64-gnu@npm:1.41.0": "d8788979fa8a7fc4dc1ceb5e382c470b2c41a0dafc75c528792b87290466abe5f26ebca4c7aa286a90ee88852dca801bd168a6756eb8fda1a08faf3443f5aff5",
|
||||
"@oxlint/linux-x64-musl@npm:1.41.0": "892e3141ff0187bb0e94775dffbd9781888f771819089d7d4a01429539fc2c9e94c48a25c4998db8d426e49f84d453a108ed2c35056938ff7efd1e1f5fcafed1",
|
||||
"@oxlint/win32-arm64@npm:1.41.0": "d4a8dfca1ded97ac0394636d77afeea997b1133460dd4f746dfe722827d14d98fa7a4e3a1e1dcf42d1f97654637c99c329cd051ffcec793619c46b017526097d",
|
||||
"@oxlint/win32-x64@npm:1.41.0": "522705b9fda83477ca691f3cfd139d32cd0dd177b318fb4a98ca55af4ba3c120ab45104ab10194ac81d191cc575d898c768f25ff23c73604a03f4c8ee1ddc412",
|
||||
"@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
|
||||
"@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
|
||||
"@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
|
||||
@@ -88,16 +114,16 @@
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "d4c9002b95c4b6ee842faaa5087582a0772578c0969c9ee470697a6d3fd251845481285f5a4027bc8c0524bf277f3437844cae9936c5f96ca753dcca61e2f47f",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "446e3ce5b037d1847af84e9a2b52734ae9f5425937fec2558d26ffb5c253dd8925dc35591abd78b0d43f7154222e47ee9aaeb3b167b3d69627805a97c5147185",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.40.1": "39fe3c6b86ef880fb1d1261f6096d19707584c628271d6ae01f5a5f50d8a24ef62128b5929064c0aed4390c7c0c0b7cc9590e300fa5f10ed624816748da2fbb2",
|
||||
"@swc/core-darwin-arm64@npm:1.15.2": "811bb38ede1d92045c3c84169f7b2202bbf7caf2745d26cb9b141cb188465dd94a700733b0d9dc8a97590d9ebb1a92ef5ed40346d3fac7f88832365cca5d2678",
|
||||
"@swc/core-darwin-x64@npm:1.15.2": "b0fce366539c7daae5aab6041f10e9e70a767b277fff0f6ad3fea09b46d95f0208961ce1c6a0a55486718a3997ffa8dc38bd03030faa09395f9261792a42752e",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.15.2": "b55975abf42d5af0db4a149ad5e8a4935619473517acfccba978d90a300f5d97c4b883f2c3fe95bce57be36b0f0d21ad889a681f492e9e1338a87751d9858602",
|
||||
"@swc/core-linux-arm64-gnu@npm:1.15.2": "6345874a4385e8a1793a2c80b1e20e7883faed348e118619420c58cfcf6f7106ce76b179c10220f8fdccfa92bd5ca45c3749bc2e36075e8684b58df367a714df",
|
||||
"@swc/core-linux-arm64-musl@npm:1.15.2": "7b1d51d7f566e42b178b49dd8dde9d630afc6e5d9cf89dcee1af39ad9c1016759e9cc5da37b58c52df50801c3a410edf0c00cc1a7f7ac93027a0628b5a5d05f4",
|
||||
"@swc/core-linux-x64-gnu@npm:1.15.2": "5e888708763bbe3ddf4e7c4f6de75247ca3eede869fc7964999c7e950ffeace38e36f50ffd67e4644055913a0af5d18dab895c701cf94c83321a48c31044d26b",
|
||||
"@swc/core-linux-x64-musl@npm:1.15.2": "aadabca760a39a4f4425b83557a836960998d250f7c0b5e3d8104bf4e9597cb00539d89461678dc592053d68dc0bfa4da64de215b5af74890cd1d455dec90728",
|
||||
"@swc/core-win32-arm64-msvc@npm:1.15.2": "1c009bc927578943b5e08f43ef69dd6997545feeaedacc7fcd415e5a6e7d669186f0591f1e3617b0218a67567216dfa134d77c133a75f44c8f11f44d52c73532",
|
||||
"@swc/core-win32-ia32-msvc@npm:1.15.2": "88e9beeafa768fb212a64b0652f66d2aa2f6728a0309ce6f8962200d65ff370638578f13b783a83d499e91ffafbfeb9160b3a5fb37521d1120b506e9ddf1e89e",
|
||||
"@swc/core-win32-x64-msvc@npm:1.15.2": "df51454cdd0a5ea999d267a3230e9c51daef93f0fefec3c3aed5d3f8c8409f89514971edb99270fece2e3342bccf3c55a28a32a87e5cd250f25c2410218ddb8f",
|
||||
"@swc/core-darwin-arm64@npm:1.15.8": "4458d26f6682bdbf88565d548a04f6e8ed81ea05691204703a511adf4d4ef1889883da727349b5e492b2e53a4f2969fd06ea34f84e32cc5a963ac25194d6caa1",
|
||||
"@swc/core-darwin-x64@npm:1.15.8": "4075f73359b4cda8d7bcc68a636fbff60db3dea0ef4813b7e1a5ebdaa2c1197b4f888f7565a411f77ee5e8fe2398e3f1c27dfe06b2b087e7004009aeefac2019",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.15.8": "6b82976fd35007ac7be41a7d8529dbb0c93bfa858e532c6a8d3fd899c41ecc9976fa40746f6005cd48d82340fcdf0a426296bef248ac7b77334c3744141fa823",
|
||||
"@swc/core-linux-arm64-gnu@npm:1.15.8": "ed3a8f363bc589886d44db58dabe6d53ce23d2cb8fe93a80fd05dd1ff46ebf438d2f1d38cf4144f4d5b89504dc73d15bd84540ac23b20d4aeb4f463de99c416a",
|
||||
"@swc/core-linux-arm64-musl@npm:1.15.8": "b063f086e3e92f622fd8fb1585bf0cf0b49eb910361844a4bdb0d0165fdb906fe53051cfbcd92ccfcbfb13ae6c0d85f2c12e373a01df5a4136b513ae94d7f626",
|
||||
"@swc/core-linux-x64-gnu@npm:1.15.8": "7028720f8aa475896f0468dcd77cc2512362082357e4e89d6e31ec559c87d25f0f9d7fc1702d59766217ea4ee7cfc0d1de817fde56958537f8f3ed9259673b55",
|
||||
"@swc/core-linux-x64-musl@npm:1.15.8": "be913db41e70ae8b9553a759f7a9cc80e50c4f521f058672471a182938c3789605c2122c77c32579d2b739ba4f91fa7e8beb8be31f87858e9b52e199c6644e0c",
|
||||
"@swc/core-win32-arm64-msvc@npm:1.15.8": "7047d7250e10577921b9250985c8e4408767fca73963b594f1e747f64e77eb5e2a4d2067a58debca9d33b2fd69385fd56410d5dca0e15bb6957aec9475909809",
|
||||
"@swc/core-win32-ia32-msvc@npm:1.15.8": "4992c3c2fe8fc0dd870319080b806e965278a07d23d0463b16b2c95d0299c0b2e03a1b7bb84c7da41002556b8a71f86b721037e743648321c2186d68bd2b4e32",
|
||||
"@swc/core-win32-x64-msvc@npm:1.15.8": "4faf5a9cbbe7e7afc038aa26ec658e41614c06116265be1a938e91839b027e1a847a0a767d9821165693f84fb98700032ad92830fee875164b672ac2024a035f",
|
||||
"dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
|
||||
"glob-hasher-darwin-arm64@npm:1.4.2": "1abc74c6f6c6251b8bea6e412090eff4e4918f3489a371971840ee81534344b9f9e62a610efb98157970fc46561161bf23382c8572578da98a7e884d6fb6853e",
|
||||
"glob-hasher-darwin-x64@npm:1.4.2": "44110045f0b2e0b3abaf4f70f917a3c57b9b0c6ee56e5d02932e1772cc63a36b066fb3bc1e6a275c40978b3b2d2ad62752e899bcd966930d4df8884b1d554764",
|
||||
@@ -105,4 +131,4 @@
|
||||
"glob-hasher-win32-arm64-msvc@npm:1.4.2": "809cd80c3e3e6e7bb82e2fc2ba917ce3ca91287a83faaa7b63cf0a1fcb14c228e974baffb731fa82c34dd8a9236622ab2b5238e21b62f8b0267adaa2da7b4de6",
|
||||
"glob-hasher-win32-x64-msvc@npm:1.4.2": "1ab2a78b788b21754f656cae706fa2e1db34185ffef79a6b85d3f24e169bc01e1faadc6a2588eef5fde5a1fe6ced68acfb815c7b03024c0a746e7c5631b0959e",
|
||||
"iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"
|
||||
}
|
||||
}
|
||||
@@ -13,13 +13,13 @@
|
||||
let
|
||||
nodejs = nodejs_22;
|
||||
yarn-berry = yarn-berry_4.override { inherit nodejs; };
|
||||
version = "26.1.0";
|
||||
version = "26.2.0";
|
||||
src = fetchFromGitHub {
|
||||
name = "actualbudget-actual-source";
|
||||
owner = "actualbudget";
|
||||
repo = "actual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WjWmiosDgEj3vTsOIKysR5HrNzkApQppUsdSil4Umbo=";
|
||||
hash = "sha256-fnfDPN/9TfV1v/myNvCQ70Q0T2oW9XIyomsMdQKyoJo=";
|
||||
};
|
||||
translations = fetchFromGitHub {
|
||||
name = "actualbudget-translations-source";
|
||||
@@ -27,8 +27,8 @@ let
|
||||
repo = "translations";
|
||||
# Note to updaters: this repo is not tagged, so just update this to the Git
|
||||
# tip at the time the update is performed.
|
||||
rev = "813c3d7cc8feb667c0ea3c25ba13156d75475cfe";
|
||||
hash = "sha256-Qv9FFQCZv6WxYffP1W8Hdw15NDiGhkTeAUbyrOV5wxw=";
|
||||
rev = "a7a0edce994520f3d473c92902992b4eccb81204";
|
||||
hash = "sha256-Kha3kPt9rKaw2i/S0nOOVba9QwWtb9SJV/1qs6YJHRE=";
|
||||
};
|
||||
|
||||
in
|
||||
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-7CxsRmuA53JZJa8IznJKGVvHzE7CeM7XklIZznRqXis=";
|
||||
hash = "sha256-7ZZGtwQM9+odozLi95MFshNjde3oFTgWkgimj8Ei2W8=";
|
||||
};
|
||||
|
||||
pname = "actual-server";
|
||||
|
||||
@@ -13,14 +13,13 @@
|
||||
unzip,
|
||||
typescript,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "angular-language-server";
|
||||
version = "20.3.0";
|
||||
version = "21.1.1";
|
||||
src = fetchurl {
|
||||
name = "angular-language-server-${finalAttrs.version}.zip";
|
||||
url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
|
||||
hash = "sha256-o3e2qVKw/sfnFHbHHdRlB9UjEx1KLD1KVoaAsnlYjmY=";
|
||||
url = "https://github.com/angular/angular/releases/download/vsix-${finalAttrs.version}/ng-template-${finalAttrs.version}.vsix";
|
||||
hash = "sha256-o8NOyQOFnW/sabwvyeIYcOxtOz9sKsIHqRImkT1Mbzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -70,8 +69,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" \
|
||||
''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \
|
||||
-Lsf https://api.github.com/repos/angular/vscode-ng-language-service/releases/latest | \
|
||||
jq -r .tag_name | cut -c 2-)
|
||||
-Lsf https://api.github.com/repos/angular/angular/releases | \
|
||||
jq -r '.[] | select(.tag_name | startswith("vsix-")) | .tag_name' | \
|
||||
sort | \
|
||||
tail -n 1 | \
|
||||
cut -d '"' -f 2 | \
|
||||
cut -c 6-)
|
||||
update-source-version angular-language-server "$LATEST_VERSION"
|
||||
'';
|
||||
});
|
||||
@@ -79,9 +82,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "LSP for angular completions, AOT diagnostic, quick info and go to definitions";
|
||||
homepage = "https://github.com/angular/vscode-ng-language-service";
|
||||
homepage = "https://github.com/angular/angular";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
changelog = "https://github.com/angular/vscode-ng-language-service/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/angular/angular/blob/${finalAttrs.version}/vscode-ng-language-service/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "ngserver";
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
yarn-berry_4,
|
||||
runCommand,
|
||||
|
||||
wrapGAppsHook3,
|
||||
|
||||
swift,
|
||||
|
||||
mesa,
|
||||
@@ -144,7 +146,9 @@ python3Packages.buildPythonApplication rec {
|
||||
yarn-berry_4.yarnBerryConfigHook
|
||||
imagemagick
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin swift;
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin swift
|
||||
# Needed for when Qt uses a system's GTK file picker.
|
||||
++ lib.optional stdenv.hostPlatform.isLinux wrapGAppsHook3;
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
@@ -170,6 +174,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
dontUseNinjaInstall = false;
|
||||
dontWrapQtApps = true;
|
||||
dontWrapGApps = stdenv.hostPlatform.isLinux;
|
||||
|
||||
env = {
|
||||
# Activate optimizations
|
||||
@@ -282,6 +287,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''"''${gappsWrapperArgs[@]}"''}
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--prefix PATH ':' "${lame}/bin:${mpv-unwrapped}/bin"
|
||||
--prefix PYTHONPATH ':' "$lib/${python3.sitePackages}"
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.15.8",
|
||||
"vscodeVersion": "1.104.0",
|
||||
"version": "1.16.5",
|
||||
"vscodeVersion": "1.107.0",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "44afc76e06599b5eed8eab68db3d2c553c77ea6b9cc7652250e3d1a58bbb1498"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "1953c62452d32a72e595f7fa832c7a7ed9072d22c9cf99df3a22c249a97f5e97"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "a39cb7fb78eaceb939e82cf8024fc7e16694a61b32d2af61ba414fe4284e41cd"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "b828e4a6e5133283b418a3e2afd2f97111ffc804cc2eef56c0e2327396b8ad97"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-x64/Antigravity.zip",
|
||||
"sha256": "2554e90087f83e92655650a66d51f47c5577fade58627d5ec8b4221e5ed62ed8"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/darwin-x64/Antigravity.zip",
|
||||
"sha256": "6d859d2427ac9f4cbd435e1568d6a626186e153f38263c4dd3e1c16672f79005"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-arm/Antigravity.zip",
|
||||
"sha256": "cc3199592ff91325e395ba9fff1a0cd9f3c709bec52ec36d30f27101d6231239"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/darwin-arm/Antigravity.zip",
|
||||
"sha256": "4b4ece88e76e01ffe7e774a8eadb21134011d0177adb90464ef8f6c2102ff45d"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${finalAttrs.version}";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "arti";
|
||||
version = "1.9.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
tag = "arti-v${finalAttrs.version}";
|
||||
hash = "sha256-b5DWu38/iKwKcmp4BNgkeE5F522YRZZiev9gUZ/Rb1E=";
|
||||
hash = "sha256-eqCQwBP/QLxBwjGvksFwNwNSCng/pf19DiBQ+tA4a7M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SGxSZaY8//FHhySbarfgleafF5YEWJW/fUAwo3576NI=";
|
||||
cargoHash = "sha256-0CxlvTetxXM+xe6r98T6hzoD/IGfYkI9TqqUe+u1U2I=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
@@ -79,6 +79,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ rapiteanu ];
|
||||
maintainers = with lib.maintainers; [
|
||||
rapiteanu
|
||||
whispersofthedawn
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://augeas.net/";
|
||||
changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${finalAttrs.version}";
|
||||
mainProgram = "augtool";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
replaceVars,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook3,
|
||||
gawk,
|
||||
gtk3,
|
||||
getent,
|
||||
nixosTests,
|
||||
@@ -72,7 +73,10 @@ python3Packages.buildPythonPackage rec {
|
||||
|
||||
buildInputs = [ gtk3 ];
|
||||
|
||||
propagatedBuildInputs = [ getent ];
|
||||
propagatedBuildInputs = [
|
||||
getent
|
||||
gawk
|
||||
];
|
||||
|
||||
postInstall =
|
||||
# copy script manually
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
_7zz,
|
||||
fetchzip,
|
||||
curl,
|
||||
cacert,
|
||||
xmlstarlet,
|
||||
@@ -12,14 +11,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bartender";
|
||||
version = "5.3.7";
|
||||
version = "6.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "Bartender ${lib.versions.major finalAttrs.version}.dmg";
|
||||
src = fetchzip {
|
||||
url = "https://www.macbartender.com/B2/updates/${
|
||||
builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
|
||||
}/Bartender%20${lib.versions.major finalAttrs.version}.dmg";
|
||||
hash = "sha256-8hOe8MTDGyxEZTv0QndjkD3BEJ6kOHcbeU0uhat/N1s=";
|
||||
}/Bartender%20${lib.versions.major finalAttrs.version}.zip";
|
||||
hash = "sha256-UtLTfRhL7JTYzQXf7kyYyGZXy1TLJ0ODk1nRs2pLfQ4=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
@@ -27,15 +25,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
nativeBuildInputs = [ _7zz ];
|
||||
|
||||
sourceRoot = "Bartender ${lib.versions.major finalAttrs.version}.app";
|
||||
appName = "Bartender ${lib.versions.major finalAttrs.version}.app";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications/${finalAttrs.sourceRoot}"
|
||||
cp -R . "$out/Applications/${finalAttrs.sourceRoot}"
|
||||
mkdir -p "$out/Applications/${finalAttrs.appName}"
|
||||
cp -R . "$out/Applications/${finalAttrs.appName}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "beancount-language-server";
|
||||
version = "1.4.1";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarmutex";
|
||||
repo = "beancount-language-server";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cx/Y0jBpnNN+QVEovpbhCG70VwOqwDE+8lBcRAJtlF4=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HQXLPXs/huoFSM0tqs8FN/hggJauMwef7SbLb2tZoZc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-P3Oug9YNsTmsOz68rGUcYJwq9NsKErHt/fOCvqXixNU=";
|
||||
cargoHash = "sha256-Zdz+zn8oZnLAarQySVpuBK+Mwf21Bm7Ug9ECNwlAZYs=";
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
|
||||
@@ -32,7 +32,7 @@ buildGoModule {
|
||||
description = "Time Series Alerting Framework";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://bosun.org";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://brig.readthedocs.io";
|
||||
changelog = "https://github.com/sahib/brig/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "brig";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -38,7 +38,7 @@ buildGoModule (finalAttrs: {
|
||||
mainProgram = "cadvisor";
|
||||
homepage = "https://github.com/google/cadvisor";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -70,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/karlstav/cava";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
mirrexagon
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk8s-cli";
|
||||
version = "2.204.5";
|
||||
version = "2.204.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk8s-team";
|
||||
repo = "cdk8s-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WZtS/X6E0/6g/XKbhgUs3Phd+EUhOAksj6m+x7nOFvI=";
|
||||
hash = "sha256-+VY9vGGb/Fk2YhqDLDsdA/2jjKsiyGEOgaY+YNr0LCo=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-Y7Bsw6fmLOOjUG0i73Exp++UFFKFa2b7JL55O8Tb1mc=";
|
||||
hash = "sha256-BFkXKEpK/iTaO7MnkqyTt0VX+yYbSy0y8eqrQb88JdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -73,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/ckolivas/cgminer";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
mmahut
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
mainProgram = "cloud-hypervisor";
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
qyliss
|
||||
phip1611
|
||||
];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cloudflared";
|
||||
version = "2026.1.2";
|
||||
version = "2026.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DOLCgCZWdxHnwtQ+nD4mJX7y/1BHZkcmDCVHuwiKOlA=";
|
||||
hash = "sha256-UYMFajks3KThWq36BrRnKJk8y8H9s4hIRuYEnftcm50=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
acl,
|
||||
bash,
|
||||
cockpit,
|
||||
coreutils,
|
||||
fetchFromGitHub,
|
||||
firewalld,
|
||||
getent,
|
||||
glibc,
|
||||
iproute2,
|
||||
@@ -15,7 +15,6 @@
|
||||
msmtp,
|
||||
nodejs,
|
||||
openssh,
|
||||
python312,
|
||||
samba,
|
||||
shadow,
|
||||
smartmontools,
|
||||
@@ -27,15 +26,6 @@
|
||||
zfs,
|
||||
}:
|
||||
|
||||
let
|
||||
# Using python312 because py-libzfs is not compatible with newer versions
|
||||
python = (
|
||||
python312.withPackages (ps: [
|
||||
ps.pyudev
|
||||
ps.py-libzfs
|
||||
])
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-zfs";
|
||||
version = "1.2.12-2";
|
||||
@@ -67,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
acl
|
||||
bash
|
||||
coreutils
|
||||
firewalld
|
||||
getent
|
||||
glibc
|
||||
iproute2
|
||||
@@ -76,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
msmtp
|
||||
nodejs
|
||||
openssh
|
||||
python
|
||||
samba
|
||||
shadow
|
||||
smartmontools
|
||||
@@ -84,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
systemd
|
||||
util-linux
|
||||
zfs
|
||||
cockpit.passthru.python3Packages.pyudev
|
||||
cockpit.passthru.python3Packages.py-libzfs
|
||||
];
|
||||
|
||||
env = {
|
||||
@@ -151,11 +141,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
for script in $out/etc/zfs/zed.d/*; do
|
||||
if [ -f "$script" ]; then
|
||||
wrapProgram "$script" \
|
||||
--set PYTHONPATH "/etc/cockpit/${cockpit.passthru.python3Packages.python.sitePackages}" \
|
||||
--set PATH "${
|
||||
lib.makeBinPath [
|
||||
"/etc/cockpit"
|
||||
coreutils
|
||||
bash
|
||||
python
|
||||
jq
|
||||
]
|
||||
}"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
asciidoc,
|
||||
autoreconfHook,
|
||||
bashInteractive,
|
||||
cacert,
|
||||
@@ -33,7 +34,7 @@
|
||||
pam,
|
||||
pkg-config,
|
||||
polkit,
|
||||
python3Packages,
|
||||
python312Packages,
|
||||
sscg,
|
||||
systemd,
|
||||
udev,
|
||||
@@ -44,19 +45,26 @@
|
||||
nixos-icons,
|
||||
}:
|
||||
|
||||
let
|
||||
# Pinned to 3.12 due to cockpit-zfs dependency py-libzfs not being compatible
|
||||
# with 3.13+
|
||||
python3Packages = python312Packages;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit";
|
||||
version = "353.1";
|
||||
version = "355";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uJBrBsNCYkdq+13UGJ6nPr55HPD4R0BTugWCKrycaIY=";
|
||||
hash = "sha256-LD3bjb87AvElwMFB5YKwz04PEmWw+DWDP7RGBCzwSb4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
autoreconfHook
|
||||
makeWrapper
|
||||
docbook_xml_dtd_43
|
||||
@@ -97,11 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/tls/cockpit-certificate-helper.in \
|
||||
--replace-fail 'COCKPIT_CONFIG="@sysconfdir@/cockpit"' 'COCKPIT_CONFIG=/etc/cockpit'
|
||||
|
||||
substituteInPlace src/tls/cockpit-certificate-ensure.c \
|
||||
--replace-fail '#define COCKPIT_SELFSIGNED_PATH PACKAGE_SYSCONF_DIR COCKPIT_SELFSIGNED_FILENAME' '#define COCKPIT_SELFSIGNED_PATH "/etc" COCKPIT_SELFSIGNED_FILENAME'
|
||||
|
||||
substituteInPlace src/common/cockpitconf.c \
|
||||
--replace-fail 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"'
|
||||
substituteInPlace src/Makefile.am \
|
||||
--replace-fail '-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"' '-DPACKAGE_SYSCONF_DIR=\""/etc"\"'
|
||||
|
||||
substituteInPlace src/**/*.c \
|
||||
--replace-quiet "/bin/sh" "${lib.getExe bashInteractive}"
|
||||
@@ -166,6 +171,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "/usr/lib/polkit-1/polkit-agent-helper-1" "/run/wrappers/bin/polkit-agent-helper-1"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# Make sure our Python comes before any other Python (e.g. from asciidoc)
|
||||
export PATH="${lib.makeBinPath [ python3Packages.python ]}:$PATH"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-prefix-only=yes"
|
||||
"--disable-pcp" # TODO: figure out how to package its dependency
|
||||
@@ -270,6 +280,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit python3Packages;
|
||||
tests = { inherit (nixosTests) cockpit; };
|
||||
updateScript = nix-update-script { };
|
||||
cockpitPath = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cocoon";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haileyok";
|
||||
repo = "cocoon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lyRTLnh+kxuvGfKML1g92+K3pR6okbVVnkCJMkBypRU=";
|
||||
hash = "sha256-xXXHJcI3icsCeOeI+6L/waK3+UtjhBZosQPLoGN1TiY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-cNL9H8cXFEiBKwyZcg1AwFUDXzMINi+vjYecyP8KNP0=";
|
||||
vendorHash = "sha256-bux3OfHT8f1FVpBAZUP23vo8M6h8nPTJbi/GTUzhdc4=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -327,7 +327,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/coder/code-server";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
henkery
|
||||
code-asher
|
||||
];
|
||||
|
||||
@@ -103,7 +103,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/containerd/containerd/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
vdemeester
|
||||
getchoo
|
||||
];
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/deiv/driftnet";
|
||||
changelog = "https://github.com/deiv/driftnet/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "driftnet";
|
||||
};
|
||||
|
||||
Generated
+15
-10
@@ -149,6 +149,11 @@
|
||||
"version": "2.5.1",
|
||||
"hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
|
||||
},
|
||||
{
|
||||
"pname": "BouncyCastle.Cryptography",
|
||||
"version": "2.6.2",
|
||||
"hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms="
|
||||
},
|
||||
{
|
||||
"pname": "CoCoL",
|
||||
"version": "1.8.4",
|
||||
@@ -1011,13 +1016,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "SSH.NET",
|
||||
"version": "2025.0.0",
|
||||
"hash": "sha256-pcmHLjYymuxo8vtzKJUeHi4kJ8RfzeyMFl4cGyuiEhU="
|
||||
"version": "2025.1.0",
|
||||
"hash": "sha256-vtpvE5B+IxoMkq9CQMehoR5ZRtihaHQ4VyhmkkIjL98="
|
||||
},
|
||||
{
|
||||
"pname": "SshNet.Agent",
|
||||
"version": "2024.2.0",
|
||||
"hash": "sha256-pgyYBMnX8SpOT+NrHinAx2LDWliNEwHZndfUgO6q2Cs="
|
||||
"version": "2024.2.0.1",
|
||||
"hash": "sha256-uUoFNQkAEG8d16TkEKfiU3hgoIIIE62o9129BzWIbjA="
|
||||
},
|
||||
{
|
||||
"pname": "Stub.System.Data.SQLite.Core.NetStandard",
|
||||
@@ -1511,13 +1516,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "uplink.NET",
|
||||
"version": "2.13.3484",
|
||||
"hash": "sha256-YyZ0MQ0olVkCwoujLng+/wlQ3xEwAs7R9yYODoabimw="
|
||||
"version": "2.14.3623",
|
||||
"hash": "sha256-fsOlOkZceVTiJVo6p6CqYcXrUZqO/IaDpDcMBSHkcc0="
|
||||
},
|
||||
{
|
||||
"pname": "uplink.NET.Linux",
|
||||
"version": "2.13.3484",
|
||||
"hash": "sha256-WwzN4fagyy+KnGSylK06jn9t0xvR1mJOJpn1xwd7934="
|
||||
"version": "2.14.3623",
|
||||
"hash": "sha256-GIeD1Lip+MkRrHbOwwsbbKNZnlnxOiAhhVTyByY1O70="
|
||||
},
|
||||
{
|
||||
"pname": "uplink.NET.Mac",
|
||||
@@ -1526,8 +1531,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "uplink.NET.Win",
|
||||
"version": "2.13.3484",
|
||||
"hash": "sha256-dfRkYTFQrvtX/xvxPjwrbLPFjAPJIMN1ennUnqgvSC4="
|
||||
"version": "2.14.3623",
|
||||
"hash": "sha256-Rv5/hVXKrSOOCn9aHbaH6TmB9H2Xvq1kyJv5sQRygRo="
|
||||
},
|
||||
{
|
||||
"pname": "VaultSharp",
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
diff --git a/Duplicati/UnitTest/Issue6504.cs b/Duplicati/UnitTest/Issue6504.cs
|
||||
index 1234567..abcdefg 100644
|
||||
--- a/Duplicati/UnitTest/Issue6504.cs
|
||||
+++ b/Duplicati/UnitTest/Issue6504.cs
|
||||
@@ -93,7 +93,7 @@ namespace Duplicati.UnitTest;
|
||||
|
||||
|
||||
// Force the error by making sure the duplicate blocks are from both dblock files
|
||||
- using (var db = SQLiteLoader.LoadConnection(DBFILE))
|
||||
+ using (var db = SQLiteLoader.LoadConnection(DBFILE, 0))
|
||||
using (var cmd = db.CreateCommand())
|
||||
{
|
||||
cmd.CommandText = @"SELECT BlockId,VolumeID FROM DuplicateBlock";
|
||||
@@ -110,14 +110,14 @@ namespace Duplicati.UnitTest;
|
||||
var otherVolumeId = blocks.First(x => x.VolumeID != duplicateVolumeId && x.ID != blockToChange.BlockId).VolumeID;
|
||||
|
||||
cmd.CommandText = "UPDATE DuplicateBlock SET VolumeID=@VolumeID WHERE BlockID=@BlockID";
|
||||
- cmd.Parameters.AddWithValue("@VolumeID", otherVolumeId);
|
||||
- cmd.Parameters.AddWithValue("@BlockID", blockToChange.BlockId);
|
||||
+ ((System.Data.SQLite.SQLiteParameterCollection)cmd.Parameters).AddWithValue("@VolumeID", otherVolumeId);
|
||||
+ ((System.Data.SQLite.SQLiteParameterCollection)cmd.Parameters).AddWithValue("@BlockID", blockToChange.BlockId);
|
||||
cmd.ExecuteNonQuery();
|
||||
cmd.Parameters.Clear();
|
||||
|
||||
cmd.CommandText = "UPDATE Block SET VolumeID=@VolumeID WHERE ID=@BlockID";
|
||||
- cmd.Parameters.AddWithValue("@VolumeID", duplicateVolumeId);
|
||||
- cmd.Parameters.AddWithValue("@BlockID", blockToChange.BlockId);
|
||||
+ ((System.Data.SQLite.SQLiteParameterCollection)cmd.Parameters).AddWithValue("@VolumeID", duplicateVolumeId);
|
||||
+ ((System.Data.SQLite.SQLiteParameterCollection)cmd.Parameters).AddWithValue("@BlockID", blockToChange.BlockId);
|
||||
cmd.ExecuteNonQuery();
|
||||
}
|
||||
}
|
||||
@@ -14,9 +14,9 @@
|
||||
|
||||
let
|
||||
# for update.sh easy to handle
|
||||
ngclientVersion = "0.0.163";
|
||||
ngclientRev = "2546891ad116cb0a7a8df1c2bcf8a11fc17d58a4";
|
||||
ngclientHash = "sha256-MQOJHr3JBceO7qZRQvCcR4NNxpc77oRRjBQkmMv9RUA=";
|
||||
ngclientVersion = "0.0.192";
|
||||
ngclientRev = "5237ca55b42e58896da2919ad8a76c034517e98a";
|
||||
ngclientHash = "sha256-06LMFg0kRmG4c5s60/+NU8gugkfgWAyTGoLo0+UHRUI=";
|
||||
|
||||
# from Duplicati/Server/webroot/ngclient/package.json
|
||||
ngclient = buildNpmPackage {
|
||||
@@ -30,7 +30,7 @@ let
|
||||
hash = ngclientHash;
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HYKzf7JaoOYvYlVZgMZ0jvYHf96be6abTZNtefgy59Y=";
|
||||
npmDepsHash = "sha256-i9lW+JDB2TZGfhW1fzrZA36qgkYeMmHbJkeEYxga2ko=";
|
||||
|
||||
nativeBuildInputs = [ bun ];
|
||||
|
||||
@@ -58,20 +58,18 @@ let
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "duplicati";
|
||||
version = "2.2.0.1";
|
||||
version = "2.2.0.3";
|
||||
channel = "stable";
|
||||
buildDate = "2025-11-09";
|
||||
buildDate = "2026-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "duplicati";
|
||||
repo = "duplicati";
|
||||
tag = "v${version}_${channel}_${buildDate}";
|
||||
hash = "sha256-fARK2nAqE9aN2PQSC62yIcYr3e/kBT3BVTBxLwMqk24=";
|
||||
hash = "sha256-p2hl1S/XsKsbAfWBAgvNMl6z5zGm/FBH3EYSqDvkKy8=";
|
||||
stripRoot = true;
|
||||
};
|
||||
|
||||
patches = [ ./fix-unit-tests.patch ];
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq nix-prefetch-github
|
||||
#!nix-shell -i bash -p curl jq nix-prefetch-github prefetch-npm-deps
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@@ -25,8 +25,9 @@ DATE=$(echo "$TAG" | cut -d_ -f3)
|
||||
HASH=$(nix-prefetch-github $OWNNER $REPO --rev "$TAG" |
|
||||
jq -r '.hash')
|
||||
|
||||
curl -sL "https://raw.githubusercontent.com/$OWNNER/$REPO/$TAG/Duplicati/Server/webroot/ngclient/package.json" \
|
||||
-o "$TMP/package.json"
|
||||
curl -sL \
|
||||
-o "$TMP/package.json" \
|
||||
"https://raw.githubusercontent.com/$OWNNER/$REPO/$TAG/Duplicati/Server/webroot/ngclient/package.json"
|
||||
|
||||
NGCLIENT_VERSION=$(
|
||||
jq -r '.dependencies["@duplicati/ngclient"]' \
|
||||
@@ -34,14 +35,21 @@ NGCLIENT_VERSION=$(
|
||||
sed 's/^[^0-9]*//'
|
||||
)
|
||||
|
||||
git clone --no-tags https://github.com/duplicati/ngclient.git "$TMP/ngclient"
|
||||
NGCLIENT_REV=$(cd "$TMP/ngclient" && git log --format="%H %s" | grep "$NGCLIENT_VERSION" | awk '{print $1}')
|
||||
NGCLIENT_REV=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
|
||||
-s "https://api.github.com/search/commits?q=repo:duplicati/ngclient+$NGCLIENT_VERSION" |
|
||||
jq -r '.items[0].sha')
|
||||
|
||||
NGCLIENT_HASH=$(
|
||||
nix-prefetch-github $OWNNER ngclient --rev "$NGCLIENT_REV" |
|
||||
jq -r .hash
|
||||
)
|
||||
|
||||
curl -sL \
|
||||
-o "$TMP/package-lock.json" \
|
||||
"https://raw.githubusercontent.com/$OWNNER/ngclient/$NGCLIENT_REV/package-lock.json"
|
||||
|
||||
NGCLIENT_NPM_DEPS_HASH="$(prefetch-npm-deps "$TMP"/package-lock.json)"
|
||||
|
||||
echo "version=$VERSION"
|
||||
echo "channel=$CHANNEL"
|
||||
echo "date=$DATE"
|
||||
@@ -49,11 +57,13 @@ echo "date=$DATE"
|
||||
echo "ngclientVersion=$NGCLIENT_VERSION"
|
||||
echo "ngclientRev=$NGCLIENT_REV"
|
||||
echo "ngclientHash=$NGCLIENT_HASH"
|
||||
echo "npmDepsHash=$NGCLIENT_NPM_DEPS_HASH"
|
||||
|
||||
sed -i \
|
||||
-e "/ngclientVersion = /c\ ngclientVersion = \"$NGCLIENT_VERSION\";" \
|
||||
-e "/ngclientRev = /c\ ngclientRev = \"$NGCLIENT_REV\";" \
|
||||
-e "/ngclientHash = /c\ ngclientHash = \"$NGCLIENT_HASH\";" \
|
||||
-e "/npmDepsHash = /c\ npmDepsHash = \"$NGCLIENT_NPM_DEPS_HASH\";" \
|
||||
-e "/version = \"/c\ version = \"$VERSION\";" \
|
||||
-e "/channel = \"/c\ channel = \"$CHANNEL\";" \
|
||||
-e "/buildDate = \"/c\ buildDate = \"$DATE\";" \
|
||||
|
||||
@@ -63,9 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Simple shell based CA utility";
|
||||
homepage = "https://openvpn.net/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [
|
||||
lib.maintainers.offline
|
||||
lib.maintainers.numinit
|
||||
maintainers = with lib.maintainers; [
|
||||
numinit
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -140,7 +140,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ejabberd";
|
||||
version = "26.01";
|
||||
version = "26.02";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "processone";
|
||||
repo = "ejabberd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xhqH1hELosYC7dtHnyrlkCRlbgbM2SU7SLkowGVG9SI=";
|
||||
hash = "sha256-izP7Rz65Lr4LDOCzZPdDWb3TyXDSTd/8gOPSfovVGM8=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@@ -264,12 +264,11 @@ let
|
||||
};
|
||||
erlydtl = builder {
|
||||
name = "erlydtl";
|
||||
version = "git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erlydtl";
|
||||
repo = "erlydtl";
|
||||
rev = "aae414692b6052e96d890e03bbeeeca0f4dc01c2";
|
||||
sha256 = "00p194jgmvzqza7xr7fdm2n091ymkyy66aj4gc82n0kzdlh03vbm";
|
||||
version = "0.14.0";
|
||||
src = fetchHex {
|
||||
pkg = "erlydtl";
|
||||
version = "0.14.0";
|
||||
sha256 = "sha256-2A7ARM2PWICcGdKaxWBb4J6VUECRG2RFBeMendgUNDE=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2026.1.4";
|
||||
version = "2026.1.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-j7PlHGLBY9M5jxzvOt6H+zr3nCNPpM/FCMLgevt6MnM=";
|
||||
hash = "sha256-leQkNa2FK7Wagpr+TKbfg/qkRMII03+dnWXoFZwwn9w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -195,6 +195,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
hexa
|
||||
picnoir
|
||||
thanegill
|
||||
];
|
||||
mainProgram = "esphome";
|
||||
|
||||
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/dex4er/fakechroot";
|
||||
description = "Give a fake chroot environment through LD_PRELOAD";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
faust2lv2,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "faustPhysicalModeling";
|
||||
pname = "faust-physicalmodeling";
|
||||
version = "2.83.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.55.0";
|
||||
version = "2.57.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filebrowser";
|
||||
repo = "filebrowser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1ZzTATJEVBr76+CMk8OzxdpWGqFHPPhyC7z2MgfqN+M=";
|
||||
hash = "sha256-rd/I5M1SoL6fUNkiv/KwWImbtWCoy0/DR993C714xU8=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -41,7 +41,7 @@ let
|
||||
;
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_10;
|
||||
hash = "sha256-iv0LZoEyF5fASqBKNkTJhLMY0Xpa6x0i4csDoHmGU+g=";
|
||||
hash = "sha256-AfQNSIiTRv+aEGsrRAymwpUO2IWDtvSruLuuTAjWy/0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -59,7 +59,7 @@ buildGoModule {
|
||||
pname = "filebrowser";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-4WDggP5eL7IPUWTxewxV2JUZZ3kV0PwewQQothz7AC8=";
|
||||
vendorHash = "sha256-P6R+lBmzYYMqC5D6VwLOE7UnKuYcLN7UDVkZHWLLjMk=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
||||
@@ -4,38 +4,37 @@
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
lilypond,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "frescobaldi";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
version = "4.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbsoft";
|
||||
repo = "frescobaldi";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A=";
|
||||
hash = "sha256-J0QC+VwNdA24vAW5Fx+cz5IFajkB8GmR4Rae0Q+2zw8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dependencies = with python3Packages; [
|
||||
qpageview
|
||||
lilypond
|
||||
pygame
|
||||
pygame-ce
|
||||
pyqt6-sip
|
||||
python-ly
|
||||
sip4
|
||||
pyqt5
|
||||
poppler-qt5
|
||||
pyqtwebengine
|
||||
pyqt6
|
||||
pyqt6-webengine
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ];
|
||||
buildInputs = [ qt6.qtbase ];
|
||||
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
|
||||
|
||||
# Needed because source is fetched from git
|
||||
preBuild = ''
|
||||
make -C i18n
|
||||
make -C linux
|
||||
'';
|
||||
build-system = with python3Packages; [
|
||||
hatchling
|
||||
];
|
||||
|
||||
# no tests in shipped with upstream
|
||||
doCheck = false;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-town";
|
||||
version = "22.2.0";
|
||||
version = "22.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JY0zWWMln4r2ga1jwxK+RTp8izATyovRHBf4A29pXW4=";
|
||||
hash = "sha256-7+KCk46TOnOVmmhYtqzC6kC3wQUdWkQKoSpoyb9D9tQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -61,6 +61,8 @@ buildGoModule (finalAttrs: {
|
||||
"TestMockingRunner/MockCommitMessage"
|
||||
"TestMockingRunner/QueryWith"
|
||||
"TestTestCommands/CreateChildFeatureBranch"
|
||||
"TestTestCommands/CreateChildBranch"
|
||||
"TestTestCommands/CreateLocalBranchUsingGitTown"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,51 +25,46 @@
|
||||
turbo,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook4,
|
||||
yq,
|
||||
dart-sass,
|
||||
}:
|
||||
|
||||
let
|
||||
excludeSpec = spec: [
|
||||
"--exclude"
|
||||
spec
|
||||
];
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitbutler";
|
||||
version = "0.15.10";
|
||||
version = "0.18.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitbutlerapp";
|
||||
repo = "gitbutler";
|
||||
tag = "release/${finalAttrs.version}";
|
||||
hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI=";
|
||||
hash = "sha256-OSM2yjiz3I5+SVpcJSWCDyS4y4w9JJ/8CAP2BK0sL7o=";
|
||||
};
|
||||
|
||||
# Workaround for https://github.com/NixOS/nixpkgs/issues/359340
|
||||
cargoPatches = [ ./gix-from-crates-io.patch ];
|
||||
cargoPatches = [
|
||||
./gix-from-crates-io.patch
|
||||
];
|
||||
|
||||
# Let Tauri know what version we're building
|
||||
#
|
||||
# Remove references to non-existent workspaces in `gix` crates
|
||||
#
|
||||
# Deactivate the built-in updater
|
||||
# Let Tauri know what version we're building and deactivate the built-in updater
|
||||
# Note: .bundle.externalBin doesn't include `"but"` at the moment
|
||||
# as that'd require more build adjustments
|
||||
postPatch = ''
|
||||
tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json"
|
||||
jq '.version = "${finalAttrs.version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
|
||||
|
||||
tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
|
||||
jq '.
|
||||
| (.version = "${finalAttrs.version}")
|
||||
| (.bundle.createUpdaterArtifacts = false)
|
||||
| (.bundle.externalBin = ["gitbutler-git-setsid", "gitbutler-git-askpass"])
|
||||
' "$tauriConfRelease" | sponge "$tauriConfRelease"
|
||||
|
||||
substituteInPlace apps/desktop/src/lib/backend/tauri.ts \
|
||||
--replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
|
||||
--replace-fail 'checkUpdate = tauriCheck;' 'checkUpdate = () => null;'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8=";
|
||||
cargoHash = "sha256-L53iIVxv3KtmXiqITad1enIMX3Iu/mWSJJPZk7KAWuM=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y=";
|
||||
hash = "sha256-IAsEzM9kmZWnh390CV7mOyOshVlESsyoNT0ZvdY03KY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -85,7 +80,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpm
|
||||
turbo
|
||||
wrapGAppsHook4
|
||||
yq # For `tomlq`
|
||||
dart-sass
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
|
||||
|
||||
@@ -106,24 +101,47 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
# `gitbutler-git`'s checks do not support release mode
|
||||
checkType = "debug";
|
||||
cargoTestFlags = [
|
||||
"--workspace"
|
||||
]
|
||||
++ lib.concatMap excludeSpec [
|
||||
# Exclude these workspace crates from testing
|
||||
++ lib.concatMap (crate: [ "--exclude=${crate}" ]) [
|
||||
# Requires Git directories
|
||||
"but-core"
|
||||
"but-rebase"
|
||||
"but-workspace"
|
||||
# Fails due to the issues above and below
|
||||
"but-hunk-dependency"
|
||||
# Errors with "Lazy instance has previously been poisoned"
|
||||
"gitbutler-branch-actions"
|
||||
"gitbutler-stack"
|
||||
# `Expecting driver to be located at "../../target/debug/gitbutler-cli" - we also assume a certain crate location`
|
||||
# We're not (usually) building in debug mode and always have a different target directory, so...
|
||||
"gitbutler-branch-actions"
|
||||
"gitbutler-stack"
|
||||
"gitbutler-edit-mode"
|
||||
"but-cherry-apply"
|
||||
"but-worktrees"
|
||||
]
|
||||
++ [
|
||||
"--"
|
||||
]
|
||||
# Skip these specific tests
|
||||
++ lib.concatMap (test: [ "--skip=${test}" ]) [
|
||||
# These tests try connecting to a local address (192.0.2.1) and expect the
|
||||
# connection to fail in a certain way. When run on macOS with a network
|
||||
# sandbox (?) these tests fail while preparing the socket.
|
||||
# https://github.com/NixOS/nixpkgs/pull/473706#issuecomment-3734337124
|
||||
"test_is_network_error"
|
||||
# assertion `left == right` failed: GIT_EDITOR should take precedence if git is executed correctly
|
||||
# left: "vi"
|
||||
# right: "from-GIT_EDITOR"
|
||||
"git_editor_takes_precedence"
|
||||
# FLAKY (try again): child exited unsuccessfully: ExitStatus(unix_wait_status(10752))
|
||||
"migrations_in_parallel_with_processes"
|
||||
# Archive at 'tests/fixtures/generated-archives/[...].tar' not found [..] Error: No such file or directory (os error 2)
|
||||
"merge_first_branch_into_gb_local_and_verify_rebase"
|
||||
"json_output_with_dangling_commits"
|
||||
"two_dangling_commits_different_branches"
|
||||
# darwin: Error: timeout waiting for matching event
|
||||
"track_directory_changes_after_rename"
|
||||
];
|
||||
|
||||
env = {
|
||||
@@ -135,19 +153,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# `fetchPnpmDeps` and `pnpmConfigHook` use a specific version of pnpm, not upstream's
|
||||
COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
# We depend on nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
# We also need to have `tracing` support in `tokio` for `console-subscriber`
|
||||
# task tracing requires Tokio to be built with RUSTFLAGS="--cfg tokio_unstable"
|
||||
RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
TUBRO_BINARY_PATH = lib.getExe turbo;
|
||||
TURBO_TELEMETRY_DISABLED = 1;
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
LIBGIT2_NO_VENDOR = 1;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
# force the sass npm dependency to use our own sass binary instead of the bundled one
|
||||
substituteInPlace node_modules/.pnpm/sass-embedded@*/node_modules/sass-embedded/dist/lib/src/compiler-path.js \
|
||||
--replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
|
||||
|
||||
turbo run --filter @gitbutler/svelte-comment-injector build
|
||||
pnpm build:desktop -- --mode production
|
||||
'';
|
||||
|
||||
@@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 687b5424128fd637555be4a0d18c72c4e870bd6f Mon Sep 17 00:00:00 2001
|
||||
From: Alfie <30699769+AHSauge@users.noreply.github.com>
|
||||
Date: Sat, 11 May 2024 13:11:08 +0200
|
||||
Subject: [PATCH] Fix incorrect order of argument to calloc (#345)
|
||||
|
||||
---
|
||||
src/zip.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/zip.c b/src/zip.c
|
||||
index b14f9e3..a7e5ef8 100644
|
||||
--- a/test/dep/zip/src/zip.c
|
||||
+++ b/test/dep/zip/src/zip.c
|
||||
@@ -1874,7 +1874,7 @@ ssize_t zip_stream_copy(struct zip_t *zip, void **buf, size_t *bufsize) {
|
||||
*bufsize = n;
|
||||
}
|
||||
|
||||
- *buf = calloc(sizeof(unsigned char), n);
|
||||
+ *buf = calloc(n, sizeof(unsigned char));
|
||||
memcpy(*buf, zip->archive.m_pState->m_pMem, n);
|
||||
|
||||
return (ssize_t)n;
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -11,27 +11,21 @@
|
||||
ninja,
|
||||
openssl,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gittyup";
|
||||
version = "1.4.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Murmele";
|
||||
repo = "Gittyup";
|
||||
rev = "gittyup_v${finalAttrs.version}";
|
||||
hash = "sha256-anyjHSF0ZCBJTuqNdH49iwngt3zeJZat5XGDsKbiwPE=";
|
||||
hash = "sha256-A4+t0glZC8vi+E3+WcTMZ0cdUhHaZZrcP2MGPk45X0g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix GCC 14 build error (remove for next update)
|
||||
# https://github.com/Murmele/Gittyup/pull/759
|
||||
./0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
|
||||
];
|
||||
|
||||
cmakeFlags =
|
||||
let
|
||||
inherit (lib) cmakeBool;
|
||||
@@ -54,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmark
|
||||
ninja
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -64,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libssh2
|
||||
lua5_4
|
||||
openssl
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
qt6.qtbase
|
||||
qt6.qttools
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -22,6 +22,6 @@ buildGoModule (finalAttrs: {
|
||||
mainProgram = "go-md2man";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/cpuguy83/go-md2man";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://github.com/golang-migrate/migrate";
|
||||
description = "Database migrations. CLI and Golang library";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "migrate";
|
||||
};
|
||||
|
||||
@@ -69,7 +69,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://nuetzlich.net/gocryptfs/";
|
||||
maintainers = with lib.maintainers; [
|
||||
flokli
|
||||
offline
|
||||
prusnak
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
# rather than buildGoLatestModule.
|
||||
# This can be bumped when the release notes of golangci-lint detail support for
|
||||
# new version of go.
|
||||
buildGo125Module,
|
||||
buildGo126Module,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
@@ -12,18 +12,18 @@
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "golangci-lint";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w6MAOirj8rPHYbKrW4gJeemXCS64fNtteV6IioqIQTQ=";
|
||||
hash = "sha256-8LEtm1v0slKwdLBtS41OilKJLXytSxcI9fUlZbj5Gfw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/Vqo/yrmGh6XipELQ9NDtlMEO2a654XykmvnMs0BdrI=";
|
||||
vendorHash = "sha256-w8JfF6n1ylrU652HEv/cYdsOdDZz9J2uRQDqxObyhkY=";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
|
||||
@@ -179,11 +179,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "144.0.7559.132";
|
||||
version = "145.0.7632.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-5VuJaixlw9o+oD1bp6S3o2kR8KcolomSFyWpMZQydwM=";
|
||||
hash = "sha256-au1T/nd8qaWKaAuEioACIwBWb7kCQkKR4FSYSnhMc6I=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -24,6 +24,6 @@ buildGoModule (finalAttrs: {
|
||||
mainProgram = "gore";
|
||||
homepage = "https://github.com/motemen/gore";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
offline
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "gvnccapture";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "harbor-cli";
|
||||
version = "0.0.16";
|
||||
version = "0.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goharbor";
|
||||
repo = "harbor-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bU42N2+zyOqdiJFbgaqcxsApdslQFOleythDE6hs8sY=";
|
||||
hash = "sha256-uTXTRfxuEl1A9F9TrEWYvV4tVGPRoH01QRVsO8fBKg0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qTaXIkZ1g7jsPV4IkduIS6REIhs9JJcS2mOg3V77DTg=";
|
||||
vendorHash = "sha256-lGxv7BK4JZX9fyQEUooflBvcbul8LXkRvpySz4l5zAI=";
|
||||
|
||||
excludedPackages = [
|
||||
"dagger"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
version ? "0.9.15.3",
|
||||
hash ? "sha256-tLEfdIQ29DrG0aqUkfh/FBUqveXjNWAYzuqN3a6Qyz0=",
|
||||
version ? "0.9.15.4",
|
||||
hash ? "sha256-2dUh7aAnpbi9tTWL23ZVNdyLfORkZGAjUlz8B/ETo/Q=",
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Windows registry hive extraction library";
|
||||
license = lib.licenses.lgpl2Only;
|
||||
homepage = "https://github.com/libguestfs/hivex";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "homepage-dashboard";
|
||||
version = "1.9.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gethomepage";
|
||||
repo = "homepage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DFr223jUP/KAZDBVJxqFDmLgQGJyPMi/4A160e8nAYk=";
|
||||
hash = "sha256-hJbF6VZRgC2oROdEonlWS6Oj229sKemnpQX+pf8+6rc=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-iWKGDgZIdQzKSJx5MpqO83nvpawBhCKllWf3x6aCAtQ=";
|
||||
hash = "sha256-YM1v2hkVsxS3AiQbLIHQ5yOkgqQoa+X9rR2yEJYRO/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
|
||||
description = "WebDriver server for running Selenium tests on the HtmlUnit headless browser";
|
||||
maintainers = with lib.maintainers; [
|
||||
coconnor
|
||||
offline
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
|
||||
@@ -1,22 +1,24 @@
|
||||
diff --git a/src/io.github.flattool.Ignition.in b/src/io.github.flattool.Ignition.in
|
||||
index 5c71c3c..0b2ec00 100644
|
||||
index 40b474b..e8e5cd7 100755
|
||||
--- a/src/io.github.flattool.Ignition.in
|
||||
+++ b/src/io.github.flattool.Ignition.in
|
||||
@@ -1,7 +1,8 @@
|
||||
@@ -1,9 +1,10 @@
|
||||
-#!@GJS@ -m
|
||||
+#!/usr/bin/env gjs -m
|
||||
|
||||
import { exit, programArgs, programInvocationName } from "system";
|
||||
import Gio from "gi://Gio?version=2.0"
|
||||
|
||||
import { exit, programArgs, programInvocationName } from "system"
|
||||
|
||||
+imports.package._findEffectiveEntryPointName = () => 'io.github.flattool.Ignition';
|
||||
imports.package.init({
|
||||
name: "@PACKAGE_NAME@",
|
||||
version: "@PACKAGE_VERSION@",
|
||||
name: "@PACKAGE_NAME@",
|
||||
version: "@VERSION@",
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 488fa06..751f8ed 100644
|
||||
index dc242fb..7334af7 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -23,7 +23,6 @@ data_res = gnome.compile_resources('io.github.flattool.Ignition.data',
|
||||
@@ -37,7 +37,6 @@ install_subdir(
|
||||
)
|
||||
|
||||
bin_conf = configuration_data()
|
||||
@@ -24,3 +26,4 @@ index 488fa06..751f8ed 100644
|
||||
bin_conf.set('PACKAGE_VERSION', meson.project_version())
|
||||
bin_conf.set('PACKAGE_NAME', meson.project_name())
|
||||
bin_conf.set('prefix', get_option('prefix'))
|
||||
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ignition";
|
||||
version = "2.2.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flattool";
|
||||
repo = "ignition";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-GDoF6NcFzMGzvYYoHwSctLlXCqsbfnUFdT9AIGcUkIQ=";
|
||||
hash = "sha256-bkH8nxvqzxzYse7HNRWi79FfuMmLxd/CppKJQk2rTbo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libadwaita
|
||||
];
|
||||
|
||||
# Needed since Jasmine is not in nixpkgs
|
||||
mesonFlags = [ "-Dtests=false" ];
|
||||
|
||||
meta = {
|
||||
description = "Manage startup apps and scripts";
|
||||
homepage = "https://github.com/flattool/ignition";
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
sqlite,
|
||||
zlib,
|
||||
systemd,
|
||||
msalsdk-dbusclient,
|
||||
pam,
|
||||
p11-kit,
|
||||
dbus,
|
||||
@@ -30,11 +29,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intune-portal";
|
||||
version = "1.2508.17-noble";
|
||||
version = "1.2511.7-noble";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
|
||||
hash = "sha256-UTP+Z6xsjr48deizuwVDb8GrpeeAf5RZwloXsZ7Um3E=";
|
||||
hash = "sha256-MHvAmkemx28ZNcVloFNxJ03YbxrgVPvB7OOMYR6Oyo8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
@@ -59,7 +58,6 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
zlib
|
||||
systemd
|
||||
msalsdk-dbusclient
|
||||
dbus
|
||||
];
|
||||
pam = lib.makeLibraryPath [ pam ];
|
||||
|
||||
@@ -141,7 +141,6 @@ stdenv.mkDerivation {
|
||||
++ lib.optionals enableUnfree [ lib.licenses.unfreeRedistributable ];
|
||||
homepage = "https://github.com/openwall/john/";
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
cherrykitten
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
commonsDaemon,
|
||||
commons-daemon,
|
||||
jdk,
|
||||
makeWrapper,
|
||||
jre,
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-SPnE5jrw1zAy7vIzGrjp0+B4SwCLoufLef3XUcUgK6Y=";
|
||||
};
|
||||
|
||||
buildInputs = [ commonsDaemon ];
|
||||
buildInputs = [ commons-daemon ];
|
||||
nativeBuildInputs = [
|
||||
jdk
|
||||
makeWrapper
|
||||
|
||||
@@ -42,7 +42,6 @@ buildGoModule (finalAttrs: {
|
||||
changelog = "https://github.com/grafana/k6/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
kashw2
|
||||
];
|
||||
};
|
||||
|
||||
@@ -28,7 +28,6 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/boz/kail";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
vdemeester
|
||||
];
|
||||
mainProgram = "kail";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user