Merge master into staging-next
This commit is contained in:
@@ -27490,13 +27490,6 @@
|
||||
githubId = 115360611;
|
||||
name = "Wölfchen";
|
||||
};
|
||||
wackbyte = {
|
||||
name = "wackbyte";
|
||||
email = "wackbyte@pm.me";
|
||||
github = "wackbyte";
|
||||
githubId = 29505620;
|
||||
keys = [ { fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; } ];
|
||||
};
|
||||
waelwindows = {
|
||||
email = "waelwindows9922@gmail.com";
|
||||
github = "Waelwindows";
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.boot.bcachefs;
|
||||
cfgScrub = config.services.bcachefs.autoScrub;
|
||||
|
||||
bootFs = lib.filterAttrs (
|
||||
@@ -146,7 +147,7 @@ let
|
||||
unitConfig.DefaultDependencies = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecCondition = "${pkgs.bcachefs-tools}/bin/bcachefs unlock -c \"${device}\"";
|
||||
ExecCondition = "${cfg.package}/bin/bcachefs unlock -c \"${device}\"";
|
||||
Restart = "on-failure";
|
||||
RestartMode = "direct";
|
||||
# Ideally, this service would lock the key on stop.
|
||||
@@ -155,7 +156,7 @@ let
|
||||
};
|
||||
script =
|
||||
let
|
||||
unlock = ''${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}"'';
|
||||
unlock = ''${cfg.package}/bin/bcachefs unlock "${device}"'';
|
||||
unlockInteractively = ''${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${unlock}'';
|
||||
in
|
||||
if useClevis fs then
|
||||
@@ -196,6 +197,10 @@ let
|
||||
in
|
||||
|
||||
{
|
||||
options.boot.bcachefs.package = lib.mkPackageOption pkgs "bcachefs-tools" { } // {
|
||||
description = "Configured Bcachefs userspace package.";
|
||||
};
|
||||
|
||||
options.services.bcachefs.autoScrub = {
|
||||
enable = lib.mkEnableOption "regular bcachefs scrub";
|
||||
|
||||
@@ -227,11 +232,11 @@ in
|
||||
{
|
||||
inherit assertions;
|
||||
# needed for systemd-remount-fs
|
||||
system.fsPackages = [ pkgs.bcachefs-tools ];
|
||||
services.udev.packages = [ pkgs.bcachefs-tools ];
|
||||
system.fsPackages = [ cfg.package ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
systemd = {
|
||||
packages = [ pkgs.bcachefs-tools ];
|
||||
packages = [ cfg.package ];
|
||||
services = lib.mapAttrs' (mkUnits "") (
|
||||
lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems
|
||||
);
|
||||
@@ -253,12 +258,12 @@ in
|
||||
];
|
||||
boot.initrd.systemd.extraBin = {
|
||||
# do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357
|
||||
"bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
|
||||
"mount.bcachefs" = "${pkgs.bcachefs-tools}/bin/mount.bcachefs";
|
||||
"bcachefs" = "${cfg.package}/bin/bcachefs";
|
||||
"mount.bcachefs" = "${cfg.package}/bin/mount.bcachefs";
|
||||
};
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
|
||||
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/mount.bcachefs
|
||||
copy_bin_and_libs ${cfg.package}/bin/bcachefs
|
||||
copy_bin_and_libs ${cfg.package}/bin/mount.bcachefs
|
||||
'';
|
||||
boot.initrd.extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
$out/bin/bcachefs version
|
||||
@@ -348,7 +353,7 @@ in
|
||||
"sleep.target"
|
||||
];
|
||||
|
||||
script = "${lib.getExe pkgs.bcachefs-tools} data scrub ${fs}";
|
||||
script = "${lib.getExe cfg.package} data scrub ${fs}";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
mktplcRef = {
|
||||
name = "amazon-q-vscode";
|
||||
publisher = "AmazonWebServices";
|
||||
version = "1.93.0";
|
||||
hash = "sha256-Jj8Sj9UrTZVwejbinwxuRt4sZ58vsYlBHhqHkTWjNPM=";
|
||||
version = "1.94.0";
|
||||
hash = "sha256-VLTEDDD0/nadlMKYeeUKdGh3p1JXQoGhUQ6aXGpT10U=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -147,8 +147,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-sievehighlight";
|
||||
publisher = "adzero";
|
||||
version = "1.0.7";
|
||||
hash = "sha256-MoYOhzNRjl7dseDUeJxEWyQ8ZaMx2a3HdCbH4F1HaxI=";
|
||||
version = "1.0.8";
|
||||
hash = "sha256-bogT5Cshl6Rab5iiXWPwju29XX4PHdbR64J5UFPSlRo=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/adzero.vscode-sievehighlight/changelog";
|
||||
@@ -405,7 +405,7 @@ let
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode";
|
||||
homepage = "https://github.com/withastro/language-tools";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -495,8 +495,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "banacorn";
|
||||
name = "agda-mode";
|
||||
version = "0.6.6";
|
||||
hash = "sha256-QzFahhNXwfJQibmoAbBDes+/ZCb83oTAN2w96U5Mf8Y=";
|
||||
version = "0.6.7";
|
||||
hash = "sha256-G8zAFEMM+fsndBjySkQpRlEj9+EGmMNTTI9AUIoMWR0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
|
||||
@@ -1152,8 +1152,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "DanielSanMedium";
|
||||
name = "dscodegpt";
|
||||
version = "3.14.85";
|
||||
hash = "sha256-JeoLWQLYxWdkOmlxrMIhroyfZSL1aWg/rXQORiRQueI=";
|
||||
version = "3.14.110";
|
||||
hash = "sha256-8qTKmtnDFCCYwZPE2E3fDNDPTTvHVMqbNL5BybN58X8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
|
||||
@@ -1747,8 +1747,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "foam-vscode";
|
||||
publisher = "foam";
|
||||
version = "0.27.5";
|
||||
hash = "sha256-QjZlG94bRwrrZhJPUmcyPfyEj8Qd4ZTCCUQ6+CkG9XY=";
|
||||
version = "0.27.7";
|
||||
hash = "sha256-1h/u0MBPtRYIStv3ZR1kbIaiRszavjWs5+oB1huwJBs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
|
||||
@@ -2453,7 +2453,7 @@ let
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=janet-lang.vscode-janet";
|
||||
homepage = "https://github.com/janet-lang/vscode-janet";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2471,7 +2471,7 @@ let
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jbockle.jbockle-format-files";
|
||||
homepage = "https://github.com/jbockle/format-files";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2561,8 +2561,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "jnoortheen";
|
||||
name = "nix-ide";
|
||||
version = "0.4.22";
|
||||
hash = "sha256-j3V03Aa1mHO9rny3/hXmDbs3fmruqyzNzwFjiOlnaMU=";
|
||||
version = "0.4.23";
|
||||
hash = "sha256-MnuFMrP52CcWZTyf2OKSqQ/oqCS3PPivwEIja25N2D0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
|
||||
@@ -2849,7 +2849,7 @@ let
|
||||
homepage = "https://github.com/clangd/vscode-clangd";
|
||||
changelog = "https://marketplace.visualstudio.com/items/llvm-vs-code-extensions.vscode-clangd/changelog";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -3767,8 +3767,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "pico8-ls";
|
||||
publisher = "PollywogGames";
|
||||
version = "0.5.7";
|
||||
hash = "sha256-2cPuEpqr/qvxT9xqMDk345pTk5slSXMc1i80VqV2y2c=";
|
||||
version = "0.6.0";
|
||||
hash = "sha256-qruXJjT2C45LFgFc1xV+h9b6kRZzeh/kS/BZNz6L+x8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/PollywogGames.pico8-ls/changelog";
|
||||
@@ -3872,7 +3872,7 @@ let
|
||||
homepage = "https://github.com/redhat-developer/vscode-java";
|
||||
changelog = "https://marketplace.visualstudio.com/items/redhat.java/changelog";
|
||||
license = lib.licenses.epl20;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
broken = lib.versionOlder jdk.version "17";
|
||||
};
|
||||
};
|
||||
@@ -4163,7 +4163,7 @@ let
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4833,7 +4833,6 @@ let
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
wackbyte
|
||||
defelo
|
||||
];
|
||||
};
|
||||
@@ -4861,8 +4860,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-mdx";
|
||||
publisher = "unifiedjs";
|
||||
version = "1.8.16";
|
||||
hash = "sha256-OTlWvbym109IG6Fqkte5jbFMDVbQMn0CXVI3bnnFa+o=";
|
||||
version = "1.8.17";
|
||||
hash = "sha256-DTbgGVBnT6t++AFq08QmWNCKbbjvNPXMKoHgSL+UzyE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
|
||||
@@ -5169,8 +5168,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "volar";
|
||||
publisher = "Vue";
|
||||
version = "3.0.6";
|
||||
hash = "sha256-hQfS6JTq4hQM5JDCtYFfIaBoV5ORbnao/CL5bqgu+jk=";
|
||||
version = "3.0.7";
|
||||
hash = "sha256-Uwgb+7Zxy4HaE97WdNpTaaCQNARpuu8cae3uDCjZYcA=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
|
||||
@@ -5213,8 +5212,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitblame";
|
||||
publisher = "waderyan";
|
||||
version = "11.1.4";
|
||||
sha256 = "sha256-rKFqv3GIGxnybyk8z1QYzUbncuiwrjiw0h7Mf2gbfQE=";
|
||||
version = "11.2.0";
|
||||
sha256 = "sha256-NEsw5Z0k6AYpDcz6pVl2p0Zayd4qC1VODlcaVEOVoHg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
|
||||
@@ -5496,7 +5495,7 @@ let
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ziglang.vscode-zig";
|
||||
homepage = "https://github.com/ziglang/vscode-zig";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "windows-ai-studio";
|
||||
publisher = "ms-windows-ai-studio";
|
||||
version = "0.18.3";
|
||||
hash = "sha256-F9anvTj8oNN9TaAWcRvZVTcgREyCqeVLRtnIo7XNHXk=";
|
||||
version = "0.20.0";
|
||||
hash = "sha256-oRbNML3+Ynnv7rQamv03TJphun3nAKVeDtVxRXTkoK0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "cwtools-vscode";
|
||||
publisher = "tboby";
|
||||
version = "0.10.26";
|
||||
hash = "sha256-1ZfmcF87LyRxCbQvVX21m1yFu+7QeDCofKXEHj5W8DA=";
|
||||
version = "0.10.30";
|
||||
hash = "sha256-C/2K1o6AOWumOwVjyNQZhqHe2T6LGW32dDJtLXIZguc=";
|
||||
};
|
||||
meta = {
|
||||
description = "Paradox Language Features for Visual Studio Code";
|
||||
|
||||
@@ -135,13 +135,13 @@
|
||||
"vendorHash": "sha256-eci9CC5Gf0Wgfci1Yof9X7pCPcJiITwYxEcCzBcYDU0="
|
||||
},
|
||||
"awscc": {
|
||||
"hash": "sha256-1ZOxJyjDVLhbVEdiSIWF+eNVZ9g2coyz1Bq1TWYq768=",
|
||||
"hash": "sha256-1O7domWvsZR5/i+B5XMBaT/gWbr+bjxi0y++CVaX+y0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.55.0",
|
||||
"rev": "v1.56.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-5wuQnIWk+idOhfFRlFrnupSP4PUTd3QUJdUIdlzCJR8="
|
||||
"vendorHash": "sha256-qnHVii/lpZtswy9CtjOsfgCcWfH5sPwZ+evgxzEIrjQ="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=",
|
||||
|
||||
@@ -194,8 +194,8 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.13.2";
|
||||
hash = "sha256-YzPX1PYm8lj3kxOtpenOsiE6zEW8Gq+4UifyP6qDqGw=";
|
||||
version = "1.13.3";
|
||||
hash = "sha256-8C6OxeTjitDMi3J2KIfI6Q+w4FASS6zxjZHfSo7eZko=";
|
||||
vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
let
|
||||
pname = "mendeley";
|
||||
version = "2.137.0";
|
||||
version = "2.138.0";
|
||||
|
||||
executableName = "${pname}-reference-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||
hash = "sha256-jjwOtcyA1dKWXWVtUsVaXMUgDyBoTKACoZ0UGKH4uL4=";
|
||||
hash = "sha256-OS5VarPvWC3KUIAFEw2QndiNZ2ryj81MxTp1fkvuobE=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "1fps";
|
||||
version = "0.1.10";
|
||||
version = "0.1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1fpsvideo";
|
||||
repo = "1fps";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3uPGFxEWmKQxQWPmotZI29GykUGQDjtDjFPps4QMs0M=";
|
||||
hash = "sha256-8dtcW/niwmhVXB2kZdR/RjNg2ArSClL1w4nGI5rP3+Y=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-J3RGQhjpGURmXOwq19BbbNg5ERrUXHnSG5Id6gX7Nug=";
|
||||
vendorHash = "sha256-29x5Lh++NBAsg2O2Vr6pf9iRuVOvow2R5Iqz6twZGXA=";
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "anyrun";
|
||||
version = "25.9.2";
|
||||
version = "25.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyrun-org";
|
||||
repo = "anyrun";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eSB62Y9QboWMF1aX+KMHc+HkGOMcw4X6gFZu6mQXlgk=";
|
||||
hash = "sha256-IlnFA/a9Clgbt+FuavIKWtauhtH4Fo/rGJIjJDDeYRs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8LTeRhjU0z06BSOhRKeEC7HssFv2lcM6dIJqfHpIo9w=";
|
||||
cargoHash = "sha256-gP324zqfoNSYKIuTJFTWRr2fKBreVZFfZNR+jUasp/8=";
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -56,13 +56,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bambu-studio";
|
||||
version = "02.02.01.60";
|
||||
version = "02.02.02.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bambulab";
|
||||
repo = "BambuStudio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ttv0LwJ0GnDhmxofP7c3CJMawad8AhAToZFOvoK3Zow=";
|
||||
hash = "sha256-vg+sEIztFBfzROl2surRd4l/afZ+tGMtG65m3kDIPAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "4.1.169";
|
||||
version = "4.1.186";
|
||||
src = fetchurl {
|
||||
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
|
||||
hash = "sha256-ZtFyIRhDpf8R/0aWhA83JqKjpNoxgAPVDesE1jRGVH8=";
|
||||
hash = "sha256-/SEBOQF5XzOLVyaCn0+a0iPvVz/JE38hEt9iNJgDRaU=";
|
||||
};
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
|
||||
@@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-session";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-session";
|
||||
rev = version;
|
||||
hash = "sha256-xmKreYrdN22bz5JRkpocf+dfK7BY1Ic4F+mTax0lM3Y=";
|
||||
hash = "sha256-zv1X1MLZBg+Bayd4hjsmrdXkFTRkH4kz7PJe6mFTBqc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.6.33";
|
||||
version = "2.6.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Altinity";
|
||||
repo = "clickhouse-backup";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-H8LwinH9/J2QawzVggt9vA7/oqaTXy02xqqlGPNtZvc=";
|
||||
hash = "sha256-GQH9yV1CdOmdboxH16sIBvj+7dDMLt4q2C2xSFjvbi8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LTljOVQI1fRXvo0cfsiT6SU4Q9t5dyaCuHBq/BiVe/w=";
|
||||
vendorHash = "sha256-je1iVJW+yHMcIm8Y0vd5Ti/JGp1yvmA1lLMvvw81qag=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@@ -44,6 +44,12 @@ buildGoModule rec {
|
||||
--bash <($out/bin/cobra-cli completion bash) \
|
||||
--fish <($out/bin/cobra-cli completion fish) \
|
||||
--zsh <($out/bin/cobra-cli completion zsh) \
|
||||
|
||||
# Ironically, cobra-cli still uses old, slightly buggy completion code
|
||||
# This will correct the #compdef tag and add separate compdef line
|
||||
# allowing direct sourcing to also activate the completion
|
||||
substituteInPlace "$out/share/zsh/site-functions/_cobra-cli" \
|
||||
--replace-fail '#compdef _cobra-cli cobra-cli' "#compdef cobra-cli''\ncompdef _cobra-cli cobra-cli"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,23 +8,22 @@
|
||||
boost,
|
||||
curl,
|
||||
fuse,
|
||||
gtest,
|
||||
openssl,
|
||||
range-v3,
|
||||
spdlog,
|
||||
# cryptopp and gtest on standby - using the vendored ones for now
|
||||
# see https://github.com/cryfs/cryfs/issues/369
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cryfs";
|
||||
version = "0.11.4";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cryfs";
|
||||
repo = "cryfs";
|
||||
rev = version;
|
||||
hash = "sha256-OkJhLg+YzS3kDhlpUQe9A+OiVBPG/iKs6OU7aKFJ5wY=";
|
||||
hash = "sha256-QzxJUh6nD6243x443b0tIb1v2Zs8jRUk8IVarNqs47M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -59,20 +58,19 @@ stdenv.mkDerivation rec {
|
||||
boost
|
||||
curl
|
||||
fuse
|
||||
gtest
|
||||
openssl
|
||||
range-v3
|
||||
spdlog
|
||||
]
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
#nativeCheckInputs = [ gtest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'"
|
||||
"-DCRYFS_UPDATE_CHECKS:BOOL=FALSE"
|
||||
"-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive
|
||||
"-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}"
|
||||
]; # ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake";
|
||||
];
|
||||
|
||||
# macFUSE needs to be installed for the test to succeed on Darwin
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
python3Packages.buildPythonPackage {
|
||||
pname = "edl";
|
||||
version = "3.52.1-unstable-2025-09-04";
|
||||
version = "3.52.1-unstable-2025-09-10";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bkerler";
|
||||
repo = "edl";
|
||||
rev = "035b8be6de2b2e98a2edfc4d19e084c468e9ff20";
|
||||
rev = "334028cd887a2960867750c403dbcad9cbe8c46b";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-cQCLQquLZIWi4h1/84fzPRs+/3dkF6mrfXHC+8Fe7+w=";
|
||||
hash = "sha256-OYrncVbCJkeONeztfj7cB3QW1Q0tlF1b/LeuMqKiblk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2025-09-02";
|
||||
version = "2025-09-17";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QMYhLM8wE8T0fieciUv3aPOanI1GuUToGFMsJETmrS4=";
|
||||
hash = "sha256-9RQ75FK1ZZMSBJBWTAstdCiUb8pB7PzfHOp7Jd03fG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastcdr";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-CDR";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wPhXVQyVtAcMrgeF9diHlyp10SAYfRn67Ly3aFyM/Zc=";
|
||||
hash = "sha256-8TllhOdQQ1pPQriaUq8cgx/aEvmhiJx/09ESzRK7X3k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-mockery";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vektra";
|
||||
repo = "mockery";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G2ROYZlIsl8sVpA41EYUxbNImxxC5vxj5SQZJB9BF/E=";
|
||||
hash = "sha256-paoI7KkpLbpQyEwS/oW8Ck9KiJRTUxzFzihsnFyhrCw=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-QHvD+hJLEPGpl4ZRux6JKwP6f5F2sfWFghSAtZGU+XM=";
|
||||
vendorHash = "sha256-YOhlytIMgMHwj2BM/6vOeheyQd4nUuDWpkwLdCqru8c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.49.4";
|
||||
version = "1.7.49.5";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "grav";
|
||||
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
|
||||
hash = "sha256-ZOhZ5O5s8P4nqjSsLEu4RpyTfZ34YBi0itETwcRdIPQ=";
|
||||
hash = "sha256-zhjsYWma0qze8zdzX01EauzMONeEC6TRkhdQJUoJEUQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kaniko";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "kaniko";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yI7JwZ7ez7LdO7THq0OzyLCVSaoHy//7EoKQbWT0W7Q=";
|
||||
hash = "sha256-4P/NKwC32/hW4goUelnx28zY9bBD5Hbbz/y+S00rt7k=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "lazygit";
|
||||
version = "0.55.0";
|
||||
version = "0.55.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = "lazygit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gx9l7MHWQGnLsD+L+SM+KzBgU8RLtpZG+66pPyerZW4=";
|
||||
hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "14.5.6";
|
||||
version = "14.5.7";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-oUbeteUlgQIzRezEQy9APDtXWX8RuOCtUXQAWlzqkyM=";
|
||||
hash = "sha256-/PR0CDQByiUWlU5lP8QlJ7IQUWiXGTwrZbn9Cbe5xEg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2025-09-02";
|
||||
version = "0-unstable-2025-09-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Nightfox-GTK-Theme";
|
||||
rev = "9e5e876e2a4ca7f69f30cc453990b839232b0149";
|
||||
hash = "sha256-gFrijAev9NuW6kjBNuDADPxwNebrJoUZ3eJCDAlwFrY=";
|
||||
rev = "7672385bb28e39c65d1509f15efbe1a7c1bde631";
|
||||
hash = "sha256-Rd8GkXeyrX3fYoYOO+1GN8MLg2+vW3BsXcbBraAL+Is=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-modprobe";
|
||||
version = "580.82.07";
|
||||
version = "580.82.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = version;
|
||||
hash = "sha256-KJxuAgE816N0gkWSzXPsTSGFNbFukKT3dDhUzqn6fBE=";
|
||||
hash = "sha256-ZWQfl0hlbJELPRjjPef3AyTUIN/8T0J82i1NM8iYUvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnum4 ];
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nzbhydra2";
|
||||
version = "7.16.1";
|
||||
version = "7.16.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
|
||||
hash = "sha256-B7rqsSRLQrsMA049/SSnH7f5MCtU72rgQnO1UB/EG1Y=";
|
||||
hash = "sha256-YQWZjTTgZ0mArAJCqjWYeou+JXxFwAvxM/Z/rpgI4bs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
From 0735b59eba183574e080d2912347d58e6e3d158e Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Volkov <taranarmo@gmail.com>
|
||||
Date: Fri, 12 Sep 2025 20:06:24 +0200
|
||||
Subject: [PATCH] Add missing resolved and integrity fields to several packages
|
||||
|
||||
---
|
||||
package-lock.json | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index 146686dc..9ad9009f 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -12574,6 +12574,8 @@
|
||||
},
|
||||
"packages/cli/node_modules/@testing-library/dom": {
|
||||
"version": "10.4.0",
|
||||
+ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
|
||||
+ "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
@@ -12609,6 +12611,8 @@
|
||||
},
|
||||
"packages/cli/node_modules/@testing-library/react": {
|
||||
"version": "16.3.0",
|
||||
+ "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",
|
||||
+ "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -12660,6 +12664,8 @@
|
||||
},
|
||||
"packages/cli/node_modules/aria-query": {
|
||||
"version": "5.3.0",
|
||||
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
|
||||
+ "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"peer": true,
|
||||
@@ -12669,6 +12675,8 @@
|
||||
},
|
||||
"packages/cli/node_modules/emoji-regex": {
|
||||
"version": "10.4.0",
|
||||
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
|
||||
+ "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"packages/cli/node_modules/react-is": {
|
||||
@@ -12681,6 +12689,8 @@
|
||||
},
|
||||
"packages/cli/node_modules/string-width": {
|
||||
"version": "7.2.0",
|
||||
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
|
||||
+ "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"emoji-regex": "^10.3.0",
|
||||
@@ -12815,6 +12825,8 @@
|
||||
},
|
||||
"packages/core/node_modules/ignore": {
|
||||
"version": "7.0.5",
|
||||
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
|
||||
+ "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 4"
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@@ -2,25 +2,56 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
nix-update-script,
|
||||
jq,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "qwen-code";
|
||||
version = "0.0.6";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QwenLM";
|
||||
repo = "qwen-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s4+1hqdlJh5jOy6uZz608n5DzuBR+v/s+7D85oFwQIY=";
|
||||
hash = "sha256-5qKSWbc0NPpgvt36T/gRSgm1+o2Pbdw3tgfcGba6YSs=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-cGO66hQxgpoxphtt/BPPDIBuAG8yQseCdzUdAO2mkr4=";
|
||||
};
|
||||
patches = [
|
||||
# similar to upstream gemini-cli some node deps are missing resolved and integrity fields
|
||||
# upstream the problem is solved in master and in v0.4+, eventually the fix should arrive to qwen
|
||||
./add-missing-resolved-integrity-fields.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-XvJO3ylm/ER5neSubci2w9OCTmqobmmXLbKmdQAqArY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# patches below remove node-pty dependency which causes build fail on Darwin
|
||||
# should be conditional on platform but since package-lock.json is patched it changes its hash
|
||||
# though seems like this dependency is not really required by the package
|
||||
${jq}/bin/jq '
|
||||
del(.packages."node_modules/node-pty") |
|
||||
del(.packages."node_modules/@lydell/node-pty") |
|
||||
del(.packages."node_modules/@lydell/node-pty-darwin-arm64") |
|
||||
del(.packages."node_modules/@lydell/node-pty-darwin-x64") |
|
||||
del(.packages."node_modules/@lydell/node-pty-linux-arm64") |
|
||||
del(.packages."node_modules/@lydell/node-pty-linux-x64") |
|
||||
del(.packages."node_modules/@lydell/node-pty-win32-arm64") |
|
||||
del(.packages."node_modules/@lydell/node-pty-win32-x64") |
|
||||
walk(
|
||||
if type == "object" and has("dependencies") then
|
||||
.dependencies |= with_entries(select(.key | contains("node-pty") | not))
|
||||
elif type == "object" and has("optionalDependencies") then
|
||||
.optionalDependencies |= with_entries(select(.key | contains("node-pty") | not))
|
||||
else .
|
||||
end
|
||||
)
|
||||
' package-lock.json > package-lock.json.tmp && mv package-lock.json.tmp package-lock.json
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@@ -34,10 +65,10 @@ buildNpmPackage (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r bundle/* $out/
|
||||
patchShebangs $out
|
||||
ln -s $out/gemini.js $out/bin/qwen
|
||||
mkdir -p $out/bin $out/share/qwen-code
|
||||
cp -r bundle/* $out/share/qwen-code/
|
||||
patchShebangs $out/share/qwen-code
|
||||
ln -s $out/share/qwen-code/gemini.js $out/bin/qwen
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "25.2.3";
|
||||
version = "25.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gVz4ek/hj3/Djiv9ckcs1D8hBHlgydH4s32r/qqHQGw=";
|
||||
sha256 = "sha256-atT2e5vzOKYBD3IHmgpq12ew4mxXWEmKQiwgIwW0+j4=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
||||
@@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec {
|
||||
downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${version}";
|
||||
changelog = "https://github.com/rojo-rbx/remodel/raw/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "roboto";
|
||||
version = "3.011";
|
||||
version = "3.012";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/googlefonts/roboto-3-classic/releases/download/v${finalAttrs.version}/Roboto_v${finalAttrs.version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-Ko5x4zn/bhrFLuYktaAsqsWUsIOMfnxK8rZ4UiqK8ds=";
|
||||
hash = "sha256-J1X5+/pW5HgX6LIqQDaZeRmwdIwEVowzsf5Bg0OQy2M=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -48,9 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
Tool designed to enable Roblox developers to use professional-grade software engineering tools.
|
||||
'';
|
||||
mainProgram = "rojo";
|
||||
maintainers = with lib.maintainers; [
|
||||
wackbyte
|
||||
HeitorAugustoLN
|
||||
];
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "smile";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
pyproject = false; # Builds with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mijorus";
|
||||
repo = "smile";
|
||||
tag = version;
|
||||
hash = "sha256-tDdzq2a58x1MVV43IhTZQ/zrVBd2D4BW4102ZEUSWLo=";
|
||||
hash = "sha256-J+cCYt5ATR5xm/NsjYGkfQmHpTS5LDugj0XCphHanDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,18 +11,22 @@
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
|
||||
version = "1.2.70.409";
|
||||
version = "1.2.72.438";
|
||||
|
||||
src =
|
||||
# WARNING: This Wayback Machine URL redirects to the closest timestamp.
|
||||
# Future maintainers must manually check the timestamp exists and exactly matches at:
|
||||
# https://web.archive.org/web/*/https://download.scdn.co/SpotifyARM64.dmg
|
||||
# https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
(fetchurl {
|
||||
url = "https://web.archive.org/web/20250826093914/https://download.scdn.co/SpotifyARM64.dmg";
|
||||
hash = "sha256-bs+rSMfIFG0FyHGDUtuk6tSbd5l6r6qUNH20hQQjZC0=";
|
||||
url = "https://web.archive.org/web/20250912003756/https://download.scdn.co/SpotifyARM64.dmg";
|
||||
hash = "sha256-K+dwlT4hd/SWbQT23ESZY8gGQ8bf5x5CpepMz5Wd6Ng=";
|
||||
})
|
||||
else
|
||||
(fetchurl {
|
||||
url = "https://web.archive.org/web/20250826093142/https://download.scdn.co/Spotify.dmg";
|
||||
hash = "sha256-i1mHX7zo/07sHrGm8c6SQdFekRuJXOmqCcOk2IYPeLI=";
|
||||
url = "https://web.archive.org/web/20250912003614/https://download.scdn.co/Spotify.dmg";
|
||||
hash = "sha256-qGoU8wWfuGvAZR4/998kvoPTqkaJPHASTRyZL8Kitzs=";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@@ -10,37 +10,39 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "2.4.2";
|
||||
version = "2.4.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "techouse";
|
||||
repo = "sqlite3-to-mysql";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wyUJW7G92O3jnwSL5zFy/k/jI6c1H23xYcq7S8wAmsc=";
|
||||
hash = "sha256-oJQR54g6TAf1jZOa2RXJxmBVbC65nmb2KRQpgppK6us=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
click
|
||||
mysql-connector
|
||||
pytimeparse2
|
||||
pymysql
|
||||
pymysqlsa
|
||||
simplejson
|
||||
sqlalchemy
|
||||
sqlalchemy-utils
|
||||
tqdm
|
||||
tabulate
|
||||
unidecode
|
||||
packaging
|
||||
mysql80
|
||||
python-dateutil
|
||||
types-python-dateutil
|
||||
];
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
click
|
||||
mysql-connector
|
||||
pytimeparse2
|
||||
pymysql
|
||||
pymysqlsa
|
||||
simplejson
|
||||
sqlalchemy
|
||||
sqlalchemy-utils
|
||||
tqdm
|
||||
tabulate
|
||||
unidecode
|
||||
packaging
|
||||
mysql80
|
||||
python-dateutil
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"mysql-connector-python"
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
build = "520";
|
||||
build = "536";
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "swiftbar";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/swiftbar/SwiftBar/releases/download/v${version}/SwiftBar.v${version}.b${build}.zip";
|
||||
hash = "sha256-eippK01Q+J9jdwvnGcnr7nw3KwyQQqh051lHN3Xmy+c=";
|
||||
url = "https://github.com/swiftbar/SwiftBar/releases/download/v${finalAttrs.version}/SwiftBar.v${finalAttrs.version}.b${build}.zip";
|
||||
hash = "sha256-K46XQvhLs8rnQ0psveL2dZ/+bTZnaeWVLtrUm29RQYU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@@ -37,11 +37,11 @@ stdenvNoCC.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Powerful macOS menu bar customization tool";
|
||||
homepage = "https://swiftbar.app";
|
||||
changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${version}";
|
||||
changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "SwiftBar";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ matteopacini ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
|
||||
downloadPage = "https://github.com/Roblox/tarmac/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Roblox/tarmac/raw/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -61,10 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
Play multiplayer games against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours!
|
||||
'';
|
||||
mainProgram = "tetrio";
|
||||
maintainers = with lib.maintainers; [
|
||||
wackbyte
|
||||
huantian
|
||||
];
|
||||
maintainers = with lib.maintainers; [ huantian ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
};
|
||||
|
||||
@@ -104,10 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# is a modified version of tetrio-desktop, which is unfree.
|
||||
lib.licenses.unfree
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
huantian
|
||||
wackbyte
|
||||
];
|
||||
maintainers = with lib.maintainers; [ huantian ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "14.5.6";
|
||||
version = "14.5.7";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-GRLCWCCPixclqdk4UijfHqyDAJjx4eiMM7IwePSCZMI=";
|
||||
hash = "sha256-ZQn4m4BnAaHXXXy4qnyqqNDEJDbk4uOlVp3wOKZxPzw=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -131,7 +131,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-dhRPuMwtxzgA8DJdwct9oNjEOftFSS9Z9wP908wcwIw=";
|
||||
hash = "sha256-oJYtgqf4p3Mwrj9ew5qYo4h42rZXd5vqL4+iJZ4OLjo=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -53,10 +53,7 @@ rustPlatform.buildRustPackage {
|
||||
description = "Self contained toolkit for creating, editing, and previewing TPSE files";
|
||||
homepage = "https://gitlab.com/UniQMG/tpsecore";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
huantian
|
||||
wackbyte
|
||||
];
|
||||
maintainers = with lib.maintainers; [ huantian ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
gobject-introspection,
|
||||
hdparm,
|
||||
iproute2,
|
||||
kmod,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
pkg-config,
|
||||
@@ -19,6 +20,7 @@
|
||||
util-linux,
|
||||
versionCheckHook,
|
||||
virt-what,
|
||||
wirelesstools,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@@ -111,8 +113,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gawk
|
||||
hdparm
|
||||
iproute2
|
||||
kmod
|
||||
util-linux
|
||||
virt-what
|
||||
wirelesstools
|
||||
])
|
||||
];
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "utm";
|
||||
version = "4.6.5";
|
||||
version = "4.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
|
||||
hash = "sha256-CzVgfgHi76BPRfF22HW0o4YTh4Bx7lU20qnMO2Sjwo0=";
|
||||
hash = "sha256-4lnoH9FCrL3EWWNpmAEYz+XCxPSR7Za/W8YGxAXXms4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://github.com/Rerumu/Wasynth";
|
||||
license = with lib.licenses; [ gpl3Only ];
|
||||
maintainers = with lib.maintainers; [ wackbyte ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xssproxy";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vincentbernat";
|
||||
repo = "xssproxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OPzFI1ifbV/DJo0hC2xybHKaWTprictN0muKtuq1JaY=";
|
||||
sha256 = "sha256-6M82gQZcgjqZBGw4YszAF0DmS+JXgFp6hl2gOF1RWAs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -26,15 +26,13 @@ lib.makeScope pkgs.newScope (
|
||||
graalvm-oracle_25 = (self.callPackage ./graalvm-oracle { version = "25"; }).overrideAttrs (prev: {
|
||||
autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1" ];
|
||||
});
|
||||
graalvm-oracle_24 = (self.callPackage ./graalvm-oracle { version = "24"; }).overrideAttrs (prev: {
|
||||
autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1.18.0" ];
|
||||
});
|
||||
graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; };
|
||||
graalvm-oracle = self.graalvm-oracle_25;
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead";
|
||||
graalvm-oracle_23 = throw "GraalVM 23 is EOL, use a newer version instead";
|
||||
graalvm-oracle_24 = throw "GraalVM 24 is EOL, use a newer version instead";
|
||||
graalvm-oracle_25-ea = throw "GraalVM 25-ea has been replaced by GraalVM 25";
|
||||
}
|
||||
)
|
||||
|
||||
@@ -22,24 +22,6 @@
|
||||
url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_macos-aarch64_bin.tar.gz";
|
||||
};
|
||||
};
|
||||
"24" = {
|
||||
"aarch64-linux" = {
|
||||
hash = "sha256-dvJVfzLoz75ti3u/Mx8PCS674cw2omeOCYMFiSB2KYs=";
|
||||
url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_linux-aarch64_bin.tar.gz";
|
||||
};
|
||||
"x86_64-linux" = {
|
||||
hash = "sha256-sBYaSbvB0PQGl1Mt36u4BSpaFeRjd15pRf4+SSAlm64=";
|
||||
url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_linux-x64_bin.tar.gz";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
hash = "sha256-3w+eXRASAcUL+muqPGV6gaKIPFtQl6n1q5PauG9+O6I=";
|
||||
url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-x64_bin.tar.gz";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
hash = "sha256-LcdjTtk5xyXUGjU/c0Q/8y5w8vtXc2fxKmk2EH40lNw=";
|
||||
url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-aarch64_bin.tar.gz";
|
||||
};
|
||||
};
|
||||
"17" = {
|
||||
"aarch64-linux" = {
|
||||
hash = "sha256-vZkdSGuS3rdDN7iB4PE6dkycHpD8NYgZCA9zIfpRdeg=";
|
||||
|
||||
@@ -27,9 +27,9 @@ let
|
||||
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
|
||||
"21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc=";
|
||||
"22.0.0-git".gitRelease = {
|
||||
rev = "6fc32e93066c59a39b3c8c9be4e4f416653a917e";
|
||||
rev-version = "22.0.0-unstable-2025-09-07";
|
||||
sha256 = "sha256-CRveujx+4IwaNwopUInRbxdwnQb0bD60fzTfXpNZ3aE=";
|
||||
rev = "c3fb2e1cee954338acb83955b157e0a2e82a4849";
|
||||
rev-version = "22.0.0-unstable-2025-09-16";
|
||||
sha256 = "sha256-jTRI71x395XnfT06cyYLp8x0Z79ttJmmmasa3LiK790=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "28.0.4";
|
||||
sha256 = "sha256-xJXrV0DfYPLunkIg8jtHZNQYEH278cSeh+uR/vGw18k=";
|
||||
version = "28.1";
|
||||
sha256 = "sha256-rR31Zj7c2eNf608HhLNlrGnVQN/Nymug6EcPfeNHfqk=";
|
||||
}
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
|
||||
rec {
|
||||
pname = "mesa";
|
||||
version = "25.2.2";
|
||||
version = "25.2.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "mesa";
|
||||
repo = "mesa";
|
||||
rev = "mesa-${version}";
|
||||
hash = "sha256-9w/E5frSvCtPBI58ClXZyGyF59M+yVS4qi4khpfUZwk=";
|
||||
hash = "sha256-3URQ9ZZ22vdZpToZqpWbcpsAI4e8a5X35/5HWOprbPM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,14 +8,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "iomux";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/haesbaert/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "zNJ3vVOv0BEpHLiC8Y610F87uiMlfYNo28ej0H+EU+c=";
|
||||
hash = "sha256-Hjk/rlWUdoSMXHBSUHaxEHDoBqVJ7rrghLBGqXcrqzU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cv2_enumerate_cameras";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukehugh";
|
||||
repo = "cv2_enumerate_cameras";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BInGgnsvRrfTaofqZzf5LawM/Lbr0vdgU/l7j/VQi1o=";
|
||||
hash = "sha256-pIqT5GEEyRIVHjWd9nNSI4oEvsPjOe2mPC3GWxEdonw=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -10,21 +10,25 @@
|
||||
pytest-rerunfailures,
|
||||
pytestCheckHook,
|
||||
typing-extensions,
|
||||
uv-dynamic-versioning,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcstatus";
|
||||
version = "12.0.2";
|
||||
version = "12.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "py-mine";
|
||||
repo = "mcstatus";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DWIpN7oBbb/F5aER0v0qhcQsDoa/EfizjHgy/BE2P6E=";
|
||||
hash = "sha256-gtLWUIxG40MsmavA4KrHJ3btCR/zKdstwiUiZGsoNcw=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
build-system = [
|
||||
hatchling
|
||||
uv-dynamic-versioning
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
asyncio-dgram
|
||||
@@ -53,13 +57,13 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Python library for checking the status of Minecraft servers";
|
||||
mainProgram = "mcstatus";
|
||||
homepage = "https://github.com/py-mine/mcstatus";
|
||||
changelog = "https://github.com/py-mine/mcstatus/releases/tag/${src.tag}";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
fab
|
||||
perchun
|
||||
];
|
||||
mainProgram = "mcstatus";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-documents";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasonyates";
|
||||
repo = "netbox-documents";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lEbD+NuLyHXnXjGBdceE8RYhmoKEccRB4rKuxknjZL4=";
|
||||
hash = "sha256-Y1PmvoYwtVqQ8Ze7bSa5+Hb3B2W9clDXLOZzOqCvWZE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvidia-ml-py";
|
||||
version = "13.580.65";
|
||||
version = "13.580.82";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "nvidia_ml_py";
|
||||
inherit version;
|
||||
hash = "sha256-e/GLA8fTZYcnARz18MbCFVs2zkOeZTWaCkqQYhT2o8k=";
|
||||
hash = "sha256-DAKIBdxToOKmmF6oAYiBl3Zawu+PHJ4pp78NNhal78c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
requests,
|
||||
}:
|
||||
let
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RapidAI";
|
||||
repo = "RapidOCR";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EgVBMQX+E8ejUd/6FUQ+uJoWjrQSVznpPcc2gA2wAOE=";
|
||||
hash = "sha256-yeDWs9axfVl1SlsVwqztlP7BXV+6w6dMpLmlpWaqVko=";
|
||||
};
|
||||
|
||||
models =
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker-core";
|
||||
version = "1.0.57";
|
||||
version = "1.0.59";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FV8cFA/LDbIVNBIvAo7VRajexbxvqpwKk2hiY1xbehI=";
|
||||
hash = "sha256-h+59FAadpOX9BFl3bnGTDmNOn3oQuPvKyxgfTQ+62g4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sciform";
|
||||
version = "0.39.0";
|
||||
version = "0.39.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jagerber48";
|
||||
repo = "sciform";
|
||||
tag = version;
|
||||
hash = "sha256-5rgTnvckR9bGDgcVZEie+swpc5MEwKQuFHa7zvHiqr8=";
|
||||
hash = "sha256-t43v3xnZap6NayzqBVvw2PzPzHZ5QPSEO5aRzS8AKKE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twill";
|
||||
version = "3.3";
|
||||
version = "3.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IprmAuqwzMwB6ryw0GsdRfeFK6ABP4nBM6VdlfgGNoQ=";
|
||||
hash = "sha256-/ZT5ntn7YMafrD9/rWaOvROKo+CGFKSldG9jjH/eR0Q=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "lxml" ];
|
||||
|
||||
@@ -1065,12 +1065,12 @@ in
|
||||
vim-tmux-navigator = mkTmuxPlugin {
|
||||
pluginName = "vim-tmux-navigator";
|
||||
rtpFilePath = "vim-tmux-navigator.tmux";
|
||||
version = "unstable-2025-04-25";
|
||||
version = "unstable-2025-07-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "christoomey";
|
||||
repo = "vim-tmux-navigator";
|
||||
rev = "33afa80db65113561dc53fa732b7f5e53d5ecfd0";
|
||||
hash = "sha256-h3c5ki8N4kiNzbgjxHwLh625un6GqbLZv/4dPVW3vCI=";
|
||||
rev = "c45243dc1f32ac6bcf6068e5300f3b2b237e576a";
|
||||
hash = "sha256-IEPnr/GdsAnHzdTjFnXCuMyoNLm3/Jz4cBAM0AJBrj8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xone";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlundqvist";
|
||||
repo = "xone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1X2GNQb3Ia61w+IxMnl4XSAYdt1vhYYcSowP52XsUVM=";
|
||||
hash = "sha256-pM4Csmikh8NV0bjl0pz99yxDLDmebIxKCiC4rMeAf3k=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bun,
|
||||
nodejs-slim,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "navbar-card";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joseluis9595";
|
||||
repo = "lovelace-navbar-card";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uw90tm8KI7tqZwMNaRuxuIKVXhCLe0wVNisk91jLwwk=";
|
||||
};
|
||||
|
||||
# Create node_modules as a separate derivation
|
||||
node_modules = stdenv.mkDerivation {
|
||||
pname = "${pname}-node_modules";
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bun
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
|
||||
|
||||
bun install \
|
||||
--force \
|
||||
--frozen-lockfile \
|
||||
--ignore-scripts \
|
||||
--no-progress \
|
||||
--production
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/node_modules
|
||||
cp -R ./node_modules $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-enQSr+HAnoIk2NiuKDx4fmFnIrG0tg23QImicQqDgpk=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bun
|
||||
nodejs-slim
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
# Copy node_modules from the separate derivation
|
||||
cp -R ${node_modules}/node_modules .
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# Build the project using bun
|
||||
bun build src/navbar-card.ts --outfile=dist/navbar-card.js --target=browser
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp ./dist/navbar-card.js $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.entrypoint = "navbar-card.js";
|
||||
|
||||
meta = {
|
||||
description = "Navbar Card for Home Assistant's Lovelace UI - easily navigate through dashboards";
|
||||
homepage = "https://github.com/joseluis9595/lovelace-navbar-card";
|
||||
changelog = "https://github.com/joseluis9595/lovelace-navbar-card/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
}
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "junos-czerwonk-exporter";
|
||||
version = "0.14.3";
|
||||
version = "0.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "czerwonk";
|
||||
repo = "junos_exporter";
|
||||
rev = version;
|
||||
sha256 = "sha256-m8CveakbnxIjqFW1VwSD/sDhpf12mbZRJdwTOLaBYmc=";
|
||||
sha256 = "sha256-RCh81CHdFjJ6R/3wMons4v/xO+kvNa9ohnlWVGSkiyU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zD5QkpyeqrmX0zGgdQg9yQQrX/+0Xz+Q04IzpO+Qc5Q=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-hibp";
|
||||
version = "1.15.16";
|
||||
version = "1.15.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = "gopass-hibp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wmZtLVZhIKAcaE7CC7mlGq/ybcANki1vzdgAoh+NXB8=";
|
||||
hash = "sha256-MUC9eYpm+1inkJtTmXxfS3bTMcsQCZlpNhqlq0p7fEY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5+DdlNqPNbStG7c6eX4t+4ICi3ZfCNQblkyw3eFZZL4=";
|
||||
vendorHash = "sha256-58coZrNZdCK3R5EeJ/xQbRr94Y4ugufjrkaoeQgN1YY=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -2125,10 +2125,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "003lwcl00l13c5r1i1zk5q1p8m50nv83w6h3j2mij6hs2aaz1zwb";
|
||||
sha256 = "OOjCoBKKzgmylgDumA2H6+b+633Wox4dE4uHLqcbuA8=";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.7";
|
||||
version = "4.1.0";
|
||||
};
|
||||
jemoji = {
|
||||
dependencies = [
|
||||
|
||||
Reference in New Issue
Block a user