Merge 76040dbcaa into haskell-updates
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
|
||||
|
||||
@@ -552,7 +552,6 @@
|
||||
"lf-": 6652840
|
||||
},
|
||||
"members": {
|
||||
"9999years": 15312184,
|
||||
"Qyriad": 1542224,
|
||||
"RaitoBezarius": 314564
|
||||
},
|
||||
|
||||
@@ -476,12 +476,6 @@
|
||||
githubId = 908758;
|
||||
name = "Abigail Bunyan";
|
||||
};
|
||||
aborsu = {
|
||||
email = "a.borsu@gmail.com";
|
||||
github = "aborsu";
|
||||
githubId = 5033617;
|
||||
name = "Augustin Borsu";
|
||||
};
|
||||
aboseley = {
|
||||
email = "adam.boseley@gmail.com";
|
||||
github = "aboseley";
|
||||
@@ -10585,6 +10579,11 @@
|
||||
githubId = 982322;
|
||||
name = "Henrik Olsson";
|
||||
};
|
||||
henrikvtcodes = {
|
||||
github = "henrikvtcodes";
|
||||
githubId = 22358337;
|
||||
name = "Henrik VT";
|
||||
};
|
||||
henrirosten = {
|
||||
email = "henri.rosten@unikie.com";
|
||||
github = "henrirosten";
|
||||
@@ -11991,6 +11990,11 @@
|
||||
github = "jaredmontoya";
|
||||
githubId = 49511278;
|
||||
};
|
||||
jasanfarah = {
|
||||
github = "jasanfarah";
|
||||
githubId = 69898185;
|
||||
name = "Jasan Farah";
|
||||
};
|
||||
jasoncarr = {
|
||||
email = "jcarr250@gmail.com";
|
||||
github = "jasoncarr0";
|
||||
@@ -16742,6 +16746,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";
|
||||
@@ -23969,12 +23979,6 @@
|
||||
email = "hey@sandydoo.me";
|
||||
matrix = "@sandydoo:matrix.org";
|
||||
};
|
||||
santosh = {
|
||||
email = "santoshxshrestha@gmail.com";
|
||||
name = "Santosh Shrestha";
|
||||
github = "santoshxshrestha";
|
||||
githubId = 182977126;
|
||||
};
|
||||
sarahec = {
|
||||
email = "seclark@nextquestion.net";
|
||||
github = "sarahec";
|
||||
@@ -26237,12 +26241,6 @@
|
||||
githubId = 12595971;
|
||||
name = "Guillaume Girol";
|
||||
};
|
||||
synthetica = {
|
||||
email = "nix@hilhorst.be";
|
||||
github = "Synthetica9";
|
||||
githubId = 7075751;
|
||||
name = "Patrick Hilhorst";
|
||||
};
|
||||
sysedwinistrator = {
|
||||
email = "edwin.mowen@gmail.com";
|
||||
github = "sysedwinistrator";
|
||||
@@ -28450,6 +28448,12 @@
|
||||
githubId = 7235381;
|
||||
name = "Ondřej Kvapil";
|
||||
};
|
||||
vimlinuz = {
|
||||
email = "vimlinuz@gmail.com";
|
||||
name = "Santosh Shrestha";
|
||||
github = "vimlinuz";
|
||||
githubId = 182977126;
|
||||
};
|
||||
vincentbernat = {
|
||||
email = "vincent@bernat.ch";
|
||||
github = "vincentbernat";
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
# give absolute path of release.nix as argument
|
||||
hydra_eval_jobs \
|
||||
--argstr system x86_64-linux \
|
||||
--argstr system i686-linux \
|
||||
--argstr system x86_64-darwin \
|
||||
--argstr system i686-cygwin \
|
||||
--argstr system x86_64-cygwin \
|
||||
--argstr system i686-freebsd \
|
||||
--arg officialRelease false \
|
||||
--arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \
|
||||
$@
|
||||
@@ -295,7 +295,6 @@ with lib.maintainers;
|
||||
|
||||
gcc = {
|
||||
members = [
|
||||
synthetica
|
||||
vcunat
|
||||
ericson2314
|
||||
];
|
||||
|
||||
@@ -23,6 +23,19 @@
|
||||
meta.maintainers = with lib.maintainers; [ mic92 ];
|
||||
|
||||
options.hardware.facter = with lib; {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = config.hardware.facter.report != { };
|
||||
defaultText = literalExpression ''
|
||||
config.hardware.facter.report != { }
|
||||
'';
|
||||
description = ''
|
||||
Whether to enable automatic hardware configuration using a report generated by nixos-facter.
|
||||
|
||||
See <https://nix-community.github.io/nixos-facter/> for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
report = mkOption {
|
||||
type = types.attrsOf types.anything;
|
||||
default =
|
||||
|
||||
@@ -22,7 +22,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
hasIntelCpu = facterLib.hasIntelCpu report;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && isBaremetal) {
|
||||
config = lib.mkIf (config.hardware.facter.enable && isBaremetal) {
|
||||
# none (e.g. bare-metal)
|
||||
# provide firmware for devices that might not have been detected by nixos-facter
|
||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
defaultText = "hardware dependent";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) {
|
||||
config = lib.mkIf (config.hardware.facter.enable && cfg.enable) {
|
||||
services.xserver.videoDrivers = [ "modesetting" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) (
|
||||
config = lib.mkIf (config.hardware.facter.enable && cfg.enable) (
|
||||
{
|
||||
boot.initrd.kernelModules = config.hardware.facter.detected.boot.graphics.kernelModules;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,12 +60,10 @@ in
|
||||
];
|
||||
};
|
||||
};
|
||||
config =
|
||||
lib.mkIf (config.hardware.facter.reportPath != null && config.hardware.facter.detected.dhcp.enable)
|
||||
{
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
config = lib.mkIf (config.hardware.facter.enable && config.hardware.facter.detected.dhcp.enable) {
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
# Per-interface DHCP configuration
|
||||
networking.interfaces = perInterfaceConfig;
|
||||
};
|
||||
# Per-interface DHCP configuration
|
||||
networking.interfaces = perInterfaceConfig;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null && config.boot.initrd.network.enable) {
|
||||
config = lib.mkIf (config.hardware.facter.enable && config.boot.initrd.network.enable) {
|
||||
boot.initrd.kernelModules = config.hardware.facter.detected.boot.initrd.networking.kernelModules;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
networking.enableIntel2200BGFirmware = lib.mkIf cfg._2200BG.enable (lib.mkDefault true);
|
||||
hardware.enableRedistributableFirmware = lib.mkIf cfg._3945ABG.enable (lib.mkDefault true);
|
||||
};
|
||||
|
||||
@@ -51,7 +51,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf (config.hardware.facter.reportPath != null) {
|
||||
config = lib.mkIf config.hardware.facter.enable {
|
||||
|
||||
# KVM support
|
||||
boot.kernelModules =
|
||||
|
||||
@@ -1780,6 +1780,7 @@
|
||||
./services/web-apps/vikunja.nix
|
||||
./services/web-apps/wakapi.nix
|
||||
./services/web-apps/weblate.nix
|
||||
./services/web-apps/websurfx.nix
|
||||
./services/web-apps/whitebophir.nix
|
||||
./services/web-apps/whoami.nix
|
||||
./services/web-apps/wiki-js.nix
|
||||
|
||||
@@ -31,7 +31,6 @@ let
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
aborsu
|
||||
b-m-f
|
||||
];
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -11,20 +12,17 @@ let
|
||||
documentationLink = "https://manual.calibre-ebook.com";
|
||||
generatedDocumentationLink = documentationLink + "/generated/en/calibre-server.html";
|
||||
|
||||
execFlags = (
|
||||
lib.concatStringsSep " " (
|
||||
lib.mapAttrsToList (k: v: "${k} ${toString v}") (
|
||||
lib.filterAttrs (name: value: value != null) {
|
||||
"--listen-on" = cfg.host;
|
||||
"--port" = cfg.port;
|
||||
"--auth-mode" = cfg.auth.mode;
|
||||
"--userdb" = cfg.auth.userDb;
|
||||
}
|
||||
)
|
||||
++ [ (lib.optionalString (cfg.auth.enable == true) "--enable-auth") ]
|
||||
++ cfg.extraFlags
|
||||
execFlags =
|
||||
lib.mapAttrsToList (k: v: "--${k}=${toString v}") (
|
||||
lib.filterAttrs (name: value: value != null) {
|
||||
listen-on = cfg.host;
|
||||
port = cfg.port;
|
||||
auth-mode = cfg.auth.mode;
|
||||
userdb = cfg.auth.userDb;
|
||||
}
|
||||
)
|
||||
);
|
||||
++ lib.optional cfg.auth.enable "--enable-auth"
|
||||
++ cfg.extraFlags;
|
||||
in
|
||||
|
||||
{
|
||||
@@ -150,7 +148,9 @@ in
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Restart = "always";
|
||||
ExecStart = "${cfg.package}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries} ${execFlags}";
|
||||
ExecStart = utils.escapeSystemdExecArgs (
|
||||
[ "${cfg.package}/bin/calibre-server" ] ++ execFlags ++ [ "--" ] ++ cfg.libraries
|
||||
);
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
@@ -485,6 +485,7 @@ in
|
||||
PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs
|
||||
};
|
||||
environment = env;
|
||||
unitConfig.RequiresMountsFor = defaultServiceConfig.ReadWritePaths;
|
||||
|
||||
preStart = ''
|
||||
# remove old papaerless-manage symlink
|
||||
|
||||
@@ -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; [
|
||||
|
||||
@@ -71,11 +71,11 @@ in
|
||||
};
|
||||
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.singleLineStr;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"--slice-us 5000"
|
||||
"--verbose"
|
||||
"--slice-us 5000"
|
||||
];
|
||||
description = ''
|
||||
Parameters passed to the chosen scheduler at runtime.
|
||||
@@ -107,9 +107,10 @@ in
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
};
|
||||
|
||||
environment = {
|
||||
SCX_SCHEDULER = cfg.scheduler;
|
||||
SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs;
|
||||
SCX_FLAGS = lib.concatStringsSep " " cfg.extraArgs;
|
||||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@@ -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
|
||||
];
|
||||
}
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.websurfx;
|
||||
settingsFormat = pkgs.formats.lua { asBindings = true; };
|
||||
settingsFile = settingsFormat.generate "config.lua" cfg.settings;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.websurfx = {
|
||||
enable = lib.mkEnableOption "Websurfx, a metasearch engine";
|
||||
package = lib.mkPackageOption pkgs "websurfx" { };
|
||||
openFirewall = lib.mkEnableOption "Whether to open the used port in the firewall";
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options.binding_ip = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "IP address on which the server should be launched";
|
||||
};
|
||||
options.port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 4567;
|
||||
description = "Port on which the server should be launched";
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration options for Websurfx, see
|
||||
[websurfx/config.lua](https://github.com/neon-mmd/websurfx/blob/rolling/websurfx/config.lua)
|
||||
for supported values.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.websurfx.settings = {
|
||||
# General
|
||||
logging = lib.mkDefault true;
|
||||
debug = lib.mkDefault false;
|
||||
threads = lib.mkDefault 10;
|
||||
|
||||
# Server
|
||||
production_use = lib.mkDefault false;
|
||||
request_timeout = lib.mkDefault 30;
|
||||
tcp_connection_keep_alive = lib.mkDefault 30;
|
||||
pool_idle_connection_timeout = lib.mkDefault 30;
|
||||
rate_limiter = {
|
||||
number_of_requests = lib.mkDefault 20;
|
||||
time_limit = lib.mkDefault 3;
|
||||
};
|
||||
https_adaptive_window_size = lib.mkDefault true;
|
||||
|
||||
operating_system_tls_certificates = lib.mkDefault true;
|
||||
|
||||
number_of_https_connections = lib.mkDefault 10;
|
||||
client_connection_keep_alive = lib.mkDefault 120;
|
||||
|
||||
# Search
|
||||
safe_search = lib.mkDefault 2;
|
||||
|
||||
# Website
|
||||
colorscheme = lib.mkDefault "catppuccin-mocha";
|
||||
theme = lib.mkDefault "simple";
|
||||
animation = lib.mkDefault "simple-frosted-glow";
|
||||
|
||||
# Caching
|
||||
#redis_url = "redis://127.0.0.1:8082"; # The nixpkgs build doesn't have the redis-cache feature enabled
|
||||
cache_expiry_time = lib.mkDefault 600;
|
||||
|
||||
# Search Engines
|
||||
upstream_search_engines = {
|
||||
DuckDuckGo = lib.mkDefault true;
|
||||
Searx = lib.mkDefault false;
|
||||
Brave = lib.mkDefault false;
|
||||
Startpage = lib.mkDefault false;
|
||||
LibreX = lib.mkDefault false;
|
||||
Mojeek = lib.mkDefault false;
|
||||
Bing = lib.mkDefault false;
|
||||
Wikipedia = lib.mkDefault true;
|
||||
Yahoo = lib.mkDefault false;
|
||||
};
|
||||
|
||||
proxy = lib.mkDefault null;
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.port ];
|
||||
|
||||
systemd.services.websurfx = {
|
||||
description = "Websurfx, a metasearch engine";
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = lib.getExe cfg.package;
|
||||
DynamicUser = true;
|
||||
RuntimeDirectory = "websurfx";
|
||||
Environment = [ "HOME=%t/websurfx" ];
|
||||
BindReadOnlyPaths = [ "${settingsFile}:%t/websurfx/.config/websurfx/config.lua" ];
|
||||
};
|
||||
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ lib.maintainers.SchweGELBin ];
|
||||
}
|
||||
@@ -1177,15 +1177,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;
|
||||
|
||||
@@ -29,8 +29,8 @@ let
|
||||
in
|
||||
{
|
||||
name = "pulseaudio${lib.optionalString fullVersion "Full"}${lib.optionalString systemWide "-systemWide"}";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers;
|
||||
meta = {
|
||||
maintainers = pkgs.pulseaudio.meta.maintainers;
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
|
||||
@@ -120,6 +120,9 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.defaults.virtualisation.graphics = false;
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }@args:
|
||||
''
|
||||
@@ -185,7 +188,7 @@ in
|
||||
)
|
||||
with subtest("bob can sync bob's repository from the seed"):
|
||||
bob.succeed(
|
||||
"cd /tmp/repo && rad sync --seed ${seed-nid}",
|
||||
"cd /tmp/repo && rad sync --fetch --seed ${seed-nid}",
|
||||
"cd /tmp/repo && git pull"
|
||||
)
|
||||
assert bob.succeed("cat /tmp/repo/testfile") == "hello bob\n"
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
{
|
||||
name = "sway";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
# testScriptWithTypes:49: error: Cannot call function of unknown type
|
||||
|
||||
@@ -41,7 +41,6 @@ let
|
||||
nodes."${name}" = machine;
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
turion
|
||||
];
|
||||
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq
|
||||
#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz
|
||||
#! nix-shell -i bash --pure -p curl cacert nix jq
|
||||
#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/5b2c2d84341b2afb5647081c1386a80d7a8d8605.tar.gz
|
||||
# ^
|
||||
# |
|
||||
# nixos-unstable ~ 2023-07-06 -----------------/
|
||||
# nixos-unstable ~ 2026-03-16 -----------------/
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
# scrape the downloads page for release info
|
||||
|
||||
curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/
|
||||
trap "rm eclipse-dl.html" EXIT
|
||||
curl -s -O https://download.eclipse.org/eclipse/downloads/data.json
|
||||
trap "rm data.json" EXIT
|
||||
|
||||
dlquery() {
|
||||
q=$1
|
||||
xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}";
|
||||
q="$1"
|
||||
cat data.json | jq -r ".releases[0] | $q";
|
||||
}
|
||||
|
||||
# extract release info from download page HTML
|
||||
|
||||
platform_major=$(dlquery '."#text" | split(".") | .[0]' -r);
|
||||
platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r);
|
||||
platform_major=$(dlquery '.label | split(".") | .[0]');
|
||||
platform_minor=$(dlquery '.label | split(".") | .[1]');
|
||||
|
||||
year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]')
|
||||
buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]')
|
||||
builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]')
|
||||
year=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]')
|
||||
buildmonth=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]')
|
||||
builddaytime=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]')
|
||||
timestamp="${year}${buildmonth}${builddaytime}";
|
||||
|
||||
# account for possible release-month vs. build-month mismatches
|
||||
|
||||
@@ -93,7 +93,7 @@ in
|
||||
meta = {
|
||||
description = "Wrapper to create jupyter notebook kernel definitions";
|
||||
homepage = "https://jupyter.org/";
|
||||
maintainers = with lib.maintainers; [ aborsu ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "roo-code-${finalAttrs.version}.vsix";
|
||||
pname = "roo-code-vsix";
|
||||
version = "3.45.0";
|
||||
version = "3.51.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RooCodeInc";
|
||||
repo = "Roo-Code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZWt2R50yFxUHDJ2jrkMKaNoWUD6mSNm0ucq/FXPC2VE=";
|
||||
hash = "sha256-HpLL466mzDvNf7twW0a3dDUvgveRm0tbCOXGymTW+tA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-QAzk+aXdCtQQ/KEoqGfn5j7l7Gx3HDvlL3aO+81hABM=";
|
||||
hash = "sha256-Q97MDHl22lIF84/J3UW53dCD7oaN3Y6R32xhjRDBmpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -116,7 +116,6 @@ buildVscode {
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
eadwu
|
||||
synthetica
|
||||
bobby285271
|
||||
johnrtitor
|
||||
jefflabonte
|
||||
|
||||
@@ -81,7 +81,6 @@ buildVscode rec {
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
bobby285271
|
||||
];
|
||||
mainProgram = "codium";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2026-03-10";
|
||||
version = "0-unstable-2026-03-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "ab1ee21996b78aaac1f82baa390990c8ce9a9936";
|
||||
hash = "sha256-mzK+ADPTFCxiPxQDw8CtwJEW0nrX+ozUosV0N/jeMHk=";
|
||||
rev = "5f6b4daf61ed8f005f759236ea363fa8ee7a1d08";
|
||||
hash = "sha256-DNsNmtse35Bv3QxhJlYAFe3D0VRhSn2svwfiF+bgxxA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "146.0.7680.80",
|
||||
"version": "146.0.7680.153",
|
||||
"chromedriver": {
|
||||
"version": "146.0.7680.80",
|
||||
"hash_darwin": "sha256-sjCEvFWV07GNhXJ9CfGVtZ6nCeqsqtNtY4sPj/gq13w=",
|
||||
"hash_darwin_aarch64": "sha256-kTxZJiF7mJlVbkDDFP4ZUB2htBn45se1Wuz28RP8pr8="
|
||||
"version": "146.0.7680.154",
|
||||
"hash_darwin": "sha256-jSAe8mkJ0mDqKJyzsaAuGwyG5lwdOHkYDUgxR2G+vJE=",
|
||||
"hash_darwin_aarch64": "sha256-tCMADPY/Q2sjyHUvZPO9o+ZkLaZ7iTCLrTiPVUYVQr0="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "f08938029c887ea624da7a1717059788ed95034d",
|
||||
"hash": "sha256-PCQeTdc6Fl74TLyvxjli4scIUIm0GgZ3e9wbC18Tclw=",
|
||||
"rev": "85fd829a1b2049479ead5ed578f5ed105a094fe4",
|
||||
"hash": "sha256-PshNuKAZBXohix711YGjE4X24ixVW29wxgeePNE9Xzs=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "1d3190bf5633327395d694d621258978d989dffd",
|
||||
"hash": "sha256-QVtTxBBox8fiqTj0gjqvYx6HoBSlvuWIe5ki4iCQl08="
|
||||
"rev": "e05753c6d05b17b23d514038957469c70b75475c",
|
||||
"hash": "sha256-SMym7PN2acfw84Z95xWSbN/QV5UIDIOztWxFeTCfBsk="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -132,8 +132,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "c46c81b25577c40de6e7e510743ae0454e0c8351",
|
||||
"hash": "sha256-Duv3kNulPtVxCLPa3bFIev64O9Y4ObJP/IZz31oPJ0E="
|
||||
"rev": "3d52cfc8dd0bc2cdbbecd9803cc08102de7e4597",
|
||||
"hash": "sha256-lyAG9tKBWQ2yy/morStUd0ZKDPT58t8516NDCQG/jZs="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -422,8 +422,8 @@
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "4018d3b63456eb657475e66c352bfa86f321e0f5",
|
||||
"hash": "sha256-RuCmzPIR6hW8znjQH4kQqSJmIIJWtMkUQjYEVn3B9AE="
|
||||
"rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce",
|
||||
"hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
@@ -602,8 +602,8 @@
|
||||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "67cf48602b0c8aaa9807cd185212ee078eb30b21",
|
||||
"hash": "sha256-jMoYwf63C0IHx/QcOT+LKCCYN3dJVUhC5COukkhwqx0="
|
||||
"rev": "bccc616f83aaed08f65d4a707dfe00e24133772b",
|
||||
"hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
@@ -652,8 +652,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "248acd90d9a35ac46b2ec30201ae50f301b8a173",
|
||||
"hash": "sha256-zOL5j9X72ZvYmS8MzQ+pqSkT8AWBz2IwmaH7I3LN1IE="
|
||||
"rev": "3c7c530c115124b415c1f4e0e35694fbaefd2177",
|
||||
"hash": "sha256-ObLypxiOKH/YoLw6uUA4MmHM44vA8iPhNCEfFcwip0Q="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -787,8 +787,8 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "d1972add2a63b2a528a6471d447f82e0010b5215",
|
||||
"hash": "sha256-evtOzxwWgKUaJl9zwpQDqPp1wM7w3DzjRcLg29z9ELQ="
|
||||
"rev": "b2a90ac0037ee7187102ce2c40e5007216ca9a58",
|
||||
"hash": "sha256-rX6NEN0RbfHPRqJqkGhypwWt/NcREvPaanL+CDxwhA8="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
@@ -817,8 +817,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "70253f966a7c3936f5a5ff57c6a4a4face1f16ad",
|
||||
"hash": "sha256-8tA9nWXsiQ2Qt7pbALrhsnNFHOFLw/wlcz5OrFjYEI8="
|
||||
"rev": "abb5d7b829d60a5dae46fbcee0e9d0d554d3a946",
|
||||
"hash": "sha256-hnwiRarq+69BECxJ9FQD0XGqqA/OF66RxZUPWTzDaFE="
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -310,11 +310,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-CNHGuChMDqSFz8YXETfQzgyQw8p8Ua6u3gevFFr69RI=",
|
||||
"hash": "sha256-QUx+pSj9FyY0+IOUcmBS32qEOgDAGxeQRcio6lQOGN4=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.79.0",
|
||||
"rev": "v2.80.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -842,13 +842,13 @@
|
||||
"vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8="
|
||||
},
|
||||
"linode_linode": {
|
||||
"hash": "sha256-trwD5gL/zVa82URY3zxKYN3UM2ZjvQAXBS0O6bfTVNU=",
|
||||
"hash": "sha256-i2zAB/3cDOex7j2WciKlRlYfOyhkixEHYbTkoCG1u9s=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v3.9.0",
|
||||
"rev": "v3.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-jytzC7dzoadOXIMv6eSHS1KP0KmgybWKzYJibPTcsoU="
|
||||
"vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="
|
||||
},
|
||||
"loafoe_htpasswd": {
|
||||
"hash": "sha256-1o2kgeTFxegzOgGXWP4OYZ3uC3WbAkCXPqScMvVpHr0=",
|
||||
@@ -1193,13 +1193,13 @@
|
||||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"selectel_selectel": {
|
||||
"hash": "sha256-/1s3TQK8EkM7WgHW77a/JGsCemiustIwlLAam9CZpiY=",
|
||||
"hash": "sha256-oY2cSjoOXpDjmKSQKzx8yQhmX69diSgN1mJPR+z+hA8=",
|
||||
"homepage": "https://registry.terraform.io/providers/selectel/selectel",
|
||||
"owner": "selectel",
|
||||
"repo": "terraform-provider-selectel",
|
||||
"rev": "v7.5.4",
|
||||
"rev": "v7.6.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-QdfBhTY7HwPqz9qm7KE0OL4ACOWiU8gLOKKdFbMrAro="
|
||||
"vendorHash": "sha256-mHf4ZG0hk/YTofuU80sVl1g78P6T+sbBMuPenE8uGQ0="
|
||||
},
|
||||
"siderolabs_talos": {
|
||||
"hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication {
|
||||
meta = {
|
||||
description = "XMonad-like workspace switching for i3 and sway";
|
||||
mainProgram = "i3-wk-switch";
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://travisf.net/i3-wk-switcher";
|
||||
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
||||
mainProgram = "wmfocus";
|
||||
homepage = "https://github.com/svenstaro/wmfocus";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/279226
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
synthetica
|
||||
eljamm
|
||||
];
|
||||
mainProgram = "albert";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "algia";
|
||||
version = "0.0.106";
|
||||
version = "0.0.107";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8hsSt/QUyIEYpI4L8/uksuwLedjfilGHZ5xc9jUK1uo=";
|
||||
hash = "sha256-23h2sVwOhKXnpYBq1jZbbC275dzc6HnqUpB/1wbrpw4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
--- a/app/shared/ui-settings/src/commonMain/kotlin/ui/update/UpdateChecker.kt
|
||||
+++ b/app/shared/ui-settings/src/commonMain/kotlin/ui/update/UpdateChecker.kt
|
||||
@@ -40,25 +40,7 @@
|
||||
expectSuccess = true
|
||||
}.use { client ->
|
||||
withExceptionCollector {
|
||||
- return kotlin.runCatching {
|
||||
- client.getVersionFromAniServer("https://danmaku-global.myani.org/", currentVersion, releaseClass)
|
||||
- .also {
|
||||
- logger.info { "Got latest version from global server: ${it?.name}" }
|
||||
- }
|
||||
- }.recoverCatching { exception ->
|
||||
- collect(exception)
|
||||
- client.getVersionFromAniServer("https://danmaku-cn.myani.org/", currentVersion, releaseClass).also {
|
||||
- logger.info { "Got latest version from CN server: ${it?.name}" }
|
||||
- }
|
||||
- }.onFailure { exception ->
|
||||
- collect(exception)
|
||||
- if (exception is CancellationException || exception is IOException) {
|
||||
- throwLast()
|
||||
- }
|
||||
- val finalException = getLast()!!
|
||||
- logger.error(finalException) { "Failed to get latest version" }
|
||||
- throw finalException
|
||||
- }.getOrThrow()// should not throw, because of `onFailure`
|
||||
+ return null
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
+78
-92
@@ -53,10 +53,6 @@
|
||||
"module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=",
|
||||
"pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs="
|
||||
},
|
||||
"androidx/annotation#annotation-iosarm64/1.7.0": {
|
||||
"module": "sha256-AC0rtA4C7N7Y533F1nTe4s5f538pUxgcl+vVDSRlAY0=",
|
||||
"pom": "sha256-ehf34KZP5hR8zaxQyF0Qo7AY/PHd/ip3e6YAA8pa3FY="
|
||||
},
|
||||
"androidx/annotation#annotation-iosarm64/1.9.0": {
|
||||
"module": "sha256-6DJvdch3vV6HpxGXejlvW+xtpU1QTP3BBdQH6tTdXtc=",
|
||||
"pom": "sha256-r5RTiIOEj6z73kf5Xg2fNWerA2l/Nc6e7NnkS/y4JQc="
|
||||
@@ -65,10 +61,6 @@
|
||||
"module": "sha256-gWifMc5Ndyzq5Nm4EKEPjSJlSrdSk/9EbJwgEfi6MjE=",
|
||||
"pom": "sha256-JTmoAKO24c6Fefs5T7n0Yi81sDPGYvSj9Zc9+O+IilI="
|
||||
},
|
||||
"androidx/annotation#annotation-iossimulatorarm64/1.7.0": {
|
||||
"module": "sha256-OikdRa70npj492Pcc+iJJnOSmeiUyqGrKZhWZp7hjRI=",
|
||||
"pom": "sha256-5+KpIB5thn7QIZaNGTjoBHdboYieIemh6IMcSL4iOYk="
|
||||
},
|
||||
"androidx/annotation#annotation-iossimulatorarm64/1.9.0": {
|
||||
"module": "sha256-b8ECz4xqGmk7qL083JGilvz/Ag6SMrz+MAS1VRXMhpI=",
|
||||
"pom": "sha256-8G4LBU16fBWN4e++C66OrN0vy1Oak7n/ZOmYOAuoVHo="
|
||||
@@ -81,11 +73,6 @@
|
||||
"module": "sha256-P1qPqhneZn5j3KlzD/jvDkeOS6+1/uuCWOXAhiRtyQw=",
|
||||
"pom": "sha256-K+ZlunzbBGtBtAnHmj3gxtnhJVJCwIf2uUssdJO+CPQ="
|
||||
},
|
||||
"androidx/annotation#annotation-jvm/1.7.0": {
|
||||
"jar": "sha256-42uOS4OTpK3HTj1KsirVo2OW8M6i5AtXNOrhSTff0iQ=",
|
||||
"module": "sha256-B85gw3erlOR8jJAlibl3YDAGT9Gn5NWgGjjXAONeXbQ=",
|
||||
"pom": "sha256-LT/MEucHiGmSA5JmI39FEUDKqPlMHmLn/E1gLeNFsNc="
|
||||
},
|
||||
"androidx/annotation#annotation-jvm/1.8.1": {
|
||||
"module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=",
|
||||
"pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ="
|
||||
@@ -502,10 +489,6 @@
|
||||
"module": "sha256-EPd9GdGF6KLN1LDa+ymy2hgM61G1PuwstFu40CeVSpg=",
|
||||
"pom": "sha256-4itFFcGCYOqcksHaHQsJqkb+gnCr1mg4oveFn/JzJds="
|
||||
},
|
||||
"androidx/compose/runtime#runtime-saveable/1.8.2": {
|
||||
"module": "sha256-bvgfp/FklhULLb9r4gHEEt7T80PKH5Xt5EIYdR7WbHI=",
|
||||
"pom": "sha256-zkIRKN1Z/3cq3hv5T61DdKbcxe64Az4xQPawbvbZlCw="
|
||||
},
|
||||
"androidx/compose/runtime#runtime-saveable/1.9.0": {
|
||||
"module": "sha256-dWS0MU7dgdDxwPp2MH9HPDl7Y0hWIdPO4KKRiwUvJS4=",
|
||||
"pom": "sha256-hqVscAR77b6wjyPOhtoJ3LR38J+MUjnvp5CV4uzgYLM="
|
||||
@@ -3005,10 +2988,18 @@
|
||||
"module": "sha256-/Pqut7oYe99qycvB0HNJiWSbCn/8bfteU5TBcJYfaLI=",
|
||||
"pom": "sha256-sid4YljDlKaO0ntiFyaB+JdOQoJHeTBU0XxAxlDEEfI="
|
||||
},
|
||||
"co/touchlab#stately-strict-iosarm64/2.0.6": {
|
||||
"module": "sha256-qOtTajAaiWcZulLhdrLMOxgzg3PlRL85DjGApJNMAVg=",
|
||||
"pom": "sha256-oY8yBrVtGjDoAR2dMt0GaPATdyKBGvmyiLd0NE/Z5ZU="
|
||||
},
|
||||
"co/touchlab#stately-strict-iosarm64/2.1.0": {
|
||||
"module": "sha256-8UOjj43DzTJcUh82aMb3UuxN99vKlf/A4kJWhNubHN4=",
|
||||
"pom": "sha256-80CheYAdvDwZ0/xiJNOnySnM+3NmfP2EujE5jtZDafY="
|
||||
},
|
||||
"co/touchlab#stately-strict-iossimulatorarm64/2.0.6": {
|
||||
"module": "sha256-uXuBPQgr1k5sLpnPY7KcFPKQaLaEw5jDf+pPy0OOeFg=",
|
||||
"pom": "sha256-pvmqkz0ylUVaeLu1XRfqVFIYBybxlIr72XjkPJgFin4="
|
||||
},
|
||||
"co/touchlab#stately-strict-iossimulatorarm64/2.1.0": {
|
||||
"module": "sha256-HvYz59tOHPEu88DkMv3YAiaIBbb+M+0PSE1by2jplTw=",
|
||||
"pom": "sha256-VhGaJG2F4fwijbx4TjMj7ld6FdxnVnykeHqKgbMbon4="
|
||||
@@ -5515,10 +5506,6 @@
|
||||
"module": "sha256-RWBz1hMzkqxpnWLPsN64wCvaKATJ0DowDPUiSpH/LIg=",
|
||||
"pom": "sha256-7woPdZv6dxVHNjyRKaa2PTUFds7PW4OZFTkQIcZoOgA="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitarm64/1.8.2": {
|
||||
"module": "sha256-O942iQhum9QIocX9wOQx+NVAaLPAlHHSI1AoWonTdmw=",
|
||||
"pom": "sha256-fPWcnAL/lQ0yt1nF7TCzyp/bAHRX1v0fywMEw2e/E6g="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitarm64/1.9.0": {
|
||||
"module": "sha256-uNVM3vXgpbeDXLM4iBM0iSz7qz+SN3/lmBeiXXU+kbg=",
|
||||
"pom": "sha256-HanDoPdPzxJ0SRyrHm7PfZ2C2iZnYCPoCQCldo+0uHs="
|
||||
@@ -5531,10 +5518,6 @@
|
||||
"module": "sha256-OgEVWV6hCpJxUIVrUuPNsS4zRtVDcAd/+HKII0t043Q=",
|
||||
"pom": "sha256-idSq3GUxiPxdCKVpbmH8HGq/IkpFNZUZ1MSNZDWG5n4="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitsimarm64/1.8.2": {
|
||||
"module": "sha256-hkmLu/22k8LUHFfk9wYTdE+1oDbT08zxzBB8zV1KwGY=",
|
||||
"pom": "sha256-wqhTeOdhVYu27PHODBBZBkAcH97ai3FDQmThhayWKQU="
|
||||
},
|
||||
"org/jetbrains/compose/runtime#runtime-saveable-uikitsimarm64/1.9.0": {
|
||||
"module": "sha256-NgHdc32iO0hYHHvq25xG7bNLyR0HITAb2J5heheFy30=",
|
||||
"pom": "sha256-mq9FKhMxH2vHDvqCZJma6dTV6EAOHJhoPDGDAgLM33M="
|
||||
@@ -6203,6 +6186,9 @@
|
||||
"jar": "sha256-z5XszGzHhN/0ed7guINPNYS5MpLMXZGXLoL117nhPjs=",
|
||||
"pom": "sha256-vklJB+DhnHi7ghFUr6F3bVrXoFi0qzAJD3Q1Sw4TON4="
|
||||
},
|
||||
"org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.0": {
|
||||
"pom": "sha256-K7bHVRuXx7oCn5hmWC56oZ1jq/1M1T2j/AxGLzq1/CY="
|
||||
},
|
||||
"org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
|
||||
"jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=",
|
||||
"pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
|
||||
@@ -6885,95 +6871,95 @@
|
||||
"module": "sha256-s+NvC4F8sW43udNc2Sf7pqQYPTpy6WYcDaEZtGe1U5Y=",
|
||||
"pom": "sha256-EN0WnADat5JXw6z/58I2vqwkgfngp2xT620S9Mp1q2c="
|
||||
},
|
||||
"org/openani/mediamp#catalog/0.0.29": {
|
||||
"module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=",
|
||||
"pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4="
|
||||
"org/openani/mediamp#catalog/0.0.30": {
|
||||
"module": "sha256-2OPa47tUPbb2VrTHEOwV8lGquOHf0NP7ic+M1D2GCHM=",
|
||||
"pom": "sha256-A2o2vXqHPKNgWU1tVkeQMvwwjDfb6Z1u116yd1RJch0="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-android-debug/0.0.29": {
|
||||
"module": "sha256-jU1JEH7gsdNZqGDewGzwxm9RVbT/0cL0T4SsT1m/v/w=",
|
||||
"pom": "sha256-ZRgAVnFvMsp3tirT+pxdzLl/UgaKwWLiJwix9zmo5hU="
|
||||
"org/openani/mediamp#mediamp-api-android-debug/0.0.30": {
|
||||
"module": "sha256-i05AWijPx24uS1h09c4mswpBwJKRgd9ey3mQPOXudsM=",
|
||||
"pom": "sha256-WbTPILNxF14itRm7/VcMlWTusP8MJdaIzt0UduzodAs="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-android/0.0.29": {
|
||||
"module": "sha256-A7Kf2AqX+9bds8WYtQnt7oRkoLXjXnk/3RnMiLcSCkw=",
|
||||
"pom": "sha256-pyflDsXfp2uPi32gudBjcjjVfPjbwz2cV7Wnvclz7ME="
|
||||
"org/openani/mediamp#mediamp-api-android/0.0.30": {
|
||||
"module": "sha256-1R6MW6Hod8WqccN3hSjQL61q/SOAUgXOmUutKvB1ZAk=",
|
||||
"pom": "sha256-VmpuVDAwn3sa5SVacHYYIV6/AMD8cHA9ccJbzsSHLg8="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-desktop/0.0.29": {
|
||||
"jar": "sha256-k4Qsb20oECKLw2ZQ+QH7rCuKl9W3kM9nfJRWF0cTAlE=",
|
||||
"module": "sha256-InxhvamLA6cAcu7JPORsd+NoK+eeTjlmg+kXHgUL8J8=",
|
||||
"pom": "sha256-4yVSYeA9sIcF7x0W9IOSNEtURY10iC9gvsC00JZ6GmU="
|
||||
"org/openani/mediamp#mediamp-api-desktop/0.0.30": {
|
||||
"jar": "sha256-cjmXO7AT1WxxAnqjAVqm1W5rGWBzgQg72/FMDH4cBgk=",
|
||||
"module": "sha256-qk9kYkERTe27Ae63/HtReT9rpYtxIQM6oV00VI15Jok=",
|
||||
"pom": "sha256-4y32EbVgTpToWtNFgVIEtIBrwzsLkQefMg+ml/0thRw="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-iosarm64/0.0.29": {
|
||||
"module": "sha256-pi4zPVts8iYT+Id6q3xRa5R9W9LQrCdYL3pKlLqVjV4=",
|
||||
"pom": "sha256-FEuhDtbkSE07U1E8Q87TIB/v4YLFpLrOqZnpPchKilQ="
|
||||
"org/openani/mediamp#mediamp-api-iosarm64/0.0.30": {
|
||||
"module": "sha256-DWqiR1l7S++nrZxcFXJrLtw3XIjqj3kqwR2vd4m6fZw=",
|
||||
"pom": "sha256-4bG2sVVe3LlKtenq/gUmWh3N2+l5FSh8EgYMYDoXyUk="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-vX2BCljeCqNtJiV7jXlH8iQJDFiX5J7EaaCnaK9u1GQ=",
|
||||
"pom": "sha256-a+yj2/YHppcgKiQ/pK5lEM5ndC2GoLxN/RfHloDC6nU="
|
||||
"org/openani/mediamp#mediamp-api-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-PMH1SJn/7HHzFVq+PIIrYtfLHCy1wqTJwRdsDuD11+U=",
|
||||
"pom": "sha256-kwJMwkxnwD+Chp9ip+Cmgy/Fq39mcuUbTbeD4xyEpzE="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-api/0.0.29": {
|
||||
"module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=",
|
||||
"pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os="
|
||||
"org/openani/mediamp#mediamp-api/0.0.30": {
|
||||
"module": "sha256-qpHZ8PUMNf0qUY7pImlp0BeOiLXccgCPfNR+jzXnTGo=",
|
||||
"pom": "sha256-7mmAoDq1Js3QGlIlBpHvUN1WD1vWY6Vv3zjAejs3PTU="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-avkit-iosarm64/0.0.29": {
|
||||
"module": "sha256-69NJ47GtvieicRl2jQwncgKUOdAg04krEMUkFanTD9E=",
|
||||
"pom": "sha256-2ulgh0zZuf2Y3VB8HPEoeOoly57ZiuphZCxLt+O03PU="
|
||||
"org/openani/mediamp#mediamp-avkit-iosarm64/0.0.30": {
|
||||
"module": "sha256-zBn6Tz4aGOYy0nMEBFLKtp5mRFzgcHjovmTSLKPKetU=",
|
||||
"pom": "sha256-OSqAIdGS1juME6tgpo3PYaf6F9gYq86ze155k8SUNfc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-avkit-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-NqOkI5Z9iakDOzLu9J/VdLA8s4k+RpyMHRUtpCsGQrw=",
|
||||
"pom": "sha256-IPEcwTRk7xoDOwRIjOXcQ/xWneSRyfavPFoRQkKeYak="
|
||||
"org/openani/mediamp#mediamp-avkit-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-GkPl9oCYipnLq5AvhJSXfSmEN7CXDidf1jbveejZOgY=",
|
||||
"pom": "sha256-sqk1pwBCNE3FVbYXPIvq9Wc1ZYC0t1HG8jRQiVGwKIs="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-avkit/0.0.29": {
|
||||
"module": "sha256-3mZlCh9V5OHi74ETW/Z/7ElP12/rOxgDlHtfbcSmI5U=",
|
||||
"pom": "sha256-BCn3TBi/kYcTE7qXYYJhAl+W7eXi5MPN6yodYYUi/18="
|
||||
"org/openani/mediamp#mediamp-avkit/0.0.30": {
|
||||
"module": "sha256-qPTctSZF3yZ7eWeGd3whSLpe1VqhTKvghX9gt1x9ROc=",
|
||||
"pom": "sha256-qxNi8q1t4QvUvisiKZZkS35jBER/QO/q9RQ7BDdxN3w="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-exoplayer/0.0.29": {
|
||||
"module": "sha256-q3w8QTM4lgFZCCcKSH4/O8VASBVN/SxA7Kr6WBBjIpM=",
|
||||
"pom": "sha256-aoJSOzxoqYK5oJThfGXanf6/kkRoji8PtCuBwui6vfE="
|
||||
"org/openani/mediamp#mediamp-exoplayer/0.0.30": {
|
||||
"module": "sha256-vW+B6TZGu/PE96JqZVjTg4uhcLAO9XeN55Pfvm5Oz6M=",
|
||||
"pom": "sha256-b9jem2r2BXE4BaMpCzchhh9bcKKRNPJvk2VA+50fbKM="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-internal-utils-iosarm64/0.0.29": {
|
||||
"module": "sha256-dM6tWX17zmoxefcPBq5k+cj/YVlU5AG3ItIN+G4uOZ8=",
|
||||
"pom": "sha256-UVczUfnaJ0ap5maZ7b1KNPrEZksna+QfhHVFLbAbAeg="
|
||||
"org/openani/mediamp#mediamp-internal-utils-iosarm64/0.0.30": {
|
||||
"module": "sha256-oc5QOdK5ZYxNsVD5suYvlCMbzGonBapKmz42Nf9fYHg=",
|
||||
"pom": "sha256-5TZ7j3EaRSQruC/8PTXXzLLKoq0/xedJ++30j32GkBc="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-internal-utils-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-imh0Vg3ZZcWinZeWPcN8ShBhgot2EJ4ZZrYdHrMlu/M=",
|
||||
"pom": "sha256-q6DVnhuXEHqiLfk5X11RzePudY63ga1PhhiZg3fncWo="
|
||||
"org/openani/mediamp#mediamp-internal-utils-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-xL+LHQEp0IgT5QbkW7hhuQtsN4fCC0fPpjh51qNwMfM=",
|
||||
"pom": "sha256-BTWno5jqBWiotMVy0BNLyKV35S5ZAFkVAg8zb0JPMrU="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-internal-utils/0.0.29": {
|
||||
"module": "sha256-sIGzzI9XNlRUYlXqou8iLMNqvgi+v6XIUYnjfA+pbeo=",
|
||||
"pom": "sha256-s5DI6wAi4qSMP8bAPz4K/gOCLLDBSwNKk6m2CKsdtIY="
|
||||
"org/openani/mediamp#mediamp-internal-utils/0.0.30": {
|
||||
"module": "sha256-Db89LZagBZhIODpzWh/yxf3ND6Ipikk1KsQr+PqbZtk=",
|
||||
"pom": "sha256-SRXlD3PGaI3qk5R0uGvd48K79iPI2W+D0QyBegkWGm8="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android-debug/0.0.29": {
|
||||
"module": "sha256-sUm1P7HhQUhOwDUR1uVAPvHfZO5xhgiWX7ePLYgKDDs=",
|
||||
"pom": "sha256-/BJ4n949a/0FK/f8vMJ4LMyWDFYvb5PDL67YYZOzrMs="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android-debug/0.0.30": {
|
||||
"module": "sha256-nixitOGFxyv6HcDGdAKM1E8g9tBA96KD0x96SGkBzT0=",
|
||||
"pom": "sha256-esmapPkeonUbs6tfhS35fbPdvtuh9hj6sPTwKesa4/o="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android/0.0.29": {
|
||||
"module": "sha256-Qc/0FDWUS04Ss5F0BcpNAS5XJ6rTqVPhkHVXzaoFiRM=",
|
||||
"pom": "sha256-tzinK8zk1fGrql2WXhwc7YgzDV6MnbnjIyT5KVzOqxw="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-android/0.0.30": {
|
||||
"module": "sha256-OVhaDjRoRqpyMICPyqcNTYdjb8KjXNCDiYn4ZcgubSI=",
|
||||
"pom": "sha256-AdM6u0OvP2RRt6IkQ3lwRKpUef9R/cuDSGvsulHHR0w="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": {
|
||||
"org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.30": {
|
||||
"jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=",
|
||||
"module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=",
|
||||
"pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE="
|
||||
"module": "sha256-1u3N8N8Yg9A+5OThl+tqsqyEtns5RMiC8NdY1oB1M7k=",
|
||||
"pom": "sha256-9duiRN3Hwp4p49AeyS6jLpoTjr0oTd8Akup3Yp+65As="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iosarm64/0.0.29": {
|
||||
"module": "sha256-s848sz/BVAOAd5ORpSuZ5Mngsco2qJdoVX/IVhPUU6Q=",
|
||||
"pom": "sha256-M+BJJRgYRKhY02cEqQbeqOUC4HQpkrIaoGqfpfMf1G0="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iosarm64/0.0.30": {
|
||||
"module": "sha256-AlnPAvx7IWWitGp6PpJgZoIrJ28DIoxXg5yDV/mgl2k=",
|
||||
"pom": "sha256-DcyGFMKTaYnvniNAZq1db2g0ED4XO6TdLOGa5sjJpDs="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iossimulatorarm64/0.0.29": {
|
||||
"module": "sha256-KodoKoQh4lb9t799R3O2ZhuX1fg57ULxCJ/xSL956hk=",
|
||||
"pom": "sha256-RT9U7NnYMDnVCTWKnkvU4ZHtFVGM2+PON2JdB4hPwCs="
|
||||
"org/openani/mediamp#mediamp-source-ktxio-iossimulatorarm64/0.0.30": {
|
||||
"module": "sha256-T+2KAQm+6/pB5fbNurEukrK4OlOt5o5sjQxaO/23qjM=",
|
||||
"pom": "sha256-IfCCH0sXk+TNXF0EXlafqihrONqUR49tVkwRp2f1RO4="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-source-ktxio/0.0.29": {
|
||||
"module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=",
|
||||
"pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag="
|
||||
"org/openani/mediamp#mediamp-source-ktxio/0.0.30": {
|
||||
"module": "sha256-cUirc+cdT2fXVcuTYofTsmRv6mDruHt2u9BBiDbzUoI=",
|
||||
"pom": "sha256-nXoS8U+BvG/r6i9jCGOLV2Ha7RbyMS6dhS6mNo2qlWA="
|
||||
},
|
||||
"org/openani/mediamp#mediamp-vlc/0.0.29": {
|
||||
"jar": "sha256-IipT5VaRSsRsF0+DOLb4ZEAVSVIVuSVMbydWzTgjN6I=",
|
||||
"module": "sha256-3iXzV+GUgG26i6JGs+KuifxMAqw6n91hvFBnY4PhGH0=",
|
||||
"pom": "sha256-hyzw9+4O0IBKsOBpmMYXFbYOFfhxlAXtvx5Zb2I2bU4="
|
||||
"org/openani/mediamp#mediamp-vlc/0.0.30": {
|
||||
"jar": "sha256-DxMTtFdwUM76Vxs5a8EaohRI39mSLjhBtSnqPVj1IlQ=",
|
||||
"module": "sha256-qT2ALGzzOSJamxUCRPOM91abwHZ4igwJqvPhB08G32U=",
|
||||
"pom": "sha256-IaarXJ6GI1unhIJUDIN5j4RE1FVRbOCr9HYG5BIMOTo="
|
||||
},
|
||||
"org/openani/mediamp/catalog/0.0.29/catalog-0.0.29": {
|
||||
"toml": "sha256-wNPEmb14ugDo4NPEcf8lY0hRcCOGDFmsDGcHJqUSq5E="
|
||||
"org/openani/mediamp/catalog/0.0.30/catalog-0.0.30": {
|
||||
"toml": "sha256-NMqiEq/q+rgs2uiUsFJBROfMY9sSjCdpurSWrRjM2c0="
|
||||
},
|
||||
"org/ow2#ow2/1.5.1": {
|
||||
"pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchpatch,
|
||||
gradle,
|
||||
autoPatchelfHook,
|
||||
jetbrains, # Requird by upstream due to JCEF dependency
|
||||
jetbrains, # Required by upstream due to JCEF dependency
|
||||
fontconfig,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
@@ -113,23 +113,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "animeko";
|
||||
version = "5.2.0";
|
||||
version = "5.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-ani";
|
||||
repo = "animeko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eP1v/o9qUk8qG+n1cJRmlgu2l06hFZLeUN/X06qAVpY=";
|
||||
hash = "sha256-mDUl1RpTIFBHdYst6R16iVljiUNOYh6mNUtOLBSuOE0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# CefLog.init(jcefConfig.cefSettings) is being comment out due to compile error
|
||||
postPatch = ''
|
||||
echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties
|
||||
sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties
|
||||
sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties
|
||||
substituteInPlace app/shared/app-platform/src/desktopMain/kotlin/platform/AniCefApp.kt \
|
||||
--replace-fail 'CefLog.init(jcefConfig.cefSettings)' '//CefLog.init(jcefConfig.cefSettings)'
|
||||
'';
|
||||
|
||||
gradleBuildTask = "createReleaseDistributable";
|
||||
@@ -237,6 +234,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxdamage
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Builtin updater will never work on NixOS, so we made a patch to disable updater
|
||||
./0001-no-update-checker.patch
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -43,57 +43,63 @@ let
|
||||
srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A=";
|
||||
cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM=";
|
||||
yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg=";
|
||||
pythonDeps = with python3Packages; [
|
||||
# anki (pylib) runtime deps
|
||||
decorator
|
||||
distro
|
||||
markdown
|
||||
orjson
|
||||
protobuf
|
||||
requests
|
||||
typing-extensions
|
||||
pythonDeps =
|
||||
with python3Packages;
|
||||
[
|
||||
# anki (pylib) runtime deps
|
||||
decorator
|
||||
distro
|
||||
markdown
|
||||
orjson
|
||||
protobuf
|
||||
requests
|
||||
typing-extensions
|
||||
|
||||
# aqt runtime deps
|
||||
beautifulsoup4
|
||||
flask
|
||||
flask-cors
|
||||
jsonschema
|
||||
pip-system-certs
|
||||
pyqt6
|
||||
pyqt6-sip
|
||||
pyqt6-webengine
|
||||
send2trash
|
||||
waitress
|
||||
# aqt runtime deps
|
||||
beautifulsoup4
|
||||
flask
|
||||
flask-cors
|
||||
jsonschema
|
||||
pip-system-certs
|
||||
pyqt6
|
||||
pyqt6-sip
|
||||
pyqt6-webengine
|
||||
send2trash
|
||||
waitress
|
||||
|
||||
# build-system deps (needed by uv for editable installs)
|
||||
editables
|
||||
hatchling
|
||||
pathspec
|
||||
pluggy
|
||||
setuptools
|
||||
trove-classifiers
|
||||
# build-system deps (needed by uv for editable installs)
|
||||
editables
|
||||
hatchling
|
||||
pathspec
|
||||
pluggy
|
||||
setuptools
|
||||
trove-classifiers
|
||||
|
||||
# transitive deps
|
||||
attrs
|
||||
blinker
|
||||
certifi
|
||||
charset-normalizer
|
||||
click
|
||||
idna
|
||||
itsdangerous
|
||||
jinja2
|
||||
jsonschema-specifications
|
||||
markupsafe
|
||||
packaging
|
||||
pip
|
||||
pysocks
|
||||
referencing
|
||||
rpds-py
|
||||
soupsieve
|
||||
urllib3
|
||||
werkzeug
|
||||
wrapt
|
||||
];
|
||||
# transitive deps
|
||||
attrs
|
||||
blinker
|
||||
certifi
|
||||
charset-normalizer
|
||||
click
|
||||
idna
|
||||
itsdangerous
|
||||
jinja2
|
||||
jsonschema-specifications
|
||||
markupsafe
|
||||
packaging
|
||||
pip
|
||||
pysocks
|
||||
referencing
|
||||
rpds-py
|
||||
soupsieve
|
||||
urllib3
|
||||
werkzeug
|
||||
wrapt
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
anki-audio
|
||||
anki-mac-helper
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankitects";
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "api-linter";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yx4UTxFJSc+tsA2u6IiSlzV9H7occ2qKtCm7zwv5PaA=";
|
||||
hash = "sha256-xks5oKfJSMV4MbPFrYGWv82XeBLYbGgXF4r4kbFX93Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TiZRts1ruC0R5DQ5at7Z1c+zuGpD0f3D89X2b1gXA5s=";
|
||||
vendorHash = "sha256-wPySRFqm396YRqEUZNMkA19SxqBNApwr8hm0PRA5cO0=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -272,6 +272,10 @@
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-66mX1K1azQvbuApyKBwvVuiKCbLaqezCDdrv0lhvVD0=";
|
||||
description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers";
|
||||
pythonRelaxDeps = [
|
||||
"mycli"
|
||||
"pgcli"
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
(with python3Packages; [
|
||||
pgcli
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "betterleaks";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "betterleaks";
|
||||
repo = "betterleaks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PJGFvm+QoExUMliL6rvBAKKjt8Ce5VZfQxCYbpXUXfU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lIblIctRnq//ic+most3g9Ff92XhfqbFfHrLdI0beQQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X=github.com/betterleaks/betterleaks/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd betterleaks \
|
||||
--bash <($out/bin/betterleaks completion bash) \
|
||||
--fish <($out/bin/betterleaks completion fish) \
|
||||
--zsh <($out/bin/betterleaks completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/betterleaks";
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Scan code for secrets";
|
||||
homepage = "https://github.com/betterleaks/betterleaks";
|
||||
changelog = "https://github.com/betterleaks/betterleaks/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
kachick
|
||||
];
|
||||
mainProgram = "betterleaks";
|
||||
};
|
||||
})
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Analyze dump files produced by Zebra/Quagga or MRT";
|
||||
license = lib.licenses.hpnd;
|
||||
maintainers = with lib.maintainers; [ lewo ];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "bgpdump";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -18,6 +18,11 @@
|
||||
|
||||
# build ESDM RNG plugin
|
||||
withEsdm ? false,
|
||||
# build with jitterentropy RNG plugin,
|
||||
# default disabled, health tests may fail without
|
||||
# configuration of OSR and related parameters
|
||||
# in jitterentropy
|
||||
withJitterentropy ? false,
|
||||
# useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
|
||||
withTpm2 ? false,
|
||||
policy ? null,
|
||||
@@ -55,7 +60,7 @@ let
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
pname = "botan";
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -77,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "randombit";
|
||||
repo = "botan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-E4kKk4ry3SMn2DbnUTVx22lcAWDxxbo8DLyixjr/S6A=";
|
||||
hash = "sha256-jjrO43SItFi+6FrU9B45Y1GK+6V5ZIgaYaMHkgRh4IE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -92,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
|
||||
tpm2-tss
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
|
||||
++ lib.optionals (withJitterentropy && !stdenv.hostPlatform.isMinGW) [
|
||||
jitterentropy
|
||||
]
|
||||
++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [
|
||||
@@ -129,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
|
||||
"--with-tpm2"
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
|
||||
++ lib.optionals (withJitterentropy && !stdenv.hostPlatform.isMinGW) [
|
||||
"--enable-modules=jitter_rng"
|
||||
]
|
||||
++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [
|
||||
|
||||
@@ -106,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://fmv.jku.at/cadical/";
|
||||
mainProgram = "cadical";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -296,7 +296,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}";
|
||||
license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ pSub ];
|
||||
maintainers = with lib.maintainers; [
|
||||
pSub
|
||||
sempiternal-aurora
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cdncheck";
|
||||
version = "1.2.26";
|
||||
version = "1.2.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q7AK2v6GsyO4kDYTqpZzexJKxft3DyxmpQ71ji3SiIA=";
|
||||
hash = "sha256-zGOtnjJaXs5BGcygwaR9kd6ZmEXU64Nu5td/8q6Hp0s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bYN119IyOkO9w+CWGwnCOXqpo4QHJV6iDuToMnTo0og=";
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
|
||||
Command to enable you to reproduce the CircleCI environment locally and
|
||||
run jobs as if they were running on the hosted CirleCI application.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "circleci";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://circleci.com/";
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -36,18 +36,18 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "coc-texlab";
|
||||
version = "0-unstable-2026-03-07";
|
||||
version = "0-unstable-2026-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-texlab";
|
||||
rev = "104bbcdd5fbed16f765eb515fa0e0648d65879fe";
|
||||
hash = "sha256-G/SI/RwT5S8xNFSP5JTZI6tFbBN6LoE38CENTDZdQqo=";
|
||||
rev = "4b0e8626f06a9396767468edd800501929483eda";
|
||||
hash = "sha256-HOZBojd6pqPPeOKeki2Fr23B5ew86ruEvPt9IAOJdMk=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-/cZaAIbQ/A87NE6FPhkyy8Junvd4MEdF7yfRKrS4vFM=";
|
||||
hash = "sha256-iAEGe0QZrt+iSkR0MbjsrwpvJz89bP4Xj+NQfsOnL5s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "codd";
|
||||
version = "0.1.6";
|
||||
version = "0.1.8";
|
||||
src = ./.;
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
@@ -72,6 +72,7 @@ mkDerivation {
|
||||
unliftio
|
||||
unliftio-core
|
||||
unordered-containers
|
||||
uuid
|
||||
vector
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
##############
|
||||
|
||||
let
|
||||
# Haxl has relatively tight version requirements and is thus often marked as broken.
|
||||
# Haxl has relatively tight version requirements and is often marked as broken.
|
||||
haxlJailbroken = haskell.lib.markUnbroken (haskell.lib.doJailbreak haskellPackages.haxl);
|
||||
|
||||
generated = haskellPackages.callPackage ./generated.nix { haxl = haxlJailbroken; };
|
||||
|
||||
derivationWithVersion = haskell.lib.compose.overrideCabal rec {
|
||||
version = "0.1.6";
|
||||
version = "0.1.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mzabani";
|
||||
repo = "codd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KdZCL09TERy/PolQyYYykEbPtG5yhxrLZSSo9n6p2WE=";
|
||||
hash = "sha256-7MKlR3oepOwlBwiEpzz3NFepEYGqROT5RrYoe/vvBKM=";
|
||||
};
|
||||
|
||||
# We only run codd's tests that don't require postgresql nor strace. We need to support unix sockets in codd's test suite
|
||||
|
||||
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
with support for rich output like plots.
|
||||
'';
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ synthetica ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "codebraid";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "contact";
|
||||
version = "1.4.17";
|
||||
version = "1.4.22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdxlocations";
|
||||
repo = "contact";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-EQNKljdySxujpoAaA43jHfh39K2BW5/Autt06dlijpk=";
|
||||
hash = "sha256-Kf6q5CNS+kzs+5gkKAS40+5RnsQ4FAsh8OQaH5Ii17Y=";
|
||||
};
|
||||
|
||||
dependencies = [ python3Packages.meshtastic ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot-node-agent";
|
||||
version = "1.28.3";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot-node-agent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1jwj6saABm1RFmqO0c5ViFTveRmlsmrNZ5D7P6HtWMc=";
|
||||
hash = "sha256-WaRPXqf7L26I46jdWEHZpYSwa7c3Ow5Ld1RcOOdZUow=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OOd3OctfklHzpMVDCnnb8HYPYqWQgBe+8HfbSm7dXzg=";
|
||||
|
||||
@@ -7,6 +7,6 @@ index ed05fce..e1649e0 100644
|
||||
},
|
||||
"active": true,
|
||||
- "createUpdaterArtifacts": true,
|
||||
"targets": "all",
|
||||
"targets": ["deb", "rpm"],
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
@@ -27,19 +27,19 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deadlock-mod-manager";
|
||||
version = "0.14.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadlock-mod-manager";
|
||||
repo = "deadlock-mod-manager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-A7RsgPi3NlcLSBkLg7/pWcSduaZyCspz19sjGjzEkqM=";
|
||||
hash = "sha256-rsOaCgP7ub4FkTkg1VWPZyf+N2I0qM0DCIIqBpJZCVg=";
|
||||
};
|
||||
|
||||
cargoRoot = "apps/desktop";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-L4orWiK1s1hfC2QDJ8G4hI1iqrdPHBaVTVHoW0hdlGo=";
|
||||
cargoHash = "sha256-aUtJzgjc9reFxUVMRwqCd2lNMRALlfMkfIRN4QT3g+E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
sourceRoot = "source";
|
||||
hash = "sha256-KhBWFujjo3FW3intvGA2Y7eLIdJ1B/4P5xIRPvzygT8=";
|
||||
hash = "sha256-oQxW0q+myMllwLQd+GRXXvnce+bYtwTLEEwFU0nupv4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
inherit hamlibSupport gpsdSupport extraScripts;
|
||||
}).overrideAttrs
|
||||
(oldAttrs: {
|
||||
version = "1.8.1-unstable-2026-03-09";
|
||||
version = "1.8.1-unstable-2026-03-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wb2osz";
|
||||
repo = "direwolf";
|
||||
rev = "3b20d8210a1d6f77073fd3452bbe87a21ee35a79";
|
||||
hash = "sha256-w/D5RO5dfcTh3nCOxe/GaHTSbzCYm+J1cJCt1K9lAaw=";
|
||||
rev = "0663670550073c9d89917d5ac78df65e551d237a";
|
||||
hash = "sha256-4A9595Z3to/HBW1WS1mLYQDGokmSz3ClfRDhsLxIj0E=";
|
||||
};
|
||||
|
||||
dontVersionCheck = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dns-collector";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmachard";
|
||||
repo = "dns-collector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b1fKxjdZpCuPg+lRhpYn8tjVOqQU1kyhta63G+8Pxr4=";
|
||||
hash = "sha256-497qilu1/76XbAO3fKIRpDWjQaCmdDgdxswkE5y8pNU=";
|
||||
};
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-UNp2lttwBQM9Xx6+aOQGKdOgeMBsyCHQdhCAbyvDCN4=";
|
||||
vendorHash = "sha256-4gvGqNPRdB/t498WBF9vTqyuTl2rkAo7nRvNEpTMPqY=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doctl";
|
||||
version = "1.151.0";
|
||||
version = "1.152.0";
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E/WehmqEfsOJDdssIV4PQpKAEAyS+VnG17jbd0OxD8U=";
|
||||
hash = "sha256-LC7eriG9WqoCzb5bkXPWQO3kH9QXkBwRQmqxOb9yL7s=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -49,24 +49,5 @@
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.57.1": "c1604ca04c0983fc4cb3b4fcfc546ed30d96b8845445b1f99e7c8ce0800866a6ed0ecae58f4c8fbf5f02aaa9aefc5eebfa7a003fe74e63b96630d8b0ee51a8b8",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.57.1": "bf3146adcd2cd3a63bfe51b92355ec2a7ec2c004e778b620ea14bfc401b34ffa0e0087a4b2ede0f600a25f4842aaedaffac1d5e67fcb315a0b5507291656e07f",
|
||||
"@rollup/rollup-win32-x64-gnu@npm:4.57.1": "cdd850fe4136b5d5649cacde8604391487ca9105dd7ef53817d9d9fd0ee80400608cff44f2810451aef5067fe05a31fe2f038c9aec59094fad00e3c8c54504c5",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.57.1": "4097849e2a9699531cab315c76576490c4318c8ca5d5a88c775cc94513cfccb66c0f54fc43203ab4b596a37f46d2d72eb341e03b0d5ec7d2bf47adb8651e59e4",
|
||||
"@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
|
||||
"@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
|
||||
"@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
|
||||
"@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
|
||||
"@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
|
||||
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
|
||||
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
|
||||
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
|
||||
"@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
|
||||
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
|
||||
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
|
||||
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
|
||||
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
|
||||
"@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
|
||||
"@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
|
||||
"@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
|
||||
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
|
||||
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
|
||||
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.57.1": "4097849e2a9699531cab315c76576490c4318c8ca5d5a88c775cc94513cfccb66c0f54fc43203ab4b596a37f46d2d72eb341e03b0d5ec7d2bf47adb8651e59e4"
|
||||
}
|
||||
|
||||
@@ -16,19 +16,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dokieli";
|
||||
version = "0-unstable-2026-03-01";
|
||||
version = "0-unstable-2026-03-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dokieli";
|
||||
repo = "dokieli";
|
||||
rev = "85f9e08e41ffd815db39b1524bf880cbb5775a66";
|
||||
hash = "sha256-EexIbwtENincgdzzbvNVq/dbJKly0uJGoXDT7G/3/Gs=";
|
||||
rev = "ea9e0b4a4d374a87abc76365b44e7d24017206a6";
|
||||
hash = "sha256-KJbnXRSUvKGm6q8koZYoNGMaSO5u8xCoA3hDWOCgIx4=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-kXNev+L8DvDm8kUrCEWOSp7Es3WnCL3kfDLozrZ5/1U=";
|
||||
hash = "sha256-fhwuF0ELHw2avw8pnZUXPVkq+MJjuynFTBAU6O92mLM=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "elan";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover";
|
||||
repo = "elan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-pbzZTdvjxIqzEDzE38rjeJ/lgHx8NRTD3osVP/A7nHo=";
|
||||
hash = "sha256-NSgzAYQjsf3lwYOiuJbkLJGRZ7rY2FEOjPORXNhjWuU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fuXmI/IxxYooc8C5otH5BlCHv7SsfWevw4i9tW65rno=";
|
||||
cargoHash = "sha256-JzyDVFp1lGPk1IK6CLQMBcJi5yCVD9x1iXtN0wlOF3g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/auth/lib/services/update_service.dart b/auth/lib/services/update_service.dart
|
||||
index 716d553f1b..3946d87a7d 100644
|
||||
--- a/lib/services/update_service.dart
|
||||
+++ b/lib/services/update_service.dart
|
||||
@@ -134,9 +134,7 @@ class UpdateService {
|
||||
}
|
||||
|
||||
bool isIndependent() {
|
||||
- return flavor == "independent" ||
|
||||
- _packageInfo.packageName.endsWith("independent") ||
|
||||
- PlatformUtil.isDesktop();
|
||||
+ return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
|
||||
"ente_crypto_dart": "sha256-/Pz9HPyQ6ts/sbqopShRSQCC99seiE5pCK0pR5mNji8=",
|
||||
"fk_user_agent": "sha256-GmuQPohnTi4SVta1FyEErOb7n0Jp6UdLcX/Cf+koJNA=",
|
||||
"flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
|
||||
"move_to_background": "sha256-cLH3vUrPmEtYKlfn2hi6Wl4JQG4dt9aEyTmVCj7zBe0=",
|
||||
|
||||
@@ -2,30 +2,29 @@
|
||||
lib,
|
||||
flutter332,
|
||||
fetchFromGitHub,
|
||||
sqlite,
|
||||
libayatana-appindicator,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
jdk17_headless,
|
||||
yq-go,
|
||||
}:
|
||||
let
|
||||
# fetch simple-icons directly to avoid cloning with submodules,
|
||||
# which would also clone a whole copy of flutter
|
||||
simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json);
|
||||
desktopId = "io.ente.auth";
|
||||
flutter = flutter332;
|
||||
in
|
||||
flutter332.buildFlutterApplication rec {
|
||||
flutter.buildFlutterApplication rec {
|
||||
pname = "ente-auth";
|
||||
version = "4.4.12";
|
||||
version = "4.4.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
repo = "ente";
|
||||
sparseCheckout = [ "mobile" ];
|
||||
tag = "auth-v${version}";
|
||||
hash = "sha256-1GJWGTzErV+wSkeAg3z0u7tBPFrq6hPc0fWniKT8w9M=";
|
||||
hash = "sha256-qnjOrct70TaaO91QBHcbRIkzLZGH6mbpuLAAKE9k/es=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/mobile/apps/auth";
|
||||
@@ -33,15 +32,43 @@ flutter332.buildFlutterApplication rec {
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
gitHashes = lib.importJSON ./git-hashes.json;
|
||||
|
||||
patches = [
|
||||
# Disable update notifications and auto-update functionality
|
||||
./0001-disable-updates.patch
|
||||
];
|
||||
customSourceBuilders.ente_strings =
|
||||
{ version, src, ... }:
|
||||
# There currently is no covenient way to setup the flutter SDK outside of apps
|
||||
# and we can't move this to the app's own build phase as it would still reference
|
||||
# the immutable source variant without the generated l10n files.
|
||||
flutter.buildFlutterApplication {
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
pname = "ente_strings";
|
||||
sourceRoot = "${src.name}/mobile/packages/strings";
|
||||
pubspecLock = lib.importJSON ./strings.pubspec.lock.json;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
flutter gen-l10n
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# The $debug output can't be disabled for buildFlutterApplication.
|
||||
# The $out structure must match that of ente-auth to correctly resolve
|
||||
# the package as pubspec uses relative paths for workspace packages.
|
||||
mkdir -p $debug $out/mobile/{apps/auth,packages}
|
||||
rm pubspec.lock
|
||||
cp -r . $out/mobile/packages/strings
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rmdir assets/simple-icons
|
||||
ln -s ${simple-icons} assets/simple-icons
|
||||
${lib.getExe yq-go} -i 'del(.dependencies.sqlite3_flutter_libs)' pubspec.yaml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -50,7 +77,6 @@ flutter332.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
libayatana-appindicator
|
||||
# The networking client used by ente-auth (native_dio_adapter)
|
||||
# introduces a transitive dependency on Java, which technically
|
||||
@@ -63,6 +89,11 @@ flutter332.buildFlutterApplication rec {
|
||||
# https://github.com/juliansteenbakker/flutter_secure_storage/issues/965
|
||||
env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ];
|
||||
|
||||
flutterBuildFlags = [
|
||||
# Disable update notifications and auto-update functionality
|
||||
"--dart-define=app.flavor=independent"
|
||||
];
|
||||
|
||||
# Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
|
||||
# and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
|
||||
desktopItems = [
|
||||
|
||||
@@ -414,11 +414,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "device_info_plus",
|
||||
"sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110",
|
||||
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.1.2"
|
||||
"version": "11.5.0"
|
||||
},
|
||||
"device_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -450,15 +450,6 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"dir_utils": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "../../packages/dir_utils",
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"dots_indicator": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -526,17 +517,35 @@
|
||||
"source": "path",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"ente_crypto_dart": {
|
||||
"ente_crypto_api": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "../../packages/ente_crypto_api",
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "0.0.1"
|
||||
},
|
||||
"ente_crypto_dart": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "HEAD",
|
||||
"resolved-ref": "f91e1545f8263df127762240c4da54a0c42835b2",
|
||||
"resolved-ref": "dc995b62d6ec5bca3ba47966685b2af3c42235b2",
|
||||
"url": "https://github.com/ente-io/ente_crypto_dart.git"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"ente_crypto_dart_adapter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "../../packages/ente_crypto_dart_adapter",
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "0.0.1"
|
||||
},
|
||||
"ente_events": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -573,6 +582,15 @@
|
||||
"source": "path",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"ente_pure_utils": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "../../packages/ente_pure_utils",
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"ente_qr": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -601,7 +619,7 @@
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"ente_utils": {
|
||||
"dependency": "direct overridden",
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "../../packages/utils",
|
||||
"relative": true
|
||||
@@ -1275,6 +1293,16 @@
|
||||
"source": "hosted",
|
||||
"version": "6.9.5"
|
||||
},
|
||||
"launcher_icon_switcher": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "launcher_icon_switcher",
|
||||
"sha256": "a1e0778ed016107077f54f22b4987f322315de8d3df31a6ed494134f55c0ff41",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.0.2"
|
||||
},
|
||||
"leak_tracker": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1777,6 +1805,15 @@
|
||||
"source": "hosted",
|
||||
"version": "0.11.0"
|
||||
},
|
||||
"scoped_dir_access": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "../../packages/scoped_dir_access",
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"screen_retriever": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -2103,6 +2140,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.7.6"
|
||||
},
|
||||
"sqlite3_flutter_libs": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "sqlite3_flutter_libs",
|
||||
"sha256": "e07232b998755fe795655c56d1f5426e0190c9c435e1752d39e7b1cd33699c71",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.34"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -2477,11 +2524,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32_registry",
|
||||
"sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
|
||||
"sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.5"
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"window_manager": {
|
||||
"dependency": "direct main",
|
||||
|
||||
@@ -0,0 +1,272 @@
|
||||
{
|
||||
"packages": {
|
||||
"async": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "async",
|
||||
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.13.0"
|
||||
},
|
||||
"boolean_selector": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "boolean_selector",
|
||||
"sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"characters": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "characters",
|
||||
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"clock": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "clock",
|
||||
"sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.2"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "collection",
|
||||
"sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.19.1"
|
||||
},
|
||||
"fake_async": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "fake_async",
|
||||
"sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.3"
|
||||
},
|
||||
"flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"flutter_lints": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_lints",
|
||||
"sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.0"
|
||||
},
|
||||
"flutter_localizations": {
|
||||
"dependency": "direct main",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"intl": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "intl",
|
||||
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.20.2"
|
||||
},
|
||||
"leak_tracker": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker",
|
||||
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.9"
|
||||
},
|
||||
"leak_tracker_flutter_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_flutter_testing",
|
||||
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.9"
|
||||
},
|
||||
"leak_tracker_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_testing",
|
||||
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.1"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "lints",
|
||||
"sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.1.1"
|
||||
},
|
||||
"matcher": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.17"
|
||||
},
|
||||
"material_color_utilities": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "material_color_utilities",
|
||||
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.11.1"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"path": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path",
|
||||
"sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.9.1"
|
||||
},
|
||||
"sky_engine": {
|
||||
"dependency": "transitive",
|
||||
"description": "flutter",
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"source_span": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_span",
|
||||
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.10.1"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stack_trace",
|
||||
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.12.1"
|
||||
},
|
||||
"stream_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stream_channel",
|
||||
"sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"string_scanner": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "string_scanner",
|
||||
"sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "term_glyph",
|
||||
"sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.4"
|
||||
},
|
||||
"vector_math": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_math",
|
||||
"sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"vm_service": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "15.0.0"
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.7.0-0 <4.0.0",
|
||||
"flutter": ">=3.18.0-18.0.pre.54"
|
||||
}
|
||||
}
|
||||
@@ -20,13 +20,19 @@ echo "Updating to $short_version"
|
||||
mobile_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "mobile") | .url' --raw-output)"
|
||||
apps_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "apps") | .url' --raw-output)"
|
||||
auth_tree="$(gh-curl "$apps_tree" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)"
|
||||
packages_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "packages") | .url' --raw-output)"
|
||||
strings_tree="$(gh-curl "$packages_tree" | gojq '.tree[] | select(.path == "strings") | .url' --raw-output)"
|
||||
|
||||
pushd "$pkg_dir"
|
||||
|
||||
# Get lockfile, filter out incompatible sqlite dependency and convert to JSON
|
||||
# Get lockfile and convert to JSON
|
||||
echo "Updating lockfile"
|
||||
pubspec_lock="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)"
|
||||
gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > pubspec.lock.json
|
||||
gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input > pubspec.lock.json
|
||||
|
||||
echo "Updating strings lockfile"
|
||||
strings_pubspec_lock="$(gh-curl "$strings_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)"
|
||||
gh-curl "$strings_pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input > strings.pubspec.lock.json
|
||||
|
||||
echo "Updating git hashes"
|
||||
./fetch-git-hashes.py
|
||||
|
||||
@@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
pSub
|
||||
synthetica
|
||||
];
|
||||
mainProgram = "entr";
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
openssl,
|
||||
asio,
|
||||
tinyxml-2,
|
||||
openjdk11,
|
||||
python3,
|
||||
foonathan-memory,
|
||||
fastcdr,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastdds";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-DDS";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-NTdkGRbE4yVMMZ/PqLC2nZYD0uIcmo1tr+ieOBSijCM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
openjdk11
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
asio
|
||||
tinyxml-2
|
||||
foonathan-memory
|
||||
fastcdr
|
||||
python3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DSECURITY=ON"
|
||||
"-DCOMPILE_EXAMPLES=OFF"
|
||||
"-DCMAKE_PREFIX_PATH=${foonathan-memory}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "C++ implementation of the DDS (Data Distribution Service) standard";
|
||||
homepage = "https://github.com/eProsima/Fast-DDS";
|
||||
license = lib.licenses.asl20;
|
||||
longDescription = ''
|
||||
eProsima Fast DDS is a C++ implementation of the DDS (Data Distribution Service) standard
|
||||
of the OMG (Object Management Group). It implements the RTPS (Real Time Publish Subscribe)
|
||||
protocol, which provides publisher-subscriber communications over unreliable transports
|
||||
such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.
|
||||
'';
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -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,13 +6,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.0-stable";
|
||||
version = "1.2.2-stable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gtsteffaniak";
|
||||
repo = "filebrowser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S3MtqIqmFYDY053HX8yYGxHc6ev0Y8eXbe24TL8PtYQ=";
|
||||
hash = "sha256-MWFBoVr5WRfLhDUGEGS6ntb3v23HcOcm91x3fGriM2A=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
@@ -20,7 +20,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
npmDepsHash = "sha256-pJR5m1XrqeHwOADWMnFDtHivaKCBqqdG2O6fWql7ugA=";
|
||||
npmDepsHash = "sha256-brW5YR/DNBOCPBDMEjSzyk+YTbrP5ppdQ0US/DLbyIs=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@@ -47,7 +47,7 @@ buildGoModule {
|
||||
|
||||
sourceRoot = "${src.name}/backend";
|
||||
|
||||
vendorHash = "sha256-t4cREfkj+z+EvgXjzqYc8xs0jhTMUZMjcHxkkuuLpZs=";
|
||||
vendorHash = "sha256-pU5qtWvhLbMdxzXK6uKxEkvbZdb2oa4ZHKaCPm0bIwU=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p http/embed
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "files-cli";
|
||||
version = "2.15.211";
|
||||
version = "2.15.220";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-iN56+OV0xjPtj5SajVF7HkUAWv4dPxlPDhnwSo+Nb80=";
|
||||
hash = "sha256-EK9gvojot0pp3vkwzwKjr3rZI9IxPbp5Ng5tTzZawKQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FOH+S6T5luTrrKZRC1EzUvwBlWpMuW7QCYdtHlx+7EU=";
|
||||
vendorHash = "sha256-JeJ7BjRt2zofl1W5wU+FMInPZ9w1Uu9ez9JWjos14Qs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user