Merge master into staging-nixos
This commit is contained in:
@@ -319,7 +319,7 @@ let
|
||||
if final.isAarch32 then
|
||||
"arm"
|
||||
else if final.isAarch64 then
|
||||
"aarch64"
|
||||
"aarch64${optionalString final.isBigEndian "_be"}"
|
||||
else if final.isS390 && !final.isS390x then
|
||||
null
|
||||
else if final.isx86_64 then
|
||||
|
||||
@@ -16742,6 +16742,12 @@
|
||||
githubId = 952712;
|
||||
name = "Matt Christ";
|
||||
};
|
||||
mattcurrie = {
|
||||
email = "me+nixpkgs@mattcurrie.com";
|
||||
github = "mattcurrie";
|
||||
githubId = 455505;
|
||||
name = "Matt Currie";
|
||||
};
|
||||
mattdef = {
|
||||
email = "mattdef@gmail.com";
|
||||
github = "mattdef";
|
||||
|
||||
@@ -7,13 +7,23 @@
|
||||
let
|
||||
cfg = config.services.odoo;
|
||||
format = pkgs.formats.ini { };
|
||||
|
||||
inherit (config.system) stateVersion;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.odoo = {
|
||||
enable = lib.mkEnableOption "odoo, an open source ERP and CRM system";
|
||||
|
||||
package = lib.mkPackageOption pkgs "odoo" { };
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
description = "Which package to use for the Odoo instance.";
|
||||
relatedPackages = [
|
||||
"odoo17"
|
||||
"odoo18"
|
||||
"odoo19"
|
||||
];
|
||||
};
|
||||
|
||||
addons = lib.mkOption {
|
||||
type = with lib.types; listOf package;
|
||||
@@ -100,16 +110,32 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
services.odoo.settings.options = {
|
||||
data_dir = "/var/lib/private/odoo/data";
|
||||
proxy_mode = cfg.domain != null;
|
||||
# Disable the database manager by default
|
||||
# https://www.odoo.com/documentation/master/administration/on_premise/deploy.html#database-manager-security
|
||||
list_db = lib.mkDefault false;
|
||||
}
|
||||
// (lib.optionalAttrs (cfg.addons != [ ]) {
|
||||
addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons;
|
||||
});
|
||||
services.odoo = {
|
||||
package = lib.mkDefault (
|
||||
if pkgs ? odoo then
|
||||
throw ''
|
||||
The `pkgs.odoo`-attribute has been removed. If it's supposed to be the default
|
||||
odoo defined in an overlay, please set `services.odoo.package` to
|
||||
`pkgs.odoo`.
|
||||
''
|
||||
else if lib.versionOlder stateVersion "25.05" then
|
||||
pkgs.odoo18
|
||||
else if lib.versionOlder stateVersion "25.11" then
|
||||
pkgs.odoo18
|
||||
else
|
||||
pkgs.odoo19
|
||||
);
|
||||
settings.options = {
|
||||
data_dir = "/var/lib/private/odoo/data";
|
||||
proxy_mode = cfg.domain != null;
|
||||
# Disable the database manager by default
|
||||
# https://www.odoo.com/documentation/master/administration/on_premise/deploy.html#database-manager-security
|
||||
list_db = lib.mkDefault false;
|
||||
}
|
||||
// (lib.optionalAttrs (cfg.addons != [ ]) {
|
||||
addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons;
|
||||
});
|
||||
};
|
||||
|
||||
users.users.odoo = {
|
||||
isSystemUser = true;
|
||||
|
||||
@@ -27,6 +27,7 @@ let
|
||||
in
|
||||
writeScriptBin "nvidia-cdi-generator" ''
|
||||
#! ${runtimeShell}
|
||||
set -e -u -o pipefail
|
||||
|
||||
function cdiGenerate {
|
||||
${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \
|
||||
|
||||
@@ -54,6 +54,19 @@ in
|
||||
description = "Whether to enable Searx, the meta search engine.";
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to open the port in the firewall.
|
||||
Enabling this option adds the port specified in {option}`services.settings.server.port` to {option}`networking.firewall.allowedTCPPorts`.
|
||||
|
||||
::: {.note}
|
||||
When this option is set to true, {option}`services.settings.server.port` must be set as well or an error will be thrown.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
@@ -244,6 +257,13 @@ in
|
||||
];
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.openFirewall -> cfg.settings ? server.port;
|
||||
message = "services.searx.settings.server.port must be set when openFirewall is enabled.";
|
||||
}
|
||||
];
|
||||
|
||||
environment = {
|
||||
etc = {
|
||||
"searxng/favicons.toml" = lib.mkIf (cfg.faviconsSettings != { }) {
|
||||
@@ -392,6 +412,8 @@ in
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; };
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [
|
||||
|
||||
@@ -213,15 +213,16 @@ in
|
||||
settingsFile
|
||||
];
|
||||
|
||||
script = ''
|
||||
${exportAllCredentials cfg.credentials}
|
||||
exec ${getExe cfg.package}
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
ExecStart = pkgs.writeShellScript "pocket-id-start" ''
|
||||
${exportAllCredentials cfg.credentials}
|
||||
${getExe cfg.package}
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = 1;
|
||||
EnvironmentFile = [
|
||||
|
||||
@@ -132,6 +132,12 @@ in
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.console.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.loginOptions != null -> cfg.autologinUser == null;
|
||||
message = "services.getty.autoLoginUser has no effect when services.getty.loginOptions is set.";
|
||||
}
|
||||
];
|
||||
# Note: this is set here rather than up there so that changing
|
||||
# nixos.label would not rebuild manual pages
|
||||
services.getty.greetingLine = mkDefault ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>'';
|
||||
|
||||
@@ -17,28 +17,80 @@ let
|
||||
|
||||
cfg = config.services.kmscon;
|
||||
|
||||
autologinArg = lib.optionalString (cfg.autologinUser != null) "-f ${cfg.autologinUser}";
|
||||
gettyCfg = config.services.getty;
|
||||
|
||||
configDir = pkgs.writeTextFile {
|
||||
name = "kmscon-config";
|
||||
destination = "/kmscon.conf";
|
||||
text = cfg.extraConfig;
|
||||
};
|
||||
|
||||
baseLoginOptions = "-p -- \\u";
|
||||
|
||||
agettyCmd =
|
||||
enableAutologin:
|
||||
"${lib.getExe' pkgs.util-linux "agetty"} ${
|
||||
lib.escapeShellArgs (
|
||||
[
|
||||
"--login-program"
|
||||
(toString gettyCfg.loginProgram)
|
||||
"--login-options"
|
||||
# these options are passed as a single parameter
|
||||
"${lib.optionalString enableAutologin "-f "}${baseLoginOptions}"
|
||||
]
|
||||
++ lib.optionals enableAutologin [
|
||||
"--autologin"
|
||||
gettyCfg.autologinUser
|
||||
]
|
||||
++ gettyCfg.extraArgs
|
||||
++ [
|
||||
"--8bits"
|
||||
"--noclear"
|
||||
"--"
|
||||
"-"
|
||||
]
|
||||
)
|
||||
} $TERM";
|
||||
|
||||
loginScript = pkgs.writers.writeDash "kmscon-login" ''
|
||||
kms_tty=
|
||||
active_tty_file=/sys/class/tty/tty0/active
|
||||
if [ -f "$active_tty_file" ]; then
|
||||
read -r kms_tty < "$active_tty_file"
|
||||
fi
|
||||
|
||||
${lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) ''
|
||||
autologged="/run/kmscon.autologged"
|
||||
if [ "$kms_tty" = tty1 ] && [ ! -f "$autologged" ]; then
|
||||
touch "$autologged"
|
||||
exec ${agettyCmd true}
|
||||
fi
|
||||
''}
|
||||
|
||||
exec ${agettyCmd (gettyCfg.autologinUser != null && !gettyCfg.autologinOnce)}
|
||||
'';
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "services" "kmscon" "autologinUser" ] ''
|
||||
Autologin is now handled by the agetty module.
|
||||
|
||||
Check `services.getty.autologinUser` instead.
|
||||
'')
|
||||
];
|
||||
|
||||
options = {
|
||||
services.kmscon = {
|
||||
enable = mkEnableOption ''
|
||||
kmscon as the virtual console instead of gettys.
|
||||
kmscon is a kms/dri-based userspace virtual terminal implementation.
|
||||
It supports a richer feature set than the standard linux console VT,
|
||||
including full unicode support, and when the video card supports drm
|
||||
should be much faster
|
||||
Use kmscon instead of autovt.
|
||||
|
||||
Kmscon is a simple terminal emulator based on linux kernel mode setting (KMS).
|
||||
It is an attempt to replace the in-kernel VT implementation with a userspace console.
|
||||
'';
|
||||
|
||||
package = mkPackageOption pkgs "kmscon" { };
|
||||
|
||||
hwRender = mkEnableOption "3D hardware acceleration to render the console";
|
||||
hwRender = mkEnableOption "hardware acceleration + DRM backend";
|
||||
|
||||
fonts = mkOption {
|
||||
description = "Fonts used by kmscon, in order of priority.";
|
||||
@@ -63,8 +115,13 @@ in
|
||||
nullOr (nonEmptyListOf fontType);
|
||||
};
|
||||
|
||||
useXkbConfig = mkEnableOption "" // {
|
||||
description = "Whether to configure keymap from xserver keyboard settings.";
|
||||
useXkbConfig = mkEnableOption "configure keymap from xserver keyboard settings.";
|
||||
|
||||
term = mkOption {
|
||||
description = "Value for the TERM environment variable.";
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "xterm-256color";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
@@ -80,33 +137,39 @@ in
|
||||
default = "";
|
||||
example = "--term xterm-256color";
|
||||
};
|
||||
|
||||
autologinUser = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Username of the account that will be automatically logged in at the console.
|
||||
If unspecified, a login prompt is shown as usual.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = gettyCfg.loginOptions == null;
|
||||
message = "services.getty.loginOptions is not supported when services.kmscon is enabled.";
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services."kmsconvt@" = {
|
||||
after = [
|
||||
"systemd-logind.service"
|
||||
"systemd-vconsole-setup.service"
|
||||
];
|
||||
requires = [ "systemd-logind.service" ];
|
||||
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
''
|
||||
${cfg.package}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg}
|
||||
''
|
||||
"" # override upstream default with an empty ExecStart
|
||||
(builtins.concatStringsSep " " (
|
||||
[
|
||||
"${cfg.package}/bin/kmscon"
|
||||
"--configdir"
|
||||
configDir
|
||||
"--vt=%I"
|
||||
"--no-switchvt"
|
||||
"--login"
|
||||
]
|
||||
++ lib.optional (cfg.extraOptions != "") cfg.extraOptions
|
||||
++ [
|
||||
"--"
|
||||
loginScript
|
||||
]
|
||||
|
||||
))
|
||||
];
|
||||
|
||||
restartIfChanged = false;
|
||||
@@ -115,9 +178,6 @@ in
|
||||
|
||||
systemd.suppressedSystemUnits = [ "autovt@.service" ];
|
||||
|
||||
systemd.services.systemd-vconsole-setup.enable = false;
|
||||
systemd.services.reload-systemd-vconsole-setup.enable = false;
|
||||
|
||||
services.kmscon.extraConfig =
|
||||
let
|
||||
xkb = optionals cfg.useXkbConfig (
|
||||
@@ -134,15 +194,20 @@ in
|
||||
) config.services.xserver.xkb
|
||||
)
|
||||
);
|
||||
render = optionals cfg.hwRender [
|
||||
"drm"
|
||||
"hwaccel"
|
||||
];
|
||||
render =
|
||||
if cfg.hwRender then
|
||||
[
|
||||
"drm"
|
||||
"hwaccel"
|
||||
]
|
||||
else
|
||||
[ "no-drm" ];
|
||||
fonts =
|
||||
optional (cfg.fonts != null)
|
||||
"font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}";
|
||||
term = optional (cfg.term != null) "term=${cfg.term}";
|
||||
in
|
||||
lib.concatLines (xkb ++ render ++ fonts);
|
||||
lib.concatLines (xkb ++ render ++ fonts ++ term);
|
||||
|
||||
hardware.graphics.enable = mkIf cfg.hwRender true;
|
||||
|
||||
@@ -151,4 +216,9 @@ in
|
||||
packages = map (f: f.package) cfg.fonts;
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
hustlerone
|
||||
ccicnce113424
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1174,15 +1174,18 @@ in
|
||||
ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { };
|
||||
octoprint = runTest ./octoprint.nix;
|
||||
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
|
||||
odoo = runTest ./odoo.nix;
|
||||
odoo16 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
_module.args.package = pkgs.odoo16;
|
||||
};
|
||||
odoo17 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
_module.args.package = pkgs.odoo17;
|
||||
};
|
||||
odoo18 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
_module.args.package = pkgs.odoo18;
|
||||
};
|
||||
odoo19 = runTest {
|
||||
imports = [ ./odoo.nix ];
|
||||
_module.args.package = pkgs.odoo19;
|
||||
};
|
||||
oh-my-zsh = runTest ./oh-my-zsh.nix;
|
||||
oku = runTest ./oku.nix;
|
||||
olivetin = runTest ./olivetin.nix;
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
nodes.machine =
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -13,6 +12,8 @@
|
||||
./common/user-account.nix
|
||||
];
|
||||
|
||||
services.getty.autologinUser = "alice";
|
||||
|
||||
services.kmscon = {
|
||||
enable = true;
|
||||
hwRender = true;
|
||||
@@ -22,6 +23,7 @@
|
||||
package = pkgs.nerd-fonts.jetbrains-mono;
|
||||
}
|
||||
];
|
||||
term = "xterm-256color";
|
||||
package = pkgs.kmscon;
|
||||
};
|
||||
};
|
||||
@@ -29,15 +31,9 @@
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.start()
|
||||
|
||||
with subtest("ensure we can open a tty"):
|
||||
machine.wait_for_text("machine login:")
|
||||
|
||||
machine.send_chars("alice\n")
|
||||
machine.wait_for_text("Password:")
|
||||
|
||||
machine.send_chars("foobar\n")
|
||||
machine.wait_for_text("alice@machine")
|
||||
|
||||
machine.send_chars("echo $TERM | tee /tmp/term.txt\n")
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
{
|
||||
package,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "odoo";
|
||||
meta.maintainers = with lib.maintainers; [ mkg20001 ];
|
||||
|
||||
_module.args.package = lib.mkDefault pkgs.odoo;
|
||||
|
||||
nodes.server = {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.77";
|
||||
hash = "sha256-fK1Exshw1mRV1S2DXjza01YaExGVeY371aXNTNlhhfE=";
|
||||
version = "2.1.78";
|
||||
hash = "sha256-A8i7yU4W8Fjp1h7EFZKAEdyoqoKBVzJDvEZ+Y06dBXg=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -3552,8 +3552,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-just-syntax";
|
||||
publisher = "nefrob";
|
||||
version = "0.9.0";
|
||||
hash = "sha256-+9OZ8sRYK9D/JiI+cR1BajqrmLqnOYvrwTIfOaPnoq4=";
|
||||
version = "0.9.1";
|
||||
hash = "sha256-yl9v4sL1yWzKwE0MIk7BeAd4/FkLmxQaW5ENb8UVNIU=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog";
|
||||
@@ -4185,8 +4185,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "shd101wyy";
|
||||
name = "markdown-preview-enhanced";
|
||||
version = "0.8.20";
|
||||
hash = "sha256-+dwLuqtEYirQaw/tuG5m5Ugk0crKQQZM43TmslJsBBc=";
|
||||
version = "0.8.21";
|
||||
hash = "sha256-w0LVLoNTTubzfxFT1AQ9++k5IP8FQw1xVOqyA9Y+6W4=";
|
||||
};
|
||||
meta = {
|
||||
description = "Provides a live preview of markdown using either markdown-it or pandoc";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.71.0";
|
||||
hash = "sha256-TzEydphPZ/OmIRJYslFJuk26f97mcIukPDS0WUxMOt4=";
|
||||
version = "3.73.0";
|
||||
hash = "sha256-gPB5/CUw5GQ2jIQzRQ4/osJOkEHDsGY8ATy9lTfBwW8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abcmidi";
|
||||
version = "2025.11.26";
|
||||
version = "2026.02.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sshlien";
|
||||
repo = "abcmidi";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OBlkk5Fq3ep+wZqFfSXNqrXtznisNFjn9uDVj/Q4Odk=";
|
||||
hash = "sha256-Hy0ICuMK4pCaJn/36QwkCfEI5kgmkWyr9V4RhMpGQes=";
|
||||
};
|
||||
|
||||
# TODO: remove once https://github.com/sshlien/abcmidi/pull/15 merged
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.20.5",
|
||||
"version": "1.20.6",
|
||||
"vscodeVersion": "1.107.0",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "5b87664f454da487b8dee87aaf5e3361d9ba79b947770b798bd0fa874a9827e5"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "ad382bf321a6216d07f95af1f613e03f5a07fdf6fc6632b769ce83d81afdd567"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "26fc65c4b538470ed1198f3d0ad855d1e4d81a9bfcbc607816b74de35999dbbf"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "6e17f33d8ccb5622affb3590efccb87c3c4dd505f1d3b0f8506f1c20c39c026a"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-x64/Antigravity.zip",
|
||||
"sha256": "54fdcf8eac2eab176b04e587a5679d2993701fe4e5788e79f25c7ced2de605ef"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-x64/Antigravity.zip",
|
||||
"sha256": "4e56f3ac83bc0e1803b4d811585d567f3795b14ad57ccec1fcfe8cb02f7cb719"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-arm/Antigravity.zip",
|
||||
"sha256": "d3e6e75299062720a3300634305f2030ab8fcb4efb5ce8642305a576554caaca"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-arm/Antigravity.zip",
|
||||
"sha256": "c4392cc64a52b7b7066cb1c21c32918854b7cd7297b7efa3b14397fc7d05ad5a"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'cmake_minimum_required(VERSION 2.8.8)' \
|
||||
'cmake_minimum_required(VERSION 3.10)'
|
||||
|
||||
# boost 1.89 no longer provides boost_system as a separate CMake component
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'find_package(Boost COMPONENTS filesystem system REQUIRED)' \
|
||||
'find_package(Boost COMPONENTS filesystem REQUIRED)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,14 +35,14 @@ let
|
||||
in
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "checkov";
|
||||
version = "3.2.508";
|
||||
version = "3.2.510";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3+0vvdDgrs0eRWiwv8CFl47Bm1W0fTzhJ2unvw2O7Bo=";
|
||||
hash = "sha256-P64vAxt3+XJ8bUB5/tiO+ABagAQXHf8v4AVnFSNz7gM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.77",
|
||||
"buildDate": "2026-03-16T22:20:42Z",
|
||||
"version": "2.1.78",
|
||||
"buildDate": "2026-03-17T21:07:53Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "6426772419c758e71146725582d67f1dda42687c693c83def9ad3422bb81ebf1",
|
||||
"size": 191188976
|
||||
"checksum": "0a4939f36bc0194021c56fa5c8470ad84e2282f2f404f1598a940c2044117168",
|
||||
"size": 191585264
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "9be4a24a213cd3f475713e8fb7548c631aabdc355ca191e926ccb63f12976409",
|
||||
"size": 197269232
|
||||
"checksum": "14d9193a85a6b191b090fd2a1ce261905cccf0bf6728239d7c2147719641963c",
|
||||
"size": 197665520
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "f4303a1a3455b0ebbdd356c1337ae3076affc122fb79a78a2d1886e5c62f289c",
|
||||
"size": 233092192
|
||||
"checksum": "75cf87465197883df61dcbb187d4ad3fc031bf91927658159929dcd2959542dc",
|
||||
"size": 233493894
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "34559c9cc9eeadc942d6731367aed3915b6b7351d98c61ebfebbd8fa59508ecd",
|
||||
"size": 235864091
|
||||
"checksum": "b120a4139a4477a2719aeb0b2c790a5c2fe2d904e47f4e2adf3cab33b342d03a",
|
||||
"size": 236265617
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "6e0fa4b8375637c96aafc9a53652bdd1db6dee159e0017a4b23b5f1243f6888e",
|
||||
"size": 223627664
|
||||
"checksum": "2882a6412fd1109aedc9be76e798888cefbaecc1d7d20f0024932a80bbf051f7",
|
||||
"size": 224029366
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "9608235989878d70a42f048db20d3b009d4dc3dd4c0cbf60280058a70a7c1cd9",
|
||||
"size": 226461579
|
||||
"checksum": "7786b1b3aa8a4293800b6b34c93fd973d09865da1de2b970ba976c39f1bb50ac",
|
||||
"size": 226863105
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "ba97366072c87110b130e886d071de19f29bbd1080db92d33c4ceadb5ba39611",
|
||||
"size": 240405152
|
||||
"checksum": "c979e148d5431d3eaf00383d0a65a1793e7a9f160f0dc06561a85b17c7a8bd78",
|
||||
"size": 240781984
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "fb703bb40c5ae851f0d8e34a5aee3bc8c8a996a63de1f874d10c06161bad4d98",
|
||||
"size": 236599456
|
||||
"checksum": "eea099a2565559e44b6d884e74c827456d10bd4353b27004fc47a99142535265",
|
||||
"size": 236975776
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.77",
|
||||
"version": "2.1.78",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.77",
|
||||
"version": "2.1.78",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.77";
|
||||
version = "2.1.78";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-3bsFS3EZYbU8htlO7QtA9Qs8xlm0ZPz02bJ3ROZaugY=";
|
||||
hash = "sha256-iyR20O4m1KFqrr2/zqRFVLCIMpvUiGghf/Uqy0T5czU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-spxAd9PEGRQFiGjaNRqGCu23PdmfwmBQyhT+gwTiTMs=";
|
||||
npmDepsHash = "sha256-rhmItpljv64RgXK++WsuRM8fOJ/cGmOCtkaVywa4tqY=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "composer-require-checker";
|
||||
version = "4.21.0";
|
||||
version = "4.22.0";
|
||||
|
||||
# Upstream no longer provides the composer.lock in their release artifact
|
||||
src = fetchgit {
|
||||
url = "https://github.com/maglnet/ComposerRequireChecker";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Vr87mIljmov6owtQ8vo3e4bTOQx2x0zDtcyEUSt+ti0=";
|
||||
hash = "sha256-L/jhVJxZOa3oIahVI85VoueFHUIuzKsQGum4127Psbg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0hJu+k0iYdj0WnsFVuXdGQy5J82xKCGF3qg/zNsgj5s=";
|
||||
vendorHash = "sha256-aAXFEtlQ89k7GjSQOPkN5kRg0GbAO46MACSzDL9LK34=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -30,14 +30,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "debian-devscripts";
|
||||
version = "2.26.5";
|
||||
version = "2.26.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "devscripts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Fwl7UGIe0DcqKRWC/rm1Sa1DfxX4I35yJVSmfxERK6k=";
|
||||
hash = "sha256-OoaugAlaS6JaSNHSn21XOVmC43MW5ggCSDSq8O271c8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
devenvNixVersion = "2.32";
|
||||
devenvNixRev = "41eee9d3b1f611b1b90d51caa858b6d83834c44a";
|
||||
devenvNixRev = "ef483d53f25990bf0b4fd39f5414f885977ebd85";
|
||||
|
||||
nix_components =
|
||||
(nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "nix";
|
||||
rev = devenvNixRev;
|
||||
hash = "sha256-vtf03lfgQKNkPH9FdXdboBDS5DtFkXB8xRw5EBpuDas=";
|
||||
hash = "sha256-eY8JFns4OeEidye8VIW68LSoykbPO0bQujvQVLLK7Qg=";
|
||||
})).overrideScope
|
||||
(
|
||||
finalScope: prevScope: {
|
||||
@@ -48,10 +48,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "cachix";
|
||||
repo = "devenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wPH6q2PSP64doUXHqdEAmY68X4IAeC2UjSIyqzoUYwE=";
|
||||
hash = "sha256-8tO3NLG9Lc/NUee0Owcf/z63TNTrUcx7eVRxSb294rk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CzhdUrNAAhCVnXZCk06djnBv1cczhj7tIG/JRmaBX5c=";
|
||||
cargoHash = "sha256-ecntFSPDWblllDtS/D086UKtQJG9La4TGEBhP3q0CfY=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "--cfg tracing_unstable";
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchgit,
|
||||
gitUpdater,
|
||||
|
||||
cmake,
|
||||
ninja,
|
||||
@@ -62,14 +63,14 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "digikam";
|
||||
version = "8.8.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "graphics";
|
||||
repo = "digikam";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yUrB0FXUcm+6QtlB7HMqdPpdhrV2iAo1oRkjgsHJiCU=";
|
||||
hash = "sha256-zYOtTL4qEjXa/ZYlDIvneziYBXq4tIiVjRsrSJMaS0k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -199,13 +200,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# over 3h in a normal build slot (2 cores
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Photo management application";
|
||||
homepage = "https://www.digikam.org/";
|
||||
changelog = "${finalAttrs.src.meta.homepage}-/blob/master/project/NEWS.${finalAttrs.version}";
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ philipdb ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "digikam";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fakedir";
|
||||
version = "0-unstable-2025-12-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nixie-dev";
|
||||
repo = "fakedir";
|
||||
rev = "82bfac1f58a76f56fc4ef928982f507e01c552a5";
|
||||
hash = "sha256-wPseLfbRffX0Pr4TxJh59cmuY1OEfSDTvM2KrORafKs=";
|
||||
};
|
||||
|
||||
CFLAGS = "-Ofast -DSTRIP_DEBUG";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 libfakedir.dylib $out/lib/libfakedir.dylib
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
"--version-regex=(0-unstable-.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Substitutes a directory elsewhere on macOS by replacing system calls";
|
||||
homepage = "https://github.com/nixie-dev/fakedir";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ eveeifyeve ];
|
||||
mainProgram = "fakedir";
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "14.0.4";
|
||||
version = "14.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QFmxEJT7r6Ijr8f9x7YZxpPVlP8A7ea6kgVB/qAHUBE=";
|
||||
hash = "sha256-IXfxrBHrVBAY9yakbBiWl2oBXFCnXxPz6l1avJab9kE=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-MnAsEKdsuCQGMyU05ljzeJdaiPki6JikHRd1q9lhmtk=";
|
||||
vendorHash = "sha256-9B47qGdSmNJcEI3kVwV2dyQmFbFrPMCX8izNjqbrFdk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "ghunt";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -14,8 +14,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
repo = "ghunt";
|
||||
# The newer releases aren't git-tagged to we just take the
|
||||
# commit with the version bump
|
||||
rev = "5782248bfd92a24875e112ed0a83e6986d4c70d0";
|
||||
hash = "sha256-SQk/hy4r9LIffsu3kxLTv5LCcEvcZkP2jhmPA6Fzo8U=";
|
||||
rev = "e8b0669cabb410dc40fb76b8d5d386a3a83fe08c";
|
||||
hash = "sha256-Zd0kpyr+Hkbh5MH3q3lrkH3liXw95sKRX+SZhsUVUhI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
lib,
|
||||
stdenv,
|
||||
libtool,
|
||||
@@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-9uf9C2iu0pLoW7aGYWuvZVHVyUJK3N3KEdgIujGMsyA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for GCC 15 / C23, which interprets empty function parameter lists as
|
||||
# having no parameters instead of an unspecified signature.
|
||||
(fetchpatch2 {
|
||||
url = "https://src.fedoraproject.org/rpms/global/raw/5a1ababa270e571f3133c03edcdb0e65f95e763f/f/libdb-dbpanic-function-pointers.patch";
|
||||
hash = "sha256-o8u90h8ufF0Yr049fR9iMba+xq1tHXeiPdrHFSZMir0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libtool
|
||||
makeWrapper
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "hydralauncher";
|
||||
version = "3.9.1";
|
||||
version = "3.9.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
|
||||
hash = "sha256-Cc6V3D3g3CYyozkvl1baDRJcsd+oaRNAMV1HPOkh/gw=";
|
||||
hash = "sha256-CTy7kMRSaMYRtOctbgizA2i4VGSLGS5/kI2lAnTuDC4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname src version; };
|
||||
|
||||
@@ -2,29 +2,45 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
nix-update-script,
|
||||
kdePackages,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kara";
|
||||
version = "0.8.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhruv8sh";
|
||||
repo = "kara";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gdYwgHNnkvayd7GK9H8AZHeKL589hU6MN9DXiUkSU3A=";
|
||||
hash = "sha256-nOMsR9bocDVwH1wB+tGu7y4hnvcAUVTNPXrAzcmws3w=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
];
|
||||
|
||||
mkdir -p $out/share/plasma/plasmoids/org.dhruv8sh.kara
|
||||
cp metadata.json $out/share/plasma/plasmoids/org.dhruv8sh.kara
|
||||
cp -r contents $out/share/plasma/plasmoids/org.dhruv8sh.kara
|
||||
buildInputs = with kdePackages; [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
ki18n
|
||||
kservice
|
||||
kwindowsystem
|
||||
libplasma
|
||||
plasma-activities
|
||||
kwin
|
||||
plasma-workspace
|
||||
];
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6")
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kde-rounded-corners";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matinlotfali";
|
||||
repo = "KDE-Rounded-Corners";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-v/kobtUoWBbYP4iMiUqWNnpIYyu5CBmYHnwxfN4eoQ0=";
|
||||
hash = "sha256-ivWOMl0cveJHC6eX/QYteVi2GaRJ/2j02YlDj/Uvs1s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,19 +18,21 @@
|
||||
ninja,
|
||||
check,
|
||||
bash,
|
||||
gawk,
|
||||
inotify-tools,
|
||||
buildPackages,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kmscon";
|
||||
version = "9.3.1";
|
||||
version = "9.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmscon";
|
||||
repo = "kmscon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pH+dBcUKXrVh9/y6mNWmYBx6HVbuSZX/F2sCG/Yj5UQ=";
|
||||
hash = "sha256-a1H9/j92Z/vjvFp226Ps9PFy5dAS8yg+RErgJWIb9HQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -78,6 +80,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/kmscon \
|
||||
--replace-fail "awk" "${lib.getExe gawk}"
|
||||
substituteInPlace $out/bin/kmscon-launch-gui \
|
||||
--replace-fail "inotifywait" "${lib.getExe' inotify-tools "inotifywait"}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.kmscon = nixosTests.kmscon;
|
||||
updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
|
||||
@@ -7,7 +7,7 @@ index de29a32..e731bbd 100644
|
||||
|
||||
systemd_deps = dependency('systemd', required: false)
|
||||
-systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system')
|
||||
+systemdsystemunitdir = get_option('libdir') / 'systemd'
|
||||
+systemdsystemunitdir = get_option('libdir') / 'systemd' / 'system'
|
||||
|
||||
#
|
||||
# Required dependencies
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
gitMinimal,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -13,8 +15,13 @@ buildGoModule (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "krew";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-KG4/vtEfwWVddfFoNbC4xakxOynDY6jyxek4JAXW5gY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rhl4qVHwl876OSDrcLSS07x3H/x/zmFLPHdRw+fcYsw=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > "$out/.git_head"
|
||||
rm -rf "$out/.git"
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z0wiYknXcCx4vqROngn58CRe9TBgya4y3v736VBMhQ8=";
|
||||
@@ -23,11 +30,29 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X"
|
||||
"sigs.k8s.io/krew/internal/version.gitTag=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ldflags+=" -X=sigs.k8s.io/krew/internal/version.gitCommit=$(<.git_head)"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/krew \
|
||||
--prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
meta = {
|
||||
description = "Package manager for kubectl plugins";
|
||||
mainProgram = "krew";
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1234567..abcdefg 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -151,14 +151,4 @@ include_directories(${ZLIB_INCLUDE_DIRS})
|
||||
|
||||
# libArchive
|
||||
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
- # Homebrew ships libarchive keg only, include dirs have to be set manually
|
||||
- execute_process(
|
||||
- COMMAND brew --prefix libarchive
|
||||
- OUTPUT_VARIABLE LIBARCHIVE_PREFIX
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- COMMAND_ERROR_IS_FATAL ANY
|
||||
- )
|
||||
- set(LibArchive_INCLUDE_DIR "${LIBARCHIVE_PREFIX}/include")
|
||||
-endif()
|
||||
find_package(LibArchive REQUIRED)
|
||||
include_directories(${LibArchive_INCLUDE_DIR})
|
||||
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
# From https://github.com/LibreSprite/LibreSprite/pull/565
|
||||
./cmake4.diff
|
||||
# Remove Homebrew-specific brew invocation for libarchive on Darwin;
|
||||
# Nix provides libarchive directly via buildInputs.
|
||||
./no-brew.patch
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -110,7 +113,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ fgaz ];
|
||||
platforms = lib.platforms.all;
|
||||
# https://github.com/LibreSprite/LibreSprite/issues/308
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "matomo";
|
||||
version = "5.5.2";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-1cUIKSrV5IgCdi3AvIxliJY0kWdaT+S+w8pEi2KoDjE=";
|
||||
hash = "sha256-IMX15BVhwccLmooeULtLomYJmgl1E5CoiiBxDNkJzsY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -59,13 +59,13 @@ let
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
MAVEN_EXTRA_ARGS=""
|
||||
MAVEN_EXTRA_ARGS="-B"
|
||||
|
||||
# handle proxy
|
||||
if [[ -n "''${HTTP_PROXY-}" ]] || [[ -n "''${HTTPS_PROXY-}" ]] || [[ -n "''${NO_PROXY-}" ]];then
|
||||
mvnSettingsFile="$(mktemp -d)/settings.xml"
|
||||
${writeProxySettings} $mvnSettingsFile
|
||||
MAVEN_EXTRA_ARGS="-s=$mvnSettingsFile"
|
||||
MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -s=$mvnSettingsFile"
|
||||
fi
|
||||
|
||||
# handle cacert by populating a trust store on the fly
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ni";
|
||||
version = "28.3.0";
|
||||
version = "29.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antfu-collective";
|
||||
repo = "ni";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YLHtNJIGdprmqgBnKMREeHk6zZ43909JpmjJk/j0qyU=";
|
||||
hash = "sha256-PRYsKIpjb3Mu+U1Vc4eHx07LHZt7DycEkb/AFsi/OgA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-cwVCGEhNmhMweJJJoPzqe8e2agHfIxIi6WmKiceCAns=";
|
||||
hash = "sha256-zYKsg9tMaiclazKkiE8EIKRJFwePEwChsvFOs9bp1jE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -94,7 +94,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
inherit (nixosTests) odoo;
|
||||
inherit (nixosTests) odoo18;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
inherit (nixosTests) odoo;
|
||||
inherit (nixosTests) odoo19;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
@@ -10,6 +11,7 @@
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
rolldown,
|
||||
installShellFiles,
|
||||
version ? "2026.3.12",
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -39,6 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pnpm_10
|
||||
nodejs_22
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
@@ -82,6 +85,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenvNoCC.hostPlatform.emulatorAvailable buildPackages) (
|
||||
let
|
||||
emulator = stdenvNoCC.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
installShellCompletion --cmd openclaw \
|
||||
--bash <(${emulator} $out/bin/openclaw completion --shell bash) \
|
||||
--fish <(${emulator} $out/bin/openclaw completion --shell fish) \
|
||||
--zsh <(${emulator} $out/bin/openclaw completion --shell zsh)
|
||||
''
|
||||
);
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "padthv1";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/padthv1/padthv1-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Rru6nIPTdXmBD5sXHQXaB4gjWrlB6F6CYHPTjY7ekuo=";
|
||||
hash = "sha256-Vn1VgzpWgeHxhE+BiVeXrHdkMq5BXMcnS1dG3b33noY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-ge-bin";
|
||||
version = "GE-Proton10-32";
|
||||
version = "GE-Proton10-33";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-NxZ4OJUYQdRNQTb62jRET6Ef14LEhynOASIMPvwWeNA=";
|
||||
hash = "sha256-vuPqz9vD/B1H6IFA7Wi/YEPbklNTbVbEZ2Erm62kBnk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "qovery-cli";
|
||||
version = "1.57.3";
|
||||
version = "1.57.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RjSpojVDmUIBYTKPiiFzbkUeena45nFNi/GhD14FbYY=";
|
||||
hash = "sha256-RUNAWqFUF/7KXsFHmGDtl5elhCVoTXhsFC2LsKUEb6M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i0QWcRF8PKDQmZMzI0mHWY6pDbnjAOoXKxg9onavTjw=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rabbitmqadmin-ng";
|
||||
version = "2.22.0";
|
||||
version = "2.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rabbitmq";
|
||||
repo = "rabbitmqadmin-ng";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y5esZgvaIaAkEDaeBzda3I1LfYS4ho3Nb6ypqank6+U=";
|
||||
hash = "sha256-tc4ihqSZ+lIGg4PXzsLp51fMgYi2frsv6rxkOgp8J9k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Aj6DVn9vPG0U0iMlUVAaxpsyaLyHMj/TeH4sftvuTi8=";
|
||||
cargoHash = "sha256-V1ANIUTLYOfFEzIzEMFHiQD5hKFhv6maK5+bRS9TXTg=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
gvfs,
|
||||
libheif,
|
||||
glib-networking,
|
||||
nodejs_20,
|
||||
nodejs_24,
|
||||
npmHooks,
|
||||
cargo-tauri,
|
||||
writableTmpDirAsHomeHook,
|
||||
@@ -42,13 +42,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rapidraw";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberTimon";
|
||||
repo = "RapidRAW";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PzPw7TJQK6ojsdw8cypS/drtc/ec93IYGIjTEdpIraI=";
|
||||
hash = "sha256-C6U3xU/rL+Og6DgJTnPESf+LPlm+svTNS5bSGhrn7dQ=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# darwin/linux hash mismatch in rawler submodule
|
||||
@@ -62,21 +62,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-4PbNSM4BIMOpmPcys/Vt5gzy/Pu9L6rPcG0lGnTDvGo=";
|
||||
hash = "sha256-YpM/EQ4eFqziwEpSXpBNEO8A5fCmjVtCrgr11YxLKxY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
wrapGAppsHook4
|
||||
nodejs_20
|
||||
nodejs_24
|
||||
npmHooks.npmConfigHook
|
||||
cargo-tauri.hook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nodejs_20
|
||||
nodejs_24
|
||||
glib-networking
|
||||
openssl
|
||||
gtk3
|
||||
@@ -136,22 +136,32 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ORT_STRATEGY = "system";
|
||||
};
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# Patch the .desktop file to set the Categories field
|
||||
sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop"
|
||||
postInstall =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# Patch the .desktop file to set the Categories field
|
||||
sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop"
|
||||
|
||||
# Ensure the resources directory exists before linking
|
||||
mkdir -p $out/lib/RapidRAW/resources
|
||||
# Ensure the resources directory exists before linking
|
||||
mkdir -p $out/lib/RapidRAW/resources
|
||||
|
||||
# link the .so file
|
||||
ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so
|
||||
'';
|
||||
# link the .so file
|
||||
ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Add rpath for onnxruntime so the binary can find libonnxruntime.dylib at runtime
|
||||
install_name_tool -add_rpath "${onnxruntime}/lib" "$out/Applications/RapidRAW.app/Contents/MacOS/rapidraw"
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapGApp $out/bin/rapidraw \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \
|
||||
--set ORT_STRATEGY "system"
|
||||
'';
|
||||
postFixup =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapGApp $out/bin/rapidraw \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \
|
||||
--set ORT_STRATEGY "system"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
wrapGApp "$out/Applications/RapidRAW.app/Contents/MacOS/rapidraw" \
|
||||
--set ORT_STRATEGY "system"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Blazingly-fast, non-destructive, and GPU-accelerated RAW image editor built with performance in mind";
|
||||
|
||||
@@ -9,7 +9,7 @@ gem "actionpack-xml_parser"
|
||||
gem 'roadie-rails', '~> 3.3.0'
|
||||
gem 'marcel'
|
||||
gem 'mail', '~> 2.8.1'
|
||||
gem 'nokogiri', '~> 1.18.3'
|
||||
gem 'nokogiri', '~> 1.19.1'
|
||||
gem 'i18n', '~> 1.14.1'
|
||||
gem 'rbpdf', '~> 1.21.4'
|
||||
gem 'addressable'
|
||||
|
||||
@@ -77,7 +77,7 @@ GEM
|
||||
minitest (>= 5.1)
|
||||
securerandom (>= 0.3)
|
||||
tzinfo (~> 2.0, >= 2.0.5)
|
||||
addressable (2.8.8)
|
||||
addressable (2.8.9)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
ast (2.4.3)
|
||||
base64 (0.3.0)
|
||||
@@ -155,7 +155,7 @@ GEM
|
||||
prism (>= 1.3.0)
|
||||
rdoc (>= 4.0.0)
|
||||
reline (>= 0.4.2)
|
||||
json (2.18.1)
|
||||
json (2.19.1)
|
||||
jwt (3.1.2)
|
||||
base64
|
||||
language_server-protocol (3.17.0.5)
|
||||
@@ -178,14 +178,14 @@ GEM
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
mime-types-data (~> 3.2025, >= 3.2025.0507)
|
||||
mime-types-data (3.2026.0224)
|
||||
mime-types-data (3.2026.0303)
|
||||
mini_magick (5.2.0)
|
||||
benchmark
|
||||
logger
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.9)
|
||||
minitest (5.27.0)
|
||||
mocha (3.0.2)
|
||||
mocha (3.1.0)
|
||||
ruby2_keywords (>= 0.0.5)
|
||||
multi_xml (0.8.1)
|
||||
bigdecimal (>= 3.1, < 5)
|
||||
@@ -205,7 +205,7 @@ GEM
|
||||
net-protocol
|
||||
netrc (0.11.0)
|
||||
nio4r (2.7.5)
|
||||
nokogiri (1.18.10)
|
||||
nokogiri (1.19.1)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
oauth2 (2.0.18)
|
||||
@@ -233,7 +233,7 @@ GEM
|
||||
psych (5.3.1)
|
||||
date
|
||||
stringio
|
||||
public_suffix (7.0.2)
|
||||
public_suffix (7.0.5)
|
||||
puma (7.2.0)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.8.1)
|
||||
@@ -326,7 +326,7 @@ GEM
|
||||
rubocop-ast (>= 1.45.1, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 4.0)
|
||||
rubocop-ast (1.49.0)
|
||||
rubocop-ast (1.49.1)
|
||||
parser (>= 3.3.7.2)
|
||||
prism (~> 1.7)
|
||||
rubocop-performance (1.25.0)
|
||||
@@ -373,7 +373,7 @@ GEM
|
||||
svg_optimizer
|
||||
thor
|
||||
thor (1.5.0)
|
||||
timeout (0.6.0)
|
||||
timeout (0.6.1)
|
||||
trilogy (2.9.0)
|
||||
tsort (0.2.0)
|
||||
tzinfo (2.0.6)
|
||||
@@ -430,7 +430,7 @@ DEPENDENCIES
|
||||
net-ldap (~> 0.17.0)
|
||||
net-pop (~> 0.1.2)
|
||||
net-smtp (~> 0.5.0)
|
||||
nokogiri (~> 1.18.3)
|
||||
nokogiri (~> 1.19.1)
|
||||
oauth2
|
||||
pg (~> 1.5.3)
|
||||
propshaft (~> 1.1.0)
|
||||
|
||||
@@ -218,10 +218,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
|
||||
sha256 = "11ali533wx91fh93xlk88gjqq8w0p7kxw09nlh41hwc9wv5ly5fc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.8";
|
||||
version = "2.8.9";
|
||||
};
|
||||
ast = {
|
||||
groups = [
|
||||
@@ -775,10 +775,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
|
||||
sha256 = "0b888h9v2y4aasi9aapxqimiaj1i1csk56l22dczigs8kv2zv56x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.18.1";
|
||||
version = "2.19.1";
|
||||
};
|
||||
jwt = {
|
||||
dependencies = [ "base64" ];
|
||||
@@ -928,10 +928,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1zg5cyzhkdzkygspl676h8pad83l6gmwykvcd4snjzxkd00jx85y";
|
||||
sha256 = "09627cnx432528j7j73711fbd0r30ri0lfsh9dfiki94b3gg2jhn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2026.0224";
|
||||
version = "3.2026.0303";
|
||||
};
|
||||
mini_magick = {
|
||||
dependencies = [
|
||||
@@ -994,10 +994,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1y1dx5crlx7ppshzv7qqfj0mgpvzyxc0f107mvsvywcb3m9jk01x";
|
||||
sha256 = "0mhx9qyiig73mw3zrk8f28ca8dqx8gwgipw94jri07zvxdljvx3m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
};
|
||||
multi_xml = {
|
||||
dependencies = [ "bigdecimal" ];
|
||||
@@ -1134,10 +1134,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
|
||||
sha256 = "1lss1nh526n3h1qsig2kjchi8vlsjwc8pdjpplm1f2yz6rzk52sr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.10";
|
||||
version = "1.19.1";
|
||||
};
|
||||
oauth2 = {
|
||||
dependencies = [
|
||||
@@ -1283,10 +1283,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i";
|
||||
sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.2";
|
||||
version = "7.0.5";
|
||||
};
|
||||
puma = {
|
||||
dependencies = [ "nio4r" ];
|
||||
@@ -1727,10 +1727,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9";
|
||||
sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.49.0";
|
||||
version = "1.49.1";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = [
|
||||
@@ -1990,10 +1990,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd";
|
||||
sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
};
|
||||
trilogy = {
|
||||
groups = [ "default" ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.1.1";
|
||||
version = "6.1.2";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Hy5t0GlwYvxzNwH4i1BB3A38a1NiVet5AvIfsJcOYD4=";
|
||||
hash = "sha256-k46XXoCMz7Sw3LrYtC8Cqs8Mqe8VSRw4xa9HVnQMzwg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -25,16 +25,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "restate";
|
||||
version = "1.5.6";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "restatedev";
|
||||
repo = "restate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N27cKlJxQtE+/fMnaTlWyM3QeOIkt5M79t9PzB69eqw=";
|
||||
hash = "sha256-i9P6Lh0Qw4ylUVwAE51UTE5rSDluZafpEmxuAtv0SYQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JnlqKESW2VBv902/qZqEr5rEDSLhnpQ/nZdYHU6tBMI=";
|
||||
cargoHash = "sha256-LfLqScEqBJK9s+xRg2Ah1OnBEDQjXQ9LgJGusmxEDfk=";
|
||||
|
||||
env = {
|
||||
PROTOC = lib.getExe protobuf;
|
||||
@@ -76,6 +76,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
# Have to be set to dynamically link librdkafka
|
||||
CARGO_FEATURE_DYNAMIC_LINKING = 1;
|
||||
|
||||
# krb5-src contains K&R-style C code incompatible with GCC 14's default C23 standard;
|
||||
# tikv-jemalloc-sys has a strerror_r return type mismatch (-Wint-conversion)
|
||||
NIX_CFLAGS_COMPILE = "-std=gnu17 -Wno-error=int-conversion";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -105,7 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# TIMEOUT [ 180.006s]
|
||||
"--skip"
|
||||
"fast_forward_over_trim_gap"
|
||||
# TIMEOUT (could be related to https://github.com/resytatedev/restate/issues/3043)
|
||||
# TIMEOUT (could be related to https://github.com/restatedev/restate/issues/3043)
|
||||
"--skip"
|
||||
"restatectl_smoke_test"
|
||||
];
|
||||
|
||||
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
maintainers = with lib.maintainers; [
|
||||
NieDzejkob
|
||||
mattcurrie
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
python.pkgs.toPythonModule (
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2026-03-10";
|
||||
version = "0-unstable-2026-03-18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "8b95b2058be41580270f1dc348847c3342ee129b";
|
||||
hash = "sha256-5IdfqWj4zOSnkvsssSJywKXrY18DO/zPKNLAJ19Jirk=";
|
||||
rev = "3810dc9d1c38b44d4e14eaf502222e7dc72f3e17";
|
||||
hash = "sha256-EoKClu4K9oYLjzG+zhglRDeIN5PXlEnvhsyeVdRTH/w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
@@ -8,16 +8,14 @@
|
||||
jbigkit,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
color-profiles = stdenv.mkDerivation {
|
||||
pname = "splix-color-profiles";
|
||||
version = "unstable-2007-06-25";
|
||||
version = "0-unstable-2007-06-25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://splix.ap2c.org/samsung_cms.tar.bz2";
|
||||
sha256 = "1156flics5m9m7a4hdmcc2nphbdyary6dfmbcrmsp9xb7ivsypdl";
|
||||
url = "https://web.archive.org/web/20170518031609if_/http://splix.ap2c.org/samsung_cms.tar.bz2";
|
||||
hash = "sha256-tF2vdzyrp6trZqu6ZnxWvi14rWCsNkjUqakWzSJ1poQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -25,7 +23,6 @@ let
|
||||
cp * $out/share/cups/profiles/samsung/
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "splix-svn";
|
||||
@@ -36,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# although the community has been adding some new printer models.
|
||||
url = "svn://svn.code.sf.net/p/splix/code/splix";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
|
||||
hash = "sha256-tEsxElTEGzVBCiqicJT1tytJXHHvRcHrUKyMbzupi5s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -60,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "CUPS drivers for SPL (Samsung Printer Language) printers";
|
||||
homepage = "http://splix.ap2c.org";
|
||||
homepage = "https://web.archive.org/web/20220729010458/http://splix.ap2c.org/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
versionCheckHook,
|
||||
autoPatchelfHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sprite";
|
||||
version = "0.0.1-rc41";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sprites-binaries.t3.storage.dev/client/v${finalAttrs.version}/sprite-${
|
||||
if stdenv.hostPlatform.isLinux then "linux" else "darwin"
|
||||
}-${if stdenv.hostPlatform.isx86_64 then "amd64" else "arm64"}.tar.gz";
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-WVEa0NjpoeHZtn8p8k5AJLifIZWgPchpyrj5ikRupoI=";
|
||||
x86_64-darwin = "sha256-zwCgZSFeFFk49blOjzH5PEv5fuFUlnP/Bre0uJpz78c=";
|
||||
aarch64-linux = "sha256-PjL4usgcx3ybLB7ZLPfKHaqygWVfiuCNrERbYrDRZYk=";
|
||||
x86_64-linux = "sha256-PAnnP5M9lLwC3Qhydz3Bo0uLtX6uE5cJF4lDOGfsiDk=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -m 755 sprite $out/bin/
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
versionCheckKeepEnvironment = "HOME";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Command Line Interactive for sprites, stateful sandbox environments with checkpoint & restore";
|
||||
homepage = "https://sprites.dev";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "sprite";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
})
|
||||
Executable
+47
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused nix-prefetch
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
|
||||
updateHash()
|
||||
{
|
||||
version=$1
|
||||
archHash=$2
|
||||
filetype=$3
|
||||
|
||||
url="https://sprites-binaries.t3.storage.dev/client/v$version/sprite-$filetype.tar.gz"
|
||||
hash=$(nix-prefetch-url --type sha256 "$url")
|
||||
sriHash="$(nix hash convert sha256:"$hash")"
|
||||
|
||||
sed -i "s|$archHash = \"[a-zA-Z0-9\/+-=]*\";|$archHash = \"$sriHash\";|g" "$dirname/package.nix"
|
||||
}
|
||||
|
||||
updateVersion()
|
||||
{
|
||||
sed -i "s/version = \".*\";/version = \"$1\";/g" "$dirname/package.nix"
|
||||
}
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; sprite.version" | tr -d '"')
|
||||
|
||||
# right now, the release channel returns an error, because no "stable" version
|
||||
# has been released; we have to rely on the release candidate for now.
|
||||
# TODO: drop /rc.txt when a release hits stable
|
||||
latestTag=$(curl -f https://sprites-binaries.t3.storage.dev/client/release.txt \
|
||||
|| curl -f https://sprites-binaries.t3.storage.dev/client/rc.txt)
|
||||
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "sprite is up-to-date: ${currentVersion}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
updateVersion "$latestVersion"
|
||||
|
||||
updateHash "$latestVersion" x86_64-linux linux-amd64
|
||||
updateHash "$latestVersion" aarch64-linux linux-arm64
|
||||
updateHash "$latestVersion" x86_64-darwin darwin-amd64
|
||||
updateHash "$latestVersion" aarch64-darwin darwin-arm64
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.10.10";
|
||||
version = "0.10.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-axDmf81Hiv/Pw5tHXh0X+mA8b9zp2YUFdJBgOADxJms=";
|
||||
hash = "sha256-eQ/MUMnFo3GptiC45GtC0A4+zWjJSiNpkhDyArxznPE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZhRZIpsz/7monrs80Y/WHiErulT0sQut0RIAnqBWcmk=";
|
||||
cargoHash = "sha256-s5dvDU5kOD/T+UA+sfouZSrmsA5YGzNpO2gb3YISxgE=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vacuum-go";
|
||||
version = "0.25.0";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Qm3TrVgChCuCfMoVstFjAeONR20zLHXexfHQE8/2kdQ=";
|
||||
hash = "sha256-SJYOnd9wTIUwK/X8LeXH+Pn09+H8EFzjkkSTINRXdsE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8AH/o95EnpCMfiMzcMRKL0cnM+4yU61dom/4Gv+PM6A=";
|
||||
vendorHash = "sha256-RLa63ZvnXJ1bNHrwP9oLznsaSlz7tY7ROtHIML+7Egw=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
|
||||
@@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2026.03.13";
|
||||
version = "2026.03.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yt-dlp";
|
||||
repo = "yt-dlp";
|
||||
tag = version;
|
||||
hash = "sha256-Sx5otasIqQW8n37cVqGI9j6biwMcEMIboLcyC1dkexk=";
|
||||
hash = "sha256-A4LUCuKCjpVAOJ8jNoYaC3mRCiKH0/wtcsle0YfZyTA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zeroclaw";
|
||||
version = "0.3.2";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroclaw-labs";
|
||||
repo = "zeroclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4AcWGEnSXdFmq4Fn/ecMrDVoUxSRYxqwiLQ3pcfCKv8=";
|
||||
hash = "sha256-RlliRnf9RLIbzWh3WRIvicie8mOPN0uimiiFbFD6+tQ=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ln -s ${zeroclaw-web} web/dist
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-NDE+OuYVs9j/wl+nK9hmAEPTbfF6ZOKkANhb+C+dAns=";
|
||||
cargoHash = "sha256-tvT2+hPZpBBkYS1cnkNSzJiV2S2Z6RnhLZDkEYvOvgc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,19 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nasm,
|
||||
SDL,
|
||||
zlib,
|
||||
libpng,
|
||||
ncurses,
|
||||
libGLU,
|
||||
libGL,
|
||||
makeDesktopItem,
|
||||
pkgsi686Linux,
|
||||
}:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItem = pkgsi686Linux.makeDesktopItem {
|
||||
name = "zsnes";
|
||||
exec = "zsnes";
|
||||
icon = "zsnes";
|
||||
@@ -24,7 +16,7 @@ let
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pkgsi686Linux.stdenv.mkDerivation {
|
||||
pname = "zsnes";
|
||||
version = "1.51";
|
||||
|
||||
@@ -41,13 +33,13 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nasm
|
||||
SDL
|
||||
zlib
|
||||
libpng
|
||||
ncurses
|
||||
libGLU
|
||||
libGL
|
||||
pkgsi686Linux.nasm
|
||||
pkgsi686Linux.SDL
|
||||
pkgsi686Linux.zlib
|
||||
pkgsi686Linux.libpng
|
||||
pkgsi686Linux.ncurses
|
||||
pkgsi686Linux.libGLU
|
||||
pkgsi686Linux.libGL
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
@@ -91,10 +83,7 @@ stdenv.mkDerivation {
|
||||
description = "Super Nintendo Entertainment System Emulator";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "https://www.zsnes.com";
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86;
|
||||
mainProgram = "zsnes";
|
||||
};
|
||||
}
|
||||
@@ -1,19 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
SDL,
|
||||
libGL,
|
||||
libGLU,
|
||||
libpng,
|
||||
libx11,
|
||||
nasm,
|
||||
pkg-config,
|
||||
zlib,
|
||||
udevCheckHook,
|
||||
pkgsi686Linux,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pkgsi686Linux.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zsnes2";
|
||||
version = "2.0.12";
|
||||
|
||||
@@ -25,18 +16,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nasm
|
||||
pkg-config
|
||||
udevCheckHook
|
||||
pkgsi686Linux.nasm
|
||||
pkgsi686Linux.pkg-config
|
||||
pkgsi686Linux.udevCheckHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
libGL
|
||||
libGLU
|
||||
libpng
|
||||
libx11
|
||||
zlib
|
||||
pkgsi686Linux.SDL
|
||||
pkgsi686Linux.libGL
|
||||
pkgsi686Linux.libGLU
|
||||
pkgsi686Linux.libpng
|
||||
pkgsi686Linux.libx11
|
||||
pkgsi686Linux.zlib
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "linear-algebra";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk";
|
||||
sha256 = "sha256-Sc2FpNZxKKo2xRSOshcUPxTg69VgNQvQttJPkGMIsoo=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -20,21 +20,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "approvaltests";
|
||||
version = "17.1.1";
|
||||
version = "17.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-G5DcD1Xw3al9JOBPhGwmMttifPYTDjEQrcS2H3AXbiU=";
|
||||
hash = "sha256-fHvnMrwATmwXkSp+WI2v4f885iycgJzEmWD0nPiBMbg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
test -f setup.py || mv setup/setup.py .
|
||||
touch setup/__init__.py
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "from setup_utils" "from setup.setup_utils"
|
||||
test -f setup.py || mv setup/setup.publish.py setup.py
|
||||
|
||||
patchShebangs internal_documentation/scripts
|
||||
'';
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bc-detect-secrets";
|
||||
version = "1.5.45";
|
||||
version = "1.5.47";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "detect-secrets";
|
||||
tag = version;
|
||||
hash = "sha256-/0VHhKcYcXYXosInjsgBf6eR7kcfLiLSyxFuaIqTbiQ=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ykmOa29/ASEr+AG2SjhSUN8gLMeKpscDKsPtTTZ+cU8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
responses
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
disabledTests = [
|
||||
# Tests are failing for various reasons (missing git repo, missing test data, etc.)
|
||||
@@ -70,4 +70,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bundlewrap";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bundlewrap";
|
||||
repo = "bundlewrap";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kU76WvT4VE/78HTMjByoDHgkrg/5MlS5vnc6z6lAANw=";
|
||||
hash = "sha256-gncxzeAlfob0dXZ1iqMwqG5h+OyGxvPhrS0MZ+x0mbo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-genai";
|
||||
version = "1.66.0";
|
||||
version = "1.67.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "python-genai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UNaJzxTFzMEa43oRYr1QqtktpggdXYSPFdkhd3qRLlw=";
|
||||
hash = "sha256-1ewVg271kooPkCEtmDm1HHnJY3MkomrXKp1dK9J0RXI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "packvers";
|
||||
version = "22.0";
|
||||
version = "21.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
owner = "aboutcode-org";
|
||||
repo = "packvers";
|
||||
tag = version;
|
||||
hash = "sha256-19jCW3BK6XIcukDsFd1jERc2+g8Hcs/gdm3+dBzQS14=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -39,11 +39,11 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module for version handling of modules";
|
||||
homepage = "https://github.com/aboutcode-org/packvers";
|
||||
changelog = "https://github.com/nexB/packvers/blob/${src.tag}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/aboutcode-org/packvers/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
|
||||
license = with lib.licenses; [
|
||||
asl20 # and
|
||||
bsd2
|
||||
];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,18 +6,21 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pkginfo2";
|
||||
version = "30.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
owner = "aboutcode-org";
|
||||
repo = "pkginfo2";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M6fJbW1XCe+LKyjIupKnLmVkH582r1+AH44r9JA0Sxg=";
|
||||
};
|
||||
|
||||
# Tries to setup python virtualenv and install dependencies
|
||||
dontConfigure = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
@@ -27,14 +30,21 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# AssertionError
|
||||
"test_ctor_w_path"
|
||||
"test_ctor_w_egg_info_as_file"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# disabled in upstream CI: https://github.com/aboutcode-org/pkginfo2/commit/4c9899954a154095aa3289d2a1657257f3f0d0e0
|
||||
"tests/wonky/"
|
||||
"tests/examples/"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Query metadatdata from sdists, bdists or installed packages";
|
||||
homepage = "https://github.com/nexB/pkginfo2";
|
||||
changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${src.tag}";
|
||||
homepage = "https://github.com/aboutcode-org/pkginfo2";
|
||||
changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "pkginfo2";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
babel,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "py-moneyed";
|
||||
version = "3.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "py-moneyed";
|
||||
repo = "py-moneyed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-k0ZbLwog6TYxKDLZV7eH1Br8buMPfpOkgp+pMN/qdB8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
babel
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# babel has more currencies than defined in the package
|
||||
"test_all_babel_currencies"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "moneyed" ];
|
||||
|
||||
meta = {
|
||||
description = "Provides Currency and Money classes for use in your Python code";
|
||||
homepage = "https://github.com/py-moneyed/py-moneyed";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ kurogeek ];
|
||||
changelog = "https://github.com/py-moneyed/py-moneyed/blob/${finalAttrs.src.tag}/CHANGES.rst";
|
||||
};
|
||||
})
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pysigma";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WAW6TD+cAdtHGxpCHvgaoIAWiKZD7jVztx1vr69lzxI=";
|
||||
hash = "sha256-QPGpmEWfgea420y8mmUF+CHV3xslr39TvxPxAjhI8d4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
respx,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pywaze";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = "pywaze";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-INjVspha4AbxKPMQtL/4BUavFisrQXUGofZ3nuz39UU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yhECJORKVM8R/+CjhSTwgtCPeQ8QwIuG3EZHmtjVkX0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -38,8 +38,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module for calculating WAZE routes and travel times";
|
||||
homepage = "https://github.com/eifinger/pywaze";
|
||||
changelog = "https://github.com/eifinger/pywaze/releases/tag/v${version}";
|
||||
changelog = "https://github.com/eifinger/pywaze/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyworxcloud";
|
||||
version = "6.0.5";
|
||||
version = "6.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MTrab";
|
||||
repo = "pyworxcloud";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BqRdR202mF+aosAf1GRu8xcMSTkUrgxRVSgHyCg4wjA=";
|
||||
hash = "sha256-V57BQ0F5gpKi9aOy79/VyU/qTx/CujM+H6XvRlrjBXY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "awsiotsdk" ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rflink";
|
||||
version = "0.0.67";
|
||||
version = "0.0.68";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aequitas";
|
||||
repo = "python-rflink";
|
||||
tag = version;
|
||||
hash = "sha256-LAmn9/l+J++CvRa5gypuoQ41mZVSoVqbPpbqVSP6CN4=";
|
||||
hash = "sha256-0mMBZYN3xzRotVuLw2HgzSVhsXUv531x3i97B2lI5KE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
setuptools,
|
||||
robotframework,
|
||||
robotframework-assertion-engine,
|
||||
sqlparse,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
@@ -20,14 +21,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-RGTx5Xn40MHr5M6DUb3dkR2OU7B0JKuFYP1o18o3Ct4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
robotframework
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
robotframework
|
||||
robotframework-assertion-engine
|
||||
sqlparse
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "DatabaseLibrary" ];
|
||||
@@ -35,6 +36,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/MarketSquare/Robotframework-Database-Library/releases/tag/${src.tag}";
|
||||
description = "Database Library contains utilities meant for Robot Framework";
|
||||
homepage = "https://github.com/MarketSquare/Robotframework-Database-Library";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
# build system
|
||||
setuptools,
|
||||
wheel,
|
||||
|
||||
# deps
|
||||
docutils,
|
||||
@@ -15,19 +14,7 @@
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
|
||||
# optional deps
|
||||
black,
|
||||
bumpver,
|
||||
coveralls,
|
||||
flake8,
|
||||
isort,
|
||||
pip-tools,
|
||||
pylint,
|
||||
pytest,
|
||||
pytest-cov,
|
||||
sphinxcontrib-httpdomain,
|
||||
sphinxcontrib-plantuml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -44,7 +31,6 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -53,35 +39,15 @@ buildPythonPackage rec {
|
||||
tabulate
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
dev = [
|
||||
black
|
||||
bumpver
|
||||
coveralls
|
||||
flake8
|
||||
isort
|
||||
pip-tools
|
||||
pylint
|
||||
pytest
|
||||
pytest-cov
|
||||
sphinx
|
||||
sphinxcontrib-httpdomain
|
||||
sphinxcontrib-plantuml
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sphinx_markdown_builder"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
sphinxcontrib-httpdomain
|
||||
];
|
||||
|
||||
# NOTE: not sure why, but a `Missing dependencies: wheel` error happens when
|
||||
# `black` is included here, with python3.13
|
||||
checkInputs = lib.remove black optional-dependencies.dev;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
@@ -14,14 +14,16 @@
|
||||
pytest-xdist,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "typecode";
|
||||
version = "30.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/KNhekPDB1eGVtcGNMKHx9oyruP97of7ydzx+9P7dQ8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aboutcode-org";
|
||||
repo = "typecode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OAQX39f6chM+xSY41rCBYsv4RDhLuBlu2WLcCt7vw0w=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -52,17 +54,11 @@ buildPythonPackage rec {
|
||||
# https://github.com/aboutcode-org/typecode/issues/36
|
||||
|
||||
# AssertionError: assert 'application/x-bytecode.python'...
|
||||
"test_compiled_python_1"
|
||||
"test_package_json"
|
||||
|
||||
# fails due to change in file (libmagic) 5.45
|
||||
"test_doc_postscript_eps"
|
||||
"test_package_debian"
|
||||
|
||||
# fails due to change in file (libmagic) 5.46
|
||||
"test_media_image_img"
|
||||
"test_compiled_elf_so"
|
||||
"test_compiled_elf_so_2"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "typecode" ];
|
||||
@@ -70,8 +66,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Comprehensive filetype and mimetype detection using libmagic and Pygments";
|
||||
homepage = "https://github.com/aboutcode-org/typecode";
|
||||
changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${version}";
|
||||
changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "waterfurnace";
|
||||
version = "1.6.2";
|
||||
version = "1.6.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdague";
|
||||
repo = "waterfurnace";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E5GHO4kRfAg+A3FW674i6ekCrpjwYx5rx7xbTZXuT80=";
|
||||
hash = "sha256-Eh9jmq4VWSDFjU4aFppuJmd1ym8ZAC1/CdSe0iq6ds0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yt-dlp-ejs";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yt-dlp";
|
||||
repo = "ejs";
|
||||
tag = version;
|
||||
hash = "sha256-6S6O2wXfD38iMbtqMB3WA25cJJoWQRZ7gx9cpKQVYpU=";
|
||||
hash = "sha256-+tOA9sPk0BGJHFQCoAC8y5Bz3UcjgIPDQ8WDPkRlW5k=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildHomeAssistantComponent,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "claytonjn";
|
||||
domain = "circadian_lighting";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "claytonjn";
|
||||
repo = "hass-circadian_lighting";
|
||||
tag = version;
|
||||
hash = "sha256-6S1wIO6UgPdUPt9oDCzIb4duUOql4KgnTd6MjRhrSb0=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/claytonjn/hass-circadian_lighting/releases/tag/${src.tag}";
|
||||
description = "Circadian Lighting custom component for Home Assistant";
|
||||
homepage = "https://github.com/claytonjn/hass-circadian_lighting";
|
||||
maintainers = with lib.maintainers; [ jpds ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "battery-state-card";
|
||||
version = "3.3.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxwroc";
|
||||
repo = "battery-state-card";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/oFW80zCp4vnRc3ZKVJtvNH11UPrdustFDktZdnFiQM=";
|
||||
hash = "sha256-mwyOdNlGMHK1xrwRL85R0i5s9g5I44WjHcbNTAY/fkw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-TYiUTzNsaEwy9Y5O0UyFXCGFJ/jdjTek3B5CVvac+p8=";
|
||||
npmDepsHash = "sha256-vhjH7AePShgrzLRgCEn5sO0jJzOstDzMDQaog2UCarM=";
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
@@ -13,22 +13,22 @@ rustPlatform.buildRustPackage rec {
|
||||
# in nixpkgs!
|
||||
# For that, check the `<dependencies>` section of `appinfo/info.xml`
|
||||
# in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextcloud";
|
||||
repo = "notify_push";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RdrwHlp3VlQkhyYr9XDWzqhNnNmUnd8hVAei8IkkNR8=";
|
||||
hash = "sha256-lBFxGt5ha5kefNrmZO2fmUD/KZLrcUURv5JJ3pmitPE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
|
||||
cargoHash = "sha256-VKai9y9GZjknata61IGcWSdYAAV4bJxz8YjeGVZpBPA=";
|
||||
|
||||
passthru = rec {
|
||||
app = fetchNextcloudApp {
|
||||
appName = "notify_push";
|
||||
appVersion = version;
|
||||
hash = "sha256-Z9vTAln//DYsx5VLWeJP1KBRF0to79F9aBLnpp+PdwA=";
|
||||
hash = "sha256-Oan4xADU0teC5Lue9RwRkfkDKc0APb9nqar+s/Y9MPw=";
|
||||
license = "agpl3Plus";
|
||||
homepage = "https://github.com/nextcloud/notify_push";
|
||||
url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";
|
||||
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildAndTestSubdir = "test_client";
|
||||
|
||||
cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
|
||||
cargoHash = "sha256-VKai9y9GZjknata61IGcWSdYAAV4bJxz8YjeGVZpBPA=";
|
||||
|
||||
meta = meta // {
|
||||
mainProgram = "test_client";
|
||||
|
||||
@@ -500,13 +500,13 @@ let
|
||||
version,
|
||||
update,
|
||||
edition,
|
||||
language,
|
||||
sw_edition,
|
||||
target_sw,
|
||||
target_hw,
|
||||
language,
|
||||
other,
|
||||
}:
|
||||
"cpe:2.3:${part}:${vendor}:${product}:${version}:${update}:${edition}:${sw_edition}:${target_sw}:${target_hw}:${language}:${other}";
|
||||
"cpe:2.3:${part}:${vendor}:${product}:${version}:${update}:${edition}:${language}:${sw_edition}:${target_sw}:${target_hw}:${other}";
|
||||
possibleCPEPartsFuns = [
|
||||
(vendor: version: {
|
||||
success = true;
|
||||
|
||||
@@ -21,6 +21,8 @@ assert lib.assertMsg (
|
||||
|
||||
{
|
||||
stdenv,
|
||||
closureInfo,
|
||||
runCommand,
|
||||
meson,
|
||||
bison,
|
||||
boehmgc,
|
||||
@@ -55,6 +57,7 @@ assert lib.assertMsg (
|
||||
openssl,
|
||||
pkgsStatic,
|
||||
rustc,
|
||||
rust-cbindgen,
|
||||
toml11,
|
||||
pegtl,
|
||||
buildPackages,
|
||||
@@ -94,6 +97,7 @@ assert lib.assertMsg (
|
||||
libseccomp,
|
||||
pastaFod ? lib.meta.availableOn stdenv.hostPlatform passt,
|
||||
passt,
|
||||
withPlugins ? lib.versionAtLeast version "2.95" && !enableStatic,
|
||||
|
||||
confDir,
|
||||
stateDir,
|
||||
@@ -106,6 +110,20 @@ let
|
||||
hasDtraceSupport = lib.versionAtLeast version "2.93";
|
||||
parseToYAML = lib.versionAtLeast version "2.93";
|
||||
usesCapnp = lib.versionAtLeast version "2.94";
|
||||
|
||||
mesonCrossFile =
|
||||
deps:
|
||||
runCommand "lix-cross-file.conf"
|
||||
{
|
||||
input = ''
|
||||
[project options]
|
||||
builtin-dep-closure = @deps@
|
||||
'';
|
||||
passAsFile = [ "input" ];
|
||||
}
|
||||
''
|
||||
substitute $inputPath $out --replace-fail @deps@ "$(cat ${deps})"
|
||||
'';
|
||||
in
|
||||
# gcc miscompiles coroutines at least until 13.2, possibly longer
|
||||
# do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
|
||||
@@ -138,6 +156,37 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
__structuredAttrs = true;
|
||||
|
||||
# dep closure for builtin builders in meson array form for immediate use
|
||||
builtinDeps =
|
||||
if stdenv.hostPlatform.isStatic then
|
||||
builtins.toFile "lix-static-dep-closure" "[]"
|
||||
else
|
||||
runCommand "lix-builtin-dep-closure"
|
||||
{
|
||||
closure = closureInfo {
|
||||
# closureInfo does not work all that well for things like lowdown,
|
||||
# where it finds only -out but not -lib. we'll take -out and -lib,
|
||||
# ignoring -bin, -man, -dev, etc. and hope that'll be good enough.
|
||||
rootPaths = lib.flatten (
|
||||
map
|
||||
(drv: [
|
||||
(drv.out or [ ])
|
||||
(drv.lib or [ ])
|
||||
])
|
||||
(
|
||||
lib.subtractLists finalAttrs.disallowedReferences (
|
||||
finalAttrs.buildInputs ++ finalAttrs.propagatedBuildInputs
|
||||
)
|
||||
)
|
||||
);
|
||||
};
|
||||
}
|
||||
''
|
||||
closure=($(cat $closure/store-paths))
|
||||
closure="$(printf ", '%s'" "''${closure[@]}")"
|
||||
printf "[%s]" "''${closure:2}" >$out
|
||||
'';
|
||||
|
||||
# We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -150,7 +199,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals finalAttrs.doInstallCheck [
|
||||
p.aiohttp
|
||||
p.pytest
|
||||
p.pytest-timeout
|
||||
p.pytest-xdist
|
||||
p.pyxattr
|
||||
p.tappy
|
||||
p.ruff
|
||||
]
|
||||
++ lib.optionals usesCapnp [ p.pycapnp ]
|
||||
))
|
||||
@@ -171,6 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals isLLVMOnly [
|
||||
rustc
|
||||
rust-cbindgen
|
||||
cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
]
|
||||
@@ -185,7 +239,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals parseToYAML [ yq ]
|
||||
++ lib.optionals usesCapnp [ capnproto ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]
|
||||
++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ];
|
||||
++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ]
|
||||
++ lib.optionals (withPlugins && finalAttrs.doInstallCheck) [
|
||||
curl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
@@ -278,6 +335,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.mesonBool "enable-embedded-sandbox-shell" (
|
||||
stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
|
||||
))
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "2.95") [
|
||||
(lib.mesonBool "enable-contrib-plugins" withPlugins)
|
||||
]
|
||||
++ [
|
||||
(lib.mesonEnable "seccomp-sandboxing" withLibseccomp)
|
||||
|
||||
(lib.mesonOption "store-dir" storeDir)
|
||||
@@ -307,7 +369,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
(lib.mesonOption "build-test-env" "${pkgsStatic.busybox}/bin")
|
||||
(lib.mesonOption "build-test-shell" "${pkgsStatic.bash}/bin")
|
||||
];
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "2.95") [
|
||||
"--${
|
||||
if stdenv.hostPlatform != stdenv.buildPlatform then "cross" else "native"
|
||||
}-file=${mesonCrossFile finalAttrs.builtinDeps}"
|
||||
];
|
||||
|
||||
ninjaFlags = [ "-v" ];
|
||||
|
||||
|
||||
@@ -262,20 +262,20 @@ lib.makeExtensible (
|
||||
attrName = "git";
|
||||
|
||||
lix-args = rec {
|
||||
version = "2.95.0-pre-20260103_${builtins.substring 0 12 src.rev}";
|
||||
version = "2.96.0-pre-20260317_${builtins.substring 0 12 src.rev}";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.lix.systems";
|
||||
owner = "lix-project";
|
||||
repo = "lix";
|
||||
rev = "d387c9113c73f04bed46dbdd59b6c36de2253d73";
|
||||
hash = "sha256-jYUcmXA4FNwoJtxRgH+Be96wQv8h9Y9dByYf+KmcgK4=";
|
||||
rev = "96db7c79cf2a9a06725360b0d12e5de583bef07d";
|
||||
hash = "sha256-Ixwk38HArs7MZXxdWRkSZFzUhUdlCro+8+M/sO+fE/Y=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "lix-${version}";
|
||||
inherit src;
|
||||
hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg=";
|
||||
hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
rustPlatform,
|
||||
snappy,
|
||||
stdenv,
|
||||
symlinkJoin,
|
||||
systemd,
|
||||
zlib,
|
||||
|
||||
@@ -66,13 +67,13 @@ stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
{
|
||||
pname = "netdata";
|
||||
version = "2.8.5";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "netdata";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NO6KE2Gf09Y9Ff6uJQj5XAZ+05WMdvRV2iSBdWTs2CE=";
|
||||
hash = "sha256-QA8YI1cHiPjrTZc9fy81i9YGgGTdE98Eo3xQtVn4/nY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -244,10 +245,12 @@ stdenv.mkDerivation (
|
||||
(lib.cmakeBool "ENABLE_JEMALLOC" true)
|
||||
(lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace)
|
||||
(lib.cmakeBool "ENABLE_ML" withML)
|
||||
(lib.cmakeBool "ENABLE_NETDATA_JOURNAL_FILE_READER" withSystemdJournal)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_OTEL_SIGNAL_VIEWER" withOtel)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_OTEL" withOtel)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal)
|
||||
(lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits)
|
||||
@@ -305,7 +308,7 @@ stdenv.mkDerivation (
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d";
|
||||
|
||||
vendorHash = "sha256-AVNUbKCvO+Z3eKE+bJ/VFDo1tS9DdlmMw6M3OSdHiIU=";
|
||||
vendorHash = "sha256-VBr6VZvTKh2GFtcVSHCVNhzS8gvl4VFTNLtrK81Y92I=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
@@ -348,11 +351,26 @@ stdenv.mkDerivation (
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (withOtel || withSystemdJournal) {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "${finalAttrs.pname}-nd-jf";
|
||||
inherit (finalAttrs) version src cargoRoot;
|
||||
hash = "sha256-HY6OtKHP75mO9X+F2a6H6e+3M0pgZBOIIaxAI9OhgkQ=";
|
||||
cargoDeps = symlinkJoin {
|
||||
name = "cargo-vendor-dir";
|
||||
paths = [
|
||||
(rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-M9XECeLu58vBTJE4hFkoshc/ze/HF6rBERcjbjAHOJ0=";
|
||||
})
|
||||
(rustPlatform.fetchCargoVendor {
|
||||
pname = "${finalAttrs.pname}-nd-jf";
|
||||
inherit (finalAttrs) version src;
|
||||
cargoRoot = "${finalAttrs.cargoRoot}/jf";
|
||||
hash = "sha256-6spr8WRt2G6tzaUQACxIcVMoDNKOFTg6rSPEOihMgLE=";
|
||||
})
|
||||
];
|
||||
};
|
||||
cargoRoot = "src/crates/jf";
|
||||
cargoRoot = "src/crates";
|
||||
}
|
||||
)
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 414a3c54b..cf1fcb7b4 100644
|
||||
index 3fa051e07..7dffb90aa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -230,13 +230,8 @@ cmake_dependent_option(ENABLE_NETDATA_JOURNAL_FILE_READER "Enable netdata's jour
|
||||
@@ -195,13 +195,7 @@ cmake_dependent_option(ENABLE_NETDATA_JOURNAL_FILE_READER "Enable netdata's jour
|
||||
|
||||
# Setup Rust/Corrosion for plugins that need it
|
||||
if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL)
|
||||
if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL OR ENABLE_PLUGIN_OTEL_SIGNAL_VIEWER)
|
||||
- include(FetchContent)
|
||||
- FetchContent_Declare(
|
||||
- Corrosion
|
||||
@@ -14,7 +14,6 @@ index 414a3c54b..cf1fcb7b4 100644
|
||||
- )
|
||||
- FetchContent_MakeAvailable(Corrosion)
|
||||
+ find_package(Corrosion REQUIRED)
|
||||
+
|
||||
corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml
|
||||
CRATES journal_reader_ffi otel-plugin)
|
||||
endif()
|
||||
|
||||
if(ENABLE_NETDATA_JOURNAL_FILE_READER)
|
||||
corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml
|
||||
|
||||
@@ -1257,9 +1257,6 @@ with pkgs;
|
||||
|
||||
winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
|
||||
|
||||
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
|
||||
zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
|
||||
|
||||
### APPLICATIONS/EMULATORS/RETROARCH
|
||||
|
||||
libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { });
|
||||
|
||||
@@ -13098,6 +13098,8 @@ self: super: with self; {
|
||||
|
||||
py-melissa-climate = callPackage ../development/python-modules/py-melissa-climate { };
|
||||
|
||||
py-moneyed = callPackage ../development/python-modules/py-moneyed { };
|
||||
|
||||
py-multiaddr = callPackage ../development/python-modules/py-multiaddr { };
|
||||
|
||||
py-multibase = callPackage ../development/python-modules/py-multibase { };
|
||||
|
||||
Reference in New Issue
Block a user