0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge c936d57413 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot] 2025-05-31 00:23:03 +00:00 committed by GitHub
commit c8fe7786a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
156 changed files with 1893 additions and 4652 deletions

View file

@ -266,3 +266,6 @@ a034fb50f79816c6738fb48b48503b09ea3b0132
# treewide: switch instances of lib.teams.*.members to the new meta.teams attribute # treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
05580f4b4433fda48fff30f60dfd303d6ee05d21 05580f4b4433fda48fff30f60dfd303d6ee05d21
# nixos/redmine: Get rid of global lib expansions
d7f1102f04c58b2edfc74c9a1d577e3aebfca775

View file

@ -556,7 +556,7 @@ let
"x86_64" = "amd64"; "x86_64" = "amd64";
"wasm32" = "wasm"; "wasm32" = "wasm";
} }
.${final.parsed.cpu.name} or (throw "Unknown CPU variant ${final.parsed.cpu.name} by Go"); .${final.parsed.cpu.name} or null;
GOOS = if final.isWasi then "wasip1" else final.parsed.kernel.name; GOOS = if final.isWasi then "wasip1" else final.parsed.kernel.name;
# See https://go.dev/wiki/GoArm # See https://go.dev/wiki/GoArm

View file

@ -316,7 +316,6 @@
./programs/systemtap.nix ./programs/systemtap.nix
./programs/tcpdump.nix ./programs/tcpdump.nix
./programs/television.nix ./programs/television.nix
./programs/thefuck.nix
./programs/thunar.nix ./programs/thunar.nix
./programs/thunderbird.nix ./programs/thunderbird.nix
./programs/tmux.nix ./programs/tmux.nix

View file

@ -1,43 +0,0 @@
{
config,
pkgs,
lib,
...
}:
let
prg = config.programs;
cfg = prg.thefuck;
bashAndZshInitScript = ''
eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
'';
fishInitScript = ''
${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source
'';
in
{
options = {
programs.thefuck = {
enable = lib.mkEnableOption "thefuck, an app which corrects your previous console command";
alias = lib.mkOption {
default = "fuck";
type = lib.types.str;
description = ''
`thefuck` needs an alias to be configured.
The default value is `fuck`, but you can use anything else as well.
'';
};
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ thefuck ];
programs.bash.interactiveShellInit = bashAndZshInitScript;
programs.zsh.interactiveShellInit = lib.mkIf prg.zsh.enable bashAndZshInitScript;
programs.fish.interactiveShellInit = lib.mkIf prg.fish.enable fishInitScript;
};
}

View file

@ -66,6 +66,10 @@ in
pantheon-tweaks is no longer a switchboard plugin but an independent app, pantheon-tweaks is no longer a switchboard plugin but an independent app,
adding the package to environment.systemPackages is sufficient. adding the package to environment.systemPackages is sufficient.
'') '')
(mkRemovedOptionModule [ "programs" "thefuck" ] ''
The corresponding package was removed from nixpkgs,
consider using `programs.pay-respects` instead.
'')
(mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "programs" "way-cooler" ] ( (mkRemovedOptionModule [ "programs" "way-cooler" ] (
"way-cooler is abandoned by its author: " "way-cooler is abandoned by its author: "

View file

@ -6,19 +6,6 @@
}: }:
let let
inherit (lib)
mkBefore
mkDefault
mkEnableOption
mkPackageOption
mkIf
mkOption
mkRemovedOptionModule
types
;
inherit (lib) concatStringsSep literalExpression mapAttrsToList;
inherit (lib) optional optionalAttrs optionalString;
cfg = config.services.redmine; cfg = config.services.redmine;
format = pkgs.formats.yaml { }; format = pkgs.formats.yaml { };
bundle = "${cfg.package}/share/redmine/bin/bundle"; bundle = "${cfg.package}/share/redmine/bin/bundle";
@ -30,7 +17,7 @@ let
database = database =
if cfg.database.type == "sqlite3" then "${cfg.stateDir}/database.sqlite3" else cfg.database.name; if cfg.database.type == "sqlite3" then "${cfg.stateDir}/database.sqlite3" else cfg.database.name;
} }
// optionalAttrs (cfg.database.type != "sqlite3") { // lib.optionalAttrs (cfg.database.type != "sqlite3") {
host = host =
if (cfg.database.type == "postgresql" && cfg.database.socket != null) then if (cfg.database.type == "postgresql" && cfg.database.socket != null) then
cfg.database.socket cfg.database.socket
@ -39,10 +26,10 @@ let
port = cfg.database.port; port = cfg.database.port;
username = cfg.database.user; username = cfg.database.user;
} }
// optionalAttrs (cfg.database.type != "sqlite3" && cfg.database.passwordFile != null) { // lib.optionalAttrs (cfg.database.type != "sqlite3" && cfg.database.passwordFile != null) {
password = "#dbpass#"; password = "#dbpass#";
} }
// optionalAttrs (cfg.database.type == "mysql2" && cfg.database.socket != null) { // lib.optionalAttrs (cfg.database.type == "mysql2" && cfg.database.socket != null) {
socket = cfg.database.socket; socket = cfg.database.socket;
}; };
}; };
@ -75,12 +62,12 @@ let
in in
{ {
imports = [ imports = [
(mkRemovedOptionModule [ (lib.mkRemovedOptionModule [
"services" "services"
"redmine" "redmine"
"extraConfig" "extraConfig"
] "Use services.redmine.settings instead.") ] "Use services.redmine.settings instead.")
(mkRemovedOptionModule [ (lib.mkRemovedOptionModule [
"services" "services"
"redmine" "redmine"
"database" "database"
@ -91,43 +78,43 @@ in
# interface # interface
options = { options = {
services.redmine = { services.redmine = {
enable = mkEnableOption "Redmine, a project management web application"; enable = lib.mkEnableOption "Redmine, a project management web application";
package = mkPackageOption pkgs "redmine" { package = lib.mkPackageOption pkgs "redmine" {
example = "redmine.override { ruby = pkgs.ruby_3_2; }"; example = "redmine.override { ruby = pkgs.ruby_3_2; }";
}; };
user = mkOption { user = lib.mkOption {
type = types.str; type = lib.types.str;
default = "redmine"; default = "redmine";
description = "User under which Redmine is ran."; description = "User under which Redmine is ran.";
}; };
group = mkOption { group = lib.mkOption {
type = types.str; type = lib.types.str;
default = "redmine"; default = "redmine";
description = "Group under which Redmine is ran."; description = "Group under which Redmine is ran.";
}; };
address = mkOption { address = lib.mkOption {
type = types.str; type = lib.types.str;
default = "0.0.0.0"; default = "0.0.0.0";
description = "IP address Redmine should bind to."; description = "IP address Redmine should bind to.";
}; };
port = mkOption { port = lib.mkOption {
type = types.port; type = lib.types.port;
default = 3000; default = 3000;
description = "Port on which Redmine is ran."; description = "Port on which Redmine is ran.";
}; };
stateDir = mkOption { stateDir = lib.mkOption {
type = types.path; type = lib.types.path;
default = "/var/lib/redmine"; default = "/var/lib/redmine";
description = "The state directory, logs and plugins are stored here."; description = "The state directory, logs and plugins are stored here.";
}; };
settings = mkOption { settings = lib.mkOption {
type = format.type; type = format.type;
default = { }; default = { };
description = '' description = ''
@ -135,7 +122,7 @@ in
<https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration> <https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration>
for details. for details.
''; '';
example = literalExpression '' example = lib.literalExpression ''
{ {
email_delivery = { email_delivery = {
delivery_method = "smtp"; delivery_method = "smtp";
@ -148,8 +135,8 @@ in
''; '';
}; };
extraEnv = mkOption { extraEnv = lib.mkOption {
type = types.lines; type = lib.types.lines;
default = ""; default = "";
description = '' description = ''
Extra configuration in additional_environment.rb. Extra configuration in additional_environment.rb.
@ -162,11 +149,11 @@ in
''; '';
}; };
themes = mkOption { themes = lib.mkOption {
type = types.attrsOf types.path; type = lib.types.attrsOf lib.types.path;
default = { }; default = { };
description = "Set of themes."; description = "Set of themes.";
example = literalExpression '' example = lib.literalExpression ''
{ {
dkuk-redmine_alex_skin = builtins.fetchurl { dkuk-redmine_alex_skin = builtins.fetchurl {
url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip";
@ -176,11 +163,11 @@ in
''; '';
}; };
plugins = mkOption { plugins = lib.mkOption {
type = types.attrsOf types.path; type = lib.types.attrsOf lib.types.path;
default = { }; default = { };
description = "Set of plugins."; description = "Set of plugins.";
example = literalExpression '' example = lib.literalExpression ''
{ {
redmine_env_auth = builtins.fetchurl { redmine_env_auth = builtins.fetchurl {
url = "https://github.com/Intera/redmine_env_auth/archive/0.6.zip"; url = "https://github.com/Intera/redmine_env_auth/archive/0.6.zip";
@ -191,8 +178,8 @@ in
}; };
database = { database = {
type = mkOption { type = lib.mkOption {
type = types.enum [ type = lib.types.enum [
"mysql2" "mysql2"
"postgresql" "postgresql"
"sqlite3" "sqlite3"
@ -202,33 +189,33 @@ in
description = "Database engine to use."; description = "Database engine to use.";
}; };
host = mkOption { host = lib.mkOption {
type = types.str; type = lib.types.str;
default = "localhost"; default = "localhost";
description = "Database host address."; description = "Database host address.";
}; };
port = mkOption { port = lib.mkOption {
type = types.port; type = lib.types.port;
default = if cfg.database.type == "postgresql" then 5432 else 3306; default = if cfg.database.type == "postgresql" then 5432 else 3306;
defaultText = literalExpression "3306"; defaultText = lib.literalExpression "3306";
description = "Database host port."; description = "Database host port.";
}; };
name = mkOption { name = lib.mkOption {
type = types.str; type = lib.types.str;
default = "redmine"; default = "redmine";
description = "Database name."; description = "Database name.";
}; };
user = mkOption { user = lib.mkOption {
type = types.str; type = lib.types.str;
default = "redmine"; default = "redmine";
description = "Database user."; description = "Database user.";
}; };
passwordFile = mkOption { passwordFile = lib.mkOption {
type = types.nullOr types.path; type = lib.types.nullOr lib.types.path;
default = null; default = null;
example = "/run/keys/redmine-dbpassword"; example = "/run/keys/redmine-dbpassword";
description = '' description = ''
@ -237,8 +224,8 @@ in
''; '';
}; };
socket = mkOption { socket = lib.mkOption {
type = types.nullOr types.path; type = lib.types.nullOr lib.types.path;
default = default =
if mysqlLocal then if mysqlLocal then
"/run/mysqld/mysqld.sock" "/run/mysqld/mysqld.sock"
@ -246,63 +233,35 @@ in
"/run/postgresql" "/run/postgresql"
else else
null; null;
defaultText = literalExpression "/run/mysqld/mysqld.sock"; defaultText = lib.literalExpression "/run/mysqld/mysqld.sock";
example = "/run/mysqld/mysqld.sock"; example = "/run/mysqld/mysqld.sock";
description = "Path to the unix socket file to use for authentication."; description = "Path to the unix socket file to use for authentication.";
}; };
createLocally = mkOption { createLocally = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = "Create the database and database user locally."; description = "Create the database and database user locally.";
}; };
}; };
components = { components = {
subversion = mkOption { subversion = lib.mkEnableOption "Subversion integration.";
type = types.bool;
default = false;
description = "Subversion integration.";
};
mercurial = mkOption { mercurial = lib.mkEnableOption "Mercurial integration.";
type = types.bool;
default = false;
description = "Mercurial integration.";
};
git = mkOption { git = lib.mkEnableOption "git integration.";
type = types.bool;
default = false;
description = "git integration.";
};
cvs = mkOption { cvs = lib.mkEnableOption "cvs integration.";
type = types.bool;
default = false;
description = "cvs integration.";
};
breezy = mkOption { breezy = lib.mkEnableOption "bazaar integration.";
type = types.bool;
default = false;
description = "bazaar integration.";
};
imagemagick = mkOption { imagemagick = lib.mkEnableOption "exporting Gant diagrams as PNG.";
type = types.bool;
default = false;
description = "Allows exporting Gant diagrams as PNG.";
};
ghostscript = mkOption { ghostscript = lib.mkEnableOption "exporting Gant diagrams as PDF.";
type = types.bool;
default = false;
description = "Allows exporting Gant diagrams as PDF.";
};
minimagick_font_path = mkOption { minimagick_font_path = lib.mkOption {
type = types.str; type = lib.types.str;
default = ""; default = "";
description = "MiniMagick font path"; description = "MiniMagick font path";
example = "/run/current-system/sw/share/X11/fonts/LiberationSans-Regular.ttf"; example = "/run/current-system/sw/share/X11/fonts/LiberationSans-Regular.ttf";
@ -312,8 +271,7 @@ in
}; };
# implementation # implementation
config = mkIf cfg.enable { config = lib.mkIf cfg.enable {
assertions = [ assertions = [
{ {
assertion = assertion =
@ -345,25 +303,25 @@ in
services.redmine.settings = { services.redmine.settings = {
production = { production = {
scm_subversion_command = optionalString cfg.components.subversion "${pkgs.subversion}/bin/svn"; scm_subversion_command = lib.optionalString cfg.components.subversion "${pkgs.subversion}/bin/svn";
scm_mercurial_command = optionalString cfg.components.mercurial "${pkgs.mercurial}/bin/hg"; scm_mercurial_command = lib.optionalString cfg.components.mercurial "${pkgs.mercurial}/bin/hg";
scm_git_command = optionalString cfg.components.git "${pkgs.git}/bin/git"; scm_git_command = lib.optionalString cfg.components.git "${pkgs.git}/bin/git";
scm_cvs_command = optionalString cfg.components.cvs "${pkgs.cvs}/bin/cvs"; scm_cvs_command = lib.optionalString cfg.components.cvs "${pkgs.cvs}/bin/cvs";
scm_bazaar_command = optionalString cfg.components.breezy "${pkgs.breezy}/bin/bzr"; scm_bazaar_command = lib.optionalString cfg.components.breezy "${pkgs.breezy}/bin/bzr";
imagemagick_convert_command = optionalString cfg.components.imagemagick "${pkgs.imagemagick}/bin/convert"; imagemagick_convert_command = lib.optionalString cfg.components.imagemagick "${pkgs.imagemagick}/bin/convert";
gs_command = optionalString cfg.components.ghostscript "${pkgs.ghostscript}/bin/gs"; gs_command = lib.optionalString cfg.components.ghostscript "${pkgs.ghostscript}/bin/gs";
minimagick_font_path = "${cfg.components.minimagick_font_path}"; minimagick_font_path = "${cfg.components.minimagick_font_path}";
}; };
}; };
services.redmine.extraEnv = mkBefore '' services.redmine.extraEnv = lib.mkBefore ''
config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
config.logger.level = Logger::INFO config.logger.level = Logger::INFO
''; '';
services.mysql = mkIf mysqlLocal { services.mysql = lib.mkIf mysqlLocal {
enable = true; enable = true;
package = mkDefault pkgs.mariadb; package = lib.mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ]; ensureDatabases = [ cfg.database.name ];
ensureUsers = [ ensureUsers = [
{ {
@ -375,7 +333,7 @@ in
]; ];
}; };
services.postgresql = mkIf pgsqlLocal { services.postgresql = lib.mkIf pgsqlLocal {
enable = true; enable = true;
ensureDatabases = [ cfg.database.name ]; ensureDatabases = [ cfg.database.name ];
ensureUsers = [ ensureUsers = [
@ -415,8 +373,8 @@ in
systemd.services.redmine = { systemd.services.redmine = {
after = after =
[ "network.target" ] [ "network.target" ]
++ optional mysqlLocal "mysql.service" ++ lib.optional mysqlLocal "mysql.service"
++ optional pgsqlLocal "postgresql.service"; ++ lib.optional pgsqlLocal "postgresql.service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.RAILS_ENV = "production"; environment.RAILS_ENV = "production";
environment.RAILS_CACHE = "${cfg.stateDir}/cache"; environment.RAILS_CACHE = "${cfg.stateDir}/cache";
@ -426,13 +384,13 @@ in
with pkgs; with pkgs;
[ [
] ]
++ optional cfg.components.subversion subversion ++ lib.optional cfg.components.subversion subversion
++ optional cfg.components.mercurial mercurial ++ lib.optional cfg.components.mercurial mercurial
++ optional cfg.components.git git ++ lib.optional cfg.components.git git
++ optional cfg.components.cvs cvs ++ lib.optional cfg.components.cvs cvs
++ optional cfg.components.breezy breezy ++ lib.optional cfg.components.breezy breezy
++ optional cfg.components.imagemagick imagemagick ++ lib.optional cfg.components.imagemagick imagemagick
++ optional cfg.components.ghostscript ghostscript; ++ lib.optional cfg.components.ghostscript ghostscript;
preStart = '' preStart = ''
rm -rf "${cfg.stateDir}/plugins/"* rm -rf "${cfg.stateDir}/plugins/"*
@ -453,7 +411,7 @@ in
# link in all user specified themes # link in all user specified themes
for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do for theme in ${lib.concatStringsSep " " (lib.mapAttrsToList unpackTheme cfg.themes)}; do
ln -fs $theme/* "${cfg.stateDir}/themes" ln -fs $theme/* "${cfg.stateDir}/themes"
done done
@ -462,7 +420,7 @@ in
# link in all user specified plugins # link in all user specified plugins
for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do for plugin in ${lib.concatStringsSep " " (lib.mapAttrsToList unpackPlugin cfg.plugins)}; do
ln -fs $plugin/* "${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}" ln -fs $plugin/* "${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}"
done done
@ -470,7 +428,7 @@ in
# handle database.passwordFile & permissions # handle database.passwordFile & permissions
cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml" cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml"
${optionalString ((cfg.database.type != "sqlite3") && (cfg.database.passwordFile != null)) '' ${lib.optionalString ((cfg.database.type != "sqlite3") && (cfg.database.passwordFile != null)) ''
DBPASS="$(head -n1 ${cfg.database.passwordFile})" DBPASS="$(head -n1 ${cfg.database.passwordFile})"
sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml" sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml"
''} ''}
@ -527,10 +485,9 @@ in
SystemCallArchitectures = "native"; SystemCallArchitectures = "native";
UMask = 27; UMask = 27;
}; };
}; };
users.users = optionalAttrs (cfg.user == "redmine") { users.users = lib.optionalAttrs (cfg.user == "redmine") {
redmine = { redmine = {
group = cfg.group; group = cfg.group;
home = cfg.stateDir; home = cfg.stateDir;
@ -538,10 +495,9 @@ in
}; };
}; };
users.groups = optionalAttrs (cfg.group == "redmine") { users.groups = lib.optionalAttrs (cfg.group == "redmine") {
redmine.gid = config.ids.gids.redmine; redmine.gid = config.ids.gids.redmine;
}; };
}; };
meta.maintainers = with lib.maintainers; [ felixsinger ]; meta.maintainers = with lib.maintainers; [ felixsinger ];

View file

@ -406,14 +406,6 @@ in
''; '';
example = [ "alice@example.com" ]; example = [ "alice@example.com" ];
}; };
strip_email_domain = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether the domain part of the email address should be removed when generating namespaces.
'';
};
}; };
tls_letsencrypt_hostname = lib.mkOption { tls_letsencrypt_hostname = lib.mkOption {
@ -585,6 +577,11 @@ in
"dns_config" "dns_config"
"nameservers" "nameservers"
] "Use `dns.nameservers.global` instead.") ] "Use `dns.nameservers.global` instead.")
(assertRemovedOption [
"settings"
"oidc"
"strip_email_domain"
] "The strip_email_domain option got removed upstream")
]; ];
services.headscale.settings = lib.mkMerge [ services.headscale.settings = lib.mkMerge [

View file

@ -43,7 +43,10 @@ in
region_id = 999; region_id = 999;
stun_listen_addr = "0.0.0.0:${toString stunPort}"; stun_listen_addr = "0.0.0.0:${toString stunPort}";
}; };
dns.base_domain = "tailnet"; dns = {
base_domain = "tailnet";
override_local_dns = false;
};
}; };
}; };
nginx = { nginx = {
@ -77,7 +80,7 @@ in
# Create headscale user and preauth-key # Create headscale user and preauth-key
headscale.succeed("headscale users create test") headscale.succeed("headscale users create test")
authkey = headscale.succeed("headscale preauthkeys -u test create --reusable") authkey = headscale.succeed("headscale preauthkeys -u 1 create --reusable")
# Connect peers # Connect peers
up_cmd = f"tailscale up --login-server 'https://headscale' --auth-key {authkey}" up_cmd = f"tailscale up --login-server 'https://headscale' --auth-key {authkey}"

View file

@ -12,12 +12,12 @@
pkgs, pkgs,
}: }:
let let
version = "0.0.23-unstable-2025-05-20"; version = "0.0.23-unstable-2025-05-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yetone"; owner = "yetone";
repo = "avante.nvim"; repo = "avante.nvim";
rev = "87c4c6b4937d1884960759aba4a0e42645688f2f"; rev = "22418bff8bcac4377ebf975cd48f716823867979";
hash = "sha256-yDPu3bmOFeNdcD0o+nC6Cq1hij1A8ZoT5uipj7qf7cc="; hash = "sha256-qyeiDDjeReOr+TvgCWnKhb8FBN9t1YPFGvVqPvxXr0k=";
}; };
avante-nvim-lib = rustPlatform.buildRustPackage { avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib"; pname = "avante-nvim-lib";

View file

@ -6,13 +6,13 @@
}: }:
vimUtils.buildVimPlugin { vimUtils.buildVimPlugin {
pname = "clangd_extensions.nvim"; pname = "clangd_extensions.nvim";
version = "unstable-2024-10-05"; version = "0-unstable-2025-01-27";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~p00f"; owner = "~p00f";
repo = "clangd_extensions.nvim"; repo = "clangd_extensions.nvim";
rev = "8f7b72100883e0e34400d9518d40a03f21e4d0a6"; rev = "db28f29be928d18cbfb86fbfb9f83f584f658feb";
hash = "sha256-N2YPu2Oa5KBkL8GSp9Al+rxhtNgu7YtxtMuy5BIcnOY="; hash = "sha256-XdA638W0Zb85v5uAUNpvUiiQXGKOM2xykD2ClLk8Qpo=";
}; };
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };

View file

@ -7,26 +7,25 @@
vimUtils, vimUtils,
}: }:
let let
version = "2.2.3"; version = "2.2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vyfor"; owner = "vyfor";
repo = "cord.nvim"; repo = "cord.nvim";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-MhUjQxwATAGxIC8ACNDFDm249GzX4Npq3S+sHoUMuos="; hash = "sha256-SONErPOIaRltx51+GCsGtR0FDSWp/36x3lDbYLSMxXM=";
}; };
cord-server = rustPlatform.buildRustPackage { cord-server = rustPlatform.buildRustPackage {
pname = "cord"; pname = "cord";
version = "2.2.3"; inherit src version;
inherit src;
# The version in .github/server-version.txt differs from the one in Cargo.toml # The version in .github/server-version.txt differs from the one in Cargo.toml
postPatch = '' postPatch = ''
substituteInPlace .github/server-version.txt \ substituteInPlace .github/server-version.txt \
--replace-fail "2.0.0-beta.30" "${version}" --replace-fail "2.2.6" "${version}"
''; '';
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-hKt9d2u/tlD7bgo49O8oHDLljRvad9dEpGdFt+LH6Ec="; cargoHash = "sha256-14u3rhpDYNKZ4YLoGp6OPeeXDo3EzGYO3yhE9BkDSC0=";
# cord depends on nightly features # cord depends on nightly features
RUSTC_BOOTSTRAP = 1; RUSTC_BOOTSTRAP = 1;

View file

@ -6,13 +6,13 @@
}: }:
vimUtils.buildVimPlugin { vimUtils.buildVimPlugin {
pname = "hare.vim"; pname = "hare.vim";
version = "unstable-2025-01-23"; version = "0-unstable-2025-04-24";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~sircmpwn"; owner = "~sircmpwn";
repo = "hare.vim"; repo = "hare.vim";
rev = "1a732aca2931402f3186f52ae626540a770aefe2"; rev = "41b8b615f46a39d807a9a069039aac79c925c389";
hash = "sha256-wBeQvDm7ZTUcw21VIAryyH6tMuBiQCMOJRZX/8ic8B4="; hash = "sha256-GPFoQI6tipcLzkvjaeufmMrNnQM46lPas9D1SwzjKF4=";
}; };
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };

View file

@ -9,10 +9,10 @@
buildMozillaMach rec { buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "139.0"; version = "139.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "84a2b47f2ff71aac226a774ab0ac9ab8d9a16f5620a06f7abb6648732209d022aef35a9d4873e91ebd67a4fc494fc238524e25c38fad8046db26afda06e6f970"; sha512 = "78ae10fc14900eb1273b7ff798a159504f68166c39b1f12ef9ea04243debc78472c24499da01641590feb5d2b28475131d2ec94d6f28fd4f2f644a721f7f40ba";
}; };
meta = { meta = {

View file

@ -1,11 +1,11 @@
{ {
"packageVersion": "139.0-1", "packageVersion": "139.0.1-1",
"source": { "source": {
"rev": "139.0-1", "rev": "139.0.1-1",
"hash": "sha256-dhi9hUgEoOFQj7IixFKz1J81zo43h4MkAMpr2OIgass=" "hash": "sha256-3qMMu33y4MCPSUsFCMNd7CDEJjZJsfLdjPSFRC/obQg="
}, },
"firefox": { "firefox": {
"version": "139.0", "version": "139.0.1",
"hash": "sha512-hKK0fy/3GqwiandKsKyauNmhb1YgoG96u2ZIcyIJ0CKu81qdSHPpHr1npPxJT8I4Uk4lw4+tgEbbJq/aBub5cA==" "hash": "sha512-eK4Q/BSQDrEnO3/3mKFZUE9oFmw5sfEu+eoEJD3rx4RywkSZ2gFkFZD+tdKyhHUTHS7JTW8o/U8vZEpyH39Aug=="
} }
} }

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "helm-diff"; pname = "helm-diff";
version = "3.12.0"; version = "3.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "databus23"; owner = "databus23";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mEGW18oM75ikUhp3jsS6TefFhGi7AMjMpwyKsMe6qVc="; hash = "sha256-wI4D8C9NkI6fgNqleLTRFmj/g/8eTUGOQtMoh6+LKlQ=";
}; };
vendorHash = "sha256-8k45W6US0xVSPE/17mdz0izpkbvlGuP8lv8G6ycO6yQ="; vendorHash = "sha256-mGb3FsCNMsnG1+VE4ZplrJ1T9XHvi88c5HnYyqjdVXc=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -1,18 +1,18 @@
{ {
"airgap-images-amd64": { "airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "1c5efab645244d13cda7111a456aff796dfb4645c845df82266c4da56d3db2a7" "sha256": "35c11584d2fdc528a02c8ac9de083e94b7f8992002a8d6142d4725a533049ea1"
}, },
"airgap-images-arm": { "airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "df41354c497c8c2514b247c237415d721fb1381bb821c00af59526ba2ef1e8e8" "sha256": "a9ca95599c2c8240e0fffdcab81178912ffa02924ed3d42997604186fbf2f9ff"
}, },
"airgap-images-arm64": { "airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "041a626ab65e9f61bdc67e664649bc8dc434cc9f89da15611660967a1d156fa3" "sha256": "09ca4a9a1c1da1923538d7a2659b1166e2257d33a1478939ca28f6a08a048cf1"
}, },
"images-list": { "images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-images.txt", "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.13%2Bk3s1/k3s-images.txt",
"sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"
} }
} }

View file

@ -1,15 +1,15 @@
{ {
k3sVersion = "1.30.12+k3s1"; k3sVersion = "1.30.13+k3s1";
k3sCommit = "f9dbf16e17a6db90b64583316d9c321180e9c062"; k3sCommit = "e77f78ee94664d4d5ac34e2c4b8d438dac52c088";
k3sRepoSha256 = "0d0kbbf6c6gv2s0w8m7br6vxcid48g8hirmszksd3g4brix3yxz2"; k3sRepoSha256 = "0hy9pn9cdxixllj8zm4jq65jlrvihiysvhdmkxjgn82n3snhwrgq";
k3sVendorHash = "sha256-FQu2Chk463c+/VYcOhfU8xIxm/ZNe1GumkEH/u2DIt0="; k3sVendorHash = "sha256-2q9gWVCe3GhAF9YDMX4B9djz5/DliRHingJbXmTwmGE=";
chartVersions = import ./chart-versions.nix; chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1"; k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.6.0-k3s1"; k3sCNIVersion = "1.6.0-k3s1";
k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
containerdVersion = "1.7.26-k3s1"; containerdVersion = "1.7.27-k3s1";
containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz"; containerdSha256 = "1w6ia9a7qs06l9wh44fpf1v2ckf2lfp9sjzk0bg4fjw5ds9sxws0";
criCtlVersion = "1.29.0-k3s1"; criCtlVersion = "1.29.0-k3s1";
} }

View file

@ -1,18 +1,18 @@
{ {
"airgap-images-amd64": { "airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "b165c30ccff774f95019f70e200e59d3eea8a3b7fc63c64c07d839c1feb48357" "sha256": "939480f43b0214bfcc9fbd33cc73c810c1fded4e7ad16b204ac050277574ed9c"
}, },
"airgap-images-arm": { "airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "9adfe524ab0bb53d0753dc92759e7f2847e5ce75b88966544da16b5c37605da8" "sha256": "b9e90a490568705fac716b330316f1cea190a3bce6220487f539d6eddbc3dfaa"
}, },
"airgap-images-arm64": { "airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "26ab12d269a619df5d21464e6b1fa539b7c7b2f039737f656683d59eb71f83ac" "sha256": "9a31f65d02f9be290288351c01ae57cc16550ae16cbf8c95296ec15da2676dce"
}, },
"images-list": { "images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-images.txt", "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.9%2Bk3s1/k3s-images.txt",
"sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9"
} }
} }

View file

@ -1,15 +1,15 @@
{ {
k3sVersion = "1.31.8+k3s1"; k3sVersion = "1.31.9+k3s1";
k3sCommit = "33429f764d560f617c049e4ebb323c00963419c0"; k3sCommit = "812206503b2874c703dcc93c5d6baa5ffc745930";
k3sRepoSha256 = "0dpp3gi2g4qqi0szz53j9z06bcgkdzh3c64651d8zjjj151rmhwv"; k3sRepoSha256 = "0cknigj3cx5ndh5n15nymzmr8xgsr7is5hbi923n6h2q5bjm12q4";
k3sVendorHash = "sha256-vQQGJOFNO2rCJ/UWxWYgH617DctCmTF6eqH7Yq5T+2Q="; k3sVendorHash = "sha256-ojzoxqtVYSmw5gZk+0W4V5ImRcXX451QauIFNR9j9eY=";
chartVersions = import ./chart-versions.nix; chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1"; k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.6.0-k3s1"; k3sCNIVersion = "1.6.0-k3s1";
k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
containerdVersion = "2.0.4-k3s2"; containerdVersion = "2.0.5-k3s1.32";
containerdSha256 = "0v34nh6q0plb50s95gzdkrdfbbch7dps15fmddh5h241yfms8sq6"; containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
criCtlVersion = "1.31.0-k3s2"; criCtlVersion = "1.31.0-k3s2";
} }

View file

@ -1,18 +1,18 @@
{ {
"airgap-images-amd64": { "airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "2c27bf09b90459947dff497ca5028adefa8f8f3d2ae96a3164c11b8a5ed3bb86" "sha256": "ac1f278f1b006851d95cd3236e9b909264872e9f6b5ffcf90d28198c6f2e913c"
}, },
"airgap-images-arm": { "airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "5a3b7228988bfe725b6bfca0a8cf357dc4fe474ea910663a29d2fe58ab8065c9" "sha256": "c87b652cc8469019668ba5481e00b0d253e7d582e6139cb3a086b01682329f5e"
}, },
"airgap-images-arm64": { "airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "3b9131e8f51b9e8b9c1a1ceb5e51ebc245959aa50446def1a4323cf9340dfe0c" "sha256": "c7ebe524d0d596ff9b45695770cbd76f8fd672236c563da947ca5cb2d0a64aad"
}, },
"images-list": { "images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-images.txt", "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.5%2Bk3s1/k3s-images.txt",
"sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a" "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a"
} }
} }

View file

@ -1,15 +1,15 @@
{ {
k3sVersion = "1.32.4+k3s1"; k3sVersion = "1.32.5+k3s1";
k3sCommit = "6b330558e47a257134434508c851193bb4e9bf9d"; k3sCommit = "8e8f2a4726fdb4ca628eb62b2a526b64d0e6a763";
k3sRepoSha256 = "1ss7w5b5k7hjd9szx7p7cqvdqddb71iddqsf6dxkk9r1g5z7sbs5"; k3sRepoSha256 = "02qsw00f0k0kv93xws96np3fj3rdynnhjhk41a58kic1mnbgm8ss";
k3sVendorHash = "sha256-e7uLDjCR/q04HwOHTb1E5gGiwKDN2Hbxmym7qJxfpWU="; k3sVendorHash = "sha256-BZs3tgUtcLw1mqaAyOCwg6bhmeQbUGCE9wsbPSG61t4=";
chartVersions = import ./chart-versions.nix; chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1"; k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.6.0-k3s1"; k3sCNIVersion = "1.6.0-k3s1";
k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
containerdVersion = "2.0.4-k3s2"; containerdVersion = "2.0.5-k3s1.32";
containerdSha256 = "0v34nh6q0plb50s95gzdkrdfbbch7dps15fmddh5h241yfms8sq6"; containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
criCtlVersion = "1.31.0-k3s2"; criCtlVersion = "1.31.0-k3s2";
} }

View file

@ -90,13 +90,13 @@
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c=" "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
}, },
"auth0": { "auth0": {
"hash": "sha256-T8Ob7wv/GgAR+5/AoD0SJ0k+xRvpK5lTWKrhJkme2wg=", "hash": "sha256-85U2EFC8defpag89zssO4nd5JovdwkyyobgH1t85/jY=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0", "homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0", "owner": "auth0",
"repo": "terraform-provider-auth0", "repo": "terraform-provider-auth0",
"rev": "v1.19.1", "rev": "v1.20.1",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-8jUEFJz2m8orL4n/w+c+hzwiQJkZia9TpVfYhkgyrrY=" "vendorHash": "sha256-eMnWzin7lTMHQ0NEvt8KiMqJz+ihxKBwXniAyWkkqd0="
}, },
"avi": { "avi": {
"hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=", "hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",
@ -732,13 +732,13 @@
"vendorHash": "sha256-slDHNiH5CTfzzj1y2BOt8JuL2iBS1irSZBIiP/4QDLE=" "vendorHash": "sha256-slDHNiH5CTfzzj1y2BOt8JuL2iBS1irSZBIiP/4QDLE="
}, },
"launchdarkly": { "launchdarkly": {
"hash": "sha256-Gr0E150u2NvAJ6QR+KrxwM19nuhevDXnPVS12MPP8fI=", "hash": "sha256-VL0nijqk61EBKLEHW54a3dH/PE5B+9VRoGJ36TJj7ps=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly", "owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly", "repo": "terraform-provider-launchdarkly",
"rev": "v2.25.0", "rev": "v2.25.1",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-UngIdL0pIFljzX39k3ObVnE0MG1NWM3vKIyKgqClEXk=" "vendorHash": "sha256-sWqPfWkDpSajC6xlw5llW3HXUlwPWwF9t8UHh0mf4Hc="
}, },
"libvirt": { "libvirt": {
"hash": "sha256-6wG6J6SQGxR74gbGZlW5/8zgIqsBUo0Xg/gN0wNppSg=", "hash": "sha256-6wG6J6SQGxR74gbGZlW5/8zgIqsBUo0Xg/gN0wNppSg=",
@ -994,11 +994,11 @@
"vendorHash": null "vendorHash": null
}, },
"ovh": { "ovh": {
"hash": "sha256-KNA/4m7zom8+19JgfwgjIkD3rA9Co8AHI6nviyQOntU=", "hash": "sha256-DTMVVBvQZijVtbrIrYBvQ5appk4lp5jXKMNTkc3ttHw=",
"homepage": "https://registry.terraform.io/providers/ovh/ovh", "homepage": "https://registry.terraform.io/providers/ovh/ovh",
"owner": "ovh", "owner": "ovh",
"repo": "terraform-provider-ovh", "repo": "terraform-provider-ovh",
"rev": "v2.2.0", "rev": "v2.3.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },

View file

@ -10,13 +10,13 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "youtube"; pname = "youtube";
namespace = "plugin.video.youtube"; namespace = "plugin.video.youtube";
version = "7.2.0.1"; version = "7.2.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anxdpanic"; owner = "anxdpanic";
repo = "plugin.video.youtube"; repo = "plugin.video.youtube";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6CT/35jV1cmXPlJBKb7Sm8Hkurmybx163864vP20Ijw="; hash = "sha256-Igw4F/6+Ewrxsz1RI4csYsHmB12bkbW+764fQvqCx+0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -17,14 +17,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "abuild"; pname = "abuild";
version = "3.14.1"; version = "3.15.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.alpinelinux.org"; domain = "gitlab.alpinelinux.org";
owner = "alpine"; owner = "alpine";
repo = "abuild"; repo = "abuild";
rev = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-gNmje4USaklwmsVGs4NMFoharEk2syCmDdQ/SCSMKsI="; hash = "sha256-vHRh36igfb6WZ8JdtxW8OOqgiVBAXreTy+QOOKaWEwA=";
}; };
buildInputs = [ buildInputs = [

File diff suppressed because it is too large Load diff

View file

@ -24,12 +24,8 @@ let
rustPlatform.bindgenHook rustPlatform.bindgenHook
]; ];
cargoLock = { useFetchCargoVendor = true;
lockFile = ./Cargo.lock; cargoHash = "sha256-tD35Py81QLDVlBahYzgskOQK5lQW03xuCnUwVUi4oLU=";
outputHashes = {
"amazon-qldb-driver-0.1.0" = "sha256-az0rANBcryHHnpGWvo15TGGW4KMUULZHaj5msIHts14=";
};
};
passthru.tests.version = testers.testVersion { inherit package; }; passthru.tests.version = testers.testVersion { inherit package; };

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ANTs"; pname = "ANTs";
version = "2.6.0"; version = "2.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ANTsX"; owner = "ANTsX";
repo = "ANTs"; repo = "ANTs";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-3k9EOylOAUwxBNpzi6U/XZGarCZlbh9PdecKyJh81Yk="; hash = "sha256-H/5X6cCjv+7KuZGJ7D4d5VxlpOqbO80U+7CoYnY/dsU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -7,7 +7,7 @@ buildGoModule {
pname = "authentik-ldap-outpost"; pname = "authentik-ldap-outpost";
inherit (authentik) version src; inherit (authentik) version src;
vendorHash = "sha256-aG/VqpmHJeGyF98aS0jgwEAq1R5c8VggeJxLWS9W8HY="; vendorHash = "sha256-cEB22KFDONcJBq/FvLpYKN7Zd06mh8SACvCSuj5i4fI=";
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;

View file

@ -16,13 +16,13 @@
}: }:
let let
version = "2025.2.3"; version = "2025.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goauthentik"; owner = "goauthentik";
repo = "authentik"; repo = "authentik";
rev = "version/${version}"; rev = "version/${version}";
hash = "sha256-aaSAlFIc5Gn5PJPVuObi24Y86/3N3yFJVQTx1tV2i2A="; hash = "sha256-idShMSYIrf3ViG9VFNGNu6TSjBz3Q+GJMMeCzcJwfG4=";
}; };
meta = with lib; { meta = with lib; {
@ -45,7 +45,7 @@ let
sourceRoot = "source/website"; sourceRoot = "source/website";
outputHash = "sha256-lPpphGi8l2X/fR9YoJv37piAe82oqSLAKHze8oTrGNc="; outputHash = "sha256-AnQpjCoCTzm28Wl/t3YHx0Kl0CuMHL2OgRjRB1Trrsw=";
outputHashMode = "recursive"; outputHashMode = "recursive";
nativeBuildInputs = [ nativeBuildInputs = [
@ -55,7 +55,7 @@ let
buildPhase = '' buildPhase = ''
npm ci --cache ./cache npm ci --cache ./cache
rm -r ./cache node_modules/@parcel/watcher-linux-* node_modules/.package-lock.json rm -r ./cache node_modules/.package-lock.json
''; '';
installPhase = '' installPhase = ''
@ -131,7 +131,7 @@ let
ln -s ${src}/website $out/ ln -s ${src}/website $out/
ln -s ${clientapi} $out/web/node_modules/@goauthentik/api ln -s ${clientapi} $out/web/node_modules/@goauthentik/api
''; '';
npmDepsHash = "sha256-uVur1DyXaIGPny7u/JQyx9HQ7VJqeSi2pPSORZgLjEw="; npmDepsHash = "sha256-i95sH+KUgAQ76cv1+7AE/UA6jsReQMttDGWClNE2Ol4=";
postPatch = '' postPatch = ''
cd web cd web
@ -159,28 +159,31 @@ let
python = python312.override { python = python312.override {
self = python; self = python;
packageOverrides = final: prev: { packageOverrides = final: prev: {
django = final.django_5;
django-tenants = prev.django-tenants.overrideAttrs { django-tenants = prev.django-tenants.overrideAttrs {
version = "3.6.1-unstable-2024-01-11"; version = "3.7.0-unstable-2025-03-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rissson"; owner = "rissson";
repo = "django-tenants"; repo = "django-tenants";
rev = "a7f37c53f62f355a00142473ff1e3451bb794eca"; rev = "156e53a6f5902d74b73dd9d0192fffaa2587a740";
hash = "sha256-YBT0kcCfETXZe0j7/f1YipNIuRrcppRVh1ecFS3cvNo="; hash = "sha256-xmhfPgCmcFr5axVV65fCq/AcV8ApRVvFVEpq3cQSVqo=";
}; };
}; };
# Use 3.14.0 until https://github.com/encode/django-rest-framework/issues/9358 is fixed.
# Otherwise applying blueprints/default/default-brand.yaml fails with: # Running authentik currently requires a custom version.
# authentik.flows.models.RelatedObjectDoesNotExist: FlowStageBinding has no target. # Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section.
djangorestframework = prev.buildPythonPackage rec { # See https://github.com/goauthentik/authentik/pull/14057 for latest version bump.
djangorestframework = prev.buildPythonPackage {
pname = "djangorestframework"; pname = "djangorestframework";
version = "3.14.0"; version = "3.16.0";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "encode"; owner = "authentik-community";
repo = "django-rest-framework"; repo = "django-rest-framework";
rev = version; rev = "896722bab969fabc74a08b827da59409cf9f1a4e";
hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; hash = "sha256-YrEDEU3qtw/iyQM3CoB8wYx57zuPNXiJx6ZjrIwnCNU=";
}; };
propagatedBuildInputs = with final; [ propagatedBuildInputs = with final; [
@ -195,10 +198,19 @@ let
# optional tests # optional tests
coreapi coreapi
django-guardian django-guardian
inflection
pyyaml pyyaml
uritemplate uritemplate
]; ];
disabledTests = [
"test_ignore_validation_for_unchanged_fields"
"test_invalid_inputs"
"test_shell_code_example_rendering"
"test_unique_together_condition"
"test_unique_together_with_source"
];
pythonImportsCheck = [ "rest_framework" ]; pythonImportsCheck = [ "rest_framework" ];
}; };
@ -215,14 +227,19 @@ let
--replace-fail '/blueprints' "$out/blueprints" \ --replace-fail '/blueprints' "$out/blueprints" \
--replace-fail './media' '/var/lib/authentik/media' --replace-fail './media' '/var/lib/authentik/media'
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace-fail 'dumb-init = "*"' "" \ --replace-fail '"dumb-init",' "" \
--replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2' --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2'
substituteInPlace authentik/stages/email/utils.py \ substituteInPlace authentik/stages/email/utils.py \
--replace-fail 'web/' '${webui}/' --replace-fail 'web/' '${webui}/'
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
prev.poetry-core prev.hatchling
prev.pythonRelaxDepsHook
];
pythonRelaxDeps = [
"xmlsec"
]; ];
propagatedBuildInputs = propagatedBuildInputs =
@ -298,6 +315,7 @@ let
++ django-storages.optional-dependencies.s3 ++ django-storages.optional-dependencies.s3
++ opencontainers.optional-dependencies.reggie ++ opencontainers.optional-dependencies.reggie
++ psycopg.optional-dependencies.c ++ psycopg.optional-dependencies.c
++ psycopg.optional-dependencies.pool
++ uvicorn.optional-dependencies.standard; ++ uvicorn.optional-dependencies.standard;
postInstall = '' postInstall = ''
@ -330,7 +348,7 @@ let
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;
vendorHash = "sha256-aG/VqpmHJeGyF98aS0jgwEAq1R5c8VggeJxLWS9W8HY="; vendorHash = "sha256-cEB22KFDONcJBq/FvLpYKN7Zd06mh8SACvCSuj5i4fI=";
postInstall = '' postInstall = ''
mv $out/bin/server $out/bin/authentik mv $out/bin/server $out/bin/authentik

View file

@ -7,7 +7,7 @@ buildGoModule {
pname = "authentik-proxy-outpost"; pname = "authentik-proxy-outpost";
inherit (authentik) version src; inherit (authentik) version src;
vendorHash = "sha256-aG/VqpmHJeGyF98aS0jgwEAq1R5c8VggeJxLWS9W8HY="; vendorHash = "sha256-cEB22KFDONcJBq/FvLpYKN7Zd06mh8SACvCSuj5i4fI=";
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;

View file

@ -7,7 +7,7 @@ buildGoModule {
pname = "authentik-radius-outpost"; pname = "authentik-radius-outpost";
inherit (authentik) version src; inherit (authentik) version src;
vendorHash = "sha256-aG/VqpmHJeGyF98aS0jgwEAq1R5c8VggeJxLWS9W8HY="; vendorHash = "sha256-cEB22KFDONcJBq/FvLpYKN7Zd06mh8SACvCSuj5i4fI=";
env.CGO_ENABLED = 0; env.CGO_ENABLED = 0;

View file

@ -25,14 +25,14 @@ in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "awsebcli"; pname = "awsebcli";
version = "3.24"; version = "3.24.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "aws-elastic-beanstalk-cli"; repo = "aws-elastic-beanstalk-cli";
tag = version; tag = version;
hash = "sha256-i1CcOlrrtizvQMXKoj5xQYlmaTB8JWb4X5S+EcnQXps="; hash = "sha256-t6dqiC9zY3Apcc4F/x5c/QhsNKGBZxIY20a50wCEER8=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
@ -47,6 +47,7 @@ python.pkgs.buildPythonApplication rec {
]; ];
dependencies = with python.pkgs; [ dependencies = with python.pkgs; [
packaging
blessed blessed
botocore botocore
cement cement

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "azurehound"; pname = "azurehound";
version = "2.4.1"; version = "2.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SpecterOps"; owner = "SpecterOps";
repo = "AzureHound"; repo = "AzureHound";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-hLIXgb0LJs5INB23V3m33OViANarJodbwZewdx91css="; hash = "sha256-Lusztzy5I91CzyPUSncqQLcth3Q34HS2XmLGQTRIbHc=";
}; };
vendorHash = "sha256-FG3207OTzkMEoSvQsTH7Ky9T3ur7glG7k0ERfd12SO0="; vendorHash = "sha256-z4ByWhvMFKDE5EUklbm1cuFFvY59n0RiQBB4E58E2xs=";
nativeInstallCheckInputs = [ versionCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ];

View file

@ -16,17 +16,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "broot"; pname = "broot";
version = "1.46.4"; version = "1.46.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Canop"; owner = "Canop";
repo = "broot"; repo = "broot";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-YoTR/rj/edg2KQhPRoihA38V4XM5EM5oJtLIH6zR/38="; hash = "sha256-ySW7bEM74D83Id1Jp5UBEjqJROjwcoHrDY8wbgEVCGM=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-IFDKHsBTJFEmQ6FUG7yJmAEAVrzMvY9qbWQTnvUg274="; cargoHash = "sha256-rSX+DdvqqThCxA1ONAYQbhWrdYDQHOMiXURqd+KSw64=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -13,13 +13,13 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bt-migrate"; pname = "bt-migrate";
version = "0-unstable-2023-08-17"; version = "0-unstable-2025-05-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mikedld"; owner = "mikedld";
repo = "bt-migrate"; repo = "bt-migrate";
rev = "e15a489c0c76f98355586ebbee08223af4e9bf50"; rev = "eb5b0ba5e0176844efde3a319595f52ffe900c2c";
hash = "sha256-kA6yxhbIh3ThmgF8Zyoe3I79giLVmdNr9IIrw5Xx4s0="; hash = "sha256-eg7rZnqpQiOA1N7GHv14eDAmvmj6VWq/dlw2YBw6IAA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -54,13 +54,12 @@ stdenv.mkDerivation {
strictDeps = true; strictDeps = true;
meta = with lib; { meta = {
description = "Torrent state migration tool"; description = "Torrent state migration tool";
homepage = "https://github.com/mikedld/bt-migrate?tab=readme-ov-file"; homepage = "https://github.com/mikedld/bt-migrate?tab=readme-ov-file";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = with maintainers; [ ambroisie ]; maintainers = with lib.maintainers; [ ambroisie ];
mainProgram = "BtMigrate"; mainProgram = "BtMigrate";
platforms = platforms.all; platforms = lib.platforms.all;
broken = true; # https://github.com/mikedld/bt-migrate/issues/26
}; };
} }

View file

@ -15,29 +15,29 @@
moreutils, moreutils,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage (finalAttrs: {
pname = "cinny-desktop"; pname = "cinny-desktop";
# We have to be using the same version as cinny-web or this isn't going to work. # We have to be using the same version as cinny-web or this isn't going to work.
version = "4.7.0"; version = "4.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cinnyapp"; owner = "cinnyapp";
repo = "cinny-desktop"; repo = "cinny-desktop";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U="; hash = "sha256-cixpsn0jMufd6VrBCsCH9t3bpkKdgi1i0qnkBlLgLG0=";
}; };
sourceRoot = "${src.name}/src-tauri"; sourceRoot = "${finalAttrs.src.name}/src-tauri";
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no="; cargoHash = "sha256-twfRuoA4z+Xgyyn7aIRy6MV1ozN2+qhSLh8i+qOTa2Q=";
postPatch = postPatch =
let let
cinny' = cinny' =
assert lib.assertMsg ( assert lib.assertMsg (
cinny.version == version cinny.version == finalAttrs.version
) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})";
cinny.override { cinny.override {
conf = { conf = {
hashRouter.enabled = true; hashRouter.enabled = true;
@ -95,4 +95,4 @@ rustPlatform.buildRustPackage rec {
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "cinny"; mainProgram = "cinny";
}; };
} })

View file

@ -13,16 +13,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "cinny-unwrapped"; pname = "cinny-unwrapped";
version = "4.7.0"; version = "4.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cinnyapp"; owner = "cinnyapp";
repo = "cinny"; repo = "cinny";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8="; hash = "sha256-yM+P7KXT/cspKt2l4+COoH68jCJUSs2TrfJGZHF/lYY=";
}; };
npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q="; npmDepsHash = "sha256-RWc8nSh/HuXUokU2RZnmwYUCfBxpL9Wp1Sgi2l1CN38=";
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3

View file

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "clickhouse-backup"; pname = "clickhouse-backup";
version = "2.6.18"; version = "2.6.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Altinity"; owner = "Altinity";
repo = "clickhouse-backup"; repo = "clickhouse-backup";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-NB3X/lwLsq6C+jZ7Tfq2HbMcqpNiD2bpoJcwXCKdsfw="; hash = "sha256-d5MQFwN+M8T6fQu0fPjMU4TyE+/DK2on/SwS3sSl0fY=";
}; };
vendorHash = "sha256-tgDNKujpmDk6wcP9jEwfSbRWzJqiPs7aAWkkaD195Ss="; vendorHash = "sha256-tgDNKujpmDk6wcP9jEwfSbRWzJqiPs7aAWkkaD195Ss=";

View file

@ -1,62 +1,4 @@
{ {
lib, python3Packages,
git,
python3,
fetchFromGitHub,
}: }:
python3Packages.toPythonApplication python3Packages.copier
python3.pkgs.buildPythonApplication rec {
pname = "copier";
version = "9.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "copier-org";
repo = "copier";
tag = "v${version}";
# Conflict on APFS on darwin
postFetch = ''
rm $out/tests/demo/doc/ma*ana.txt
'';
hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o=";
};
POETRY_DYNAMIC_VERSIONING_BYPASS = version;
build-system = with python3.pkgs; [
poetry-core
poetry-dynamic-versioning
];
dependencies = with python3.pkgs; [
colorama
decorator
dunamai
funcy
iteration-utilities
jinja2
jinja2-ansible-filters
mkdocs-material
mkdocs-mermaid2-plugin
mkdocstrings
packaging
pathspec
plumbum
pydantic
pygments
pyyaml
pyyaml-include
questionary
];
makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ git ]}" ];
meta = {
description = "Library and command-line utility for rendering projects templates";
homepage = "https://copier.readthedocs.io";
changelog = "https://github.com/copier-org/copier/blob/v${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ greg ];
mainProgram = "copier";
};
}

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "coroot-node-agent"; pname = "coroot-node-agent";
version = "1.23.23"; version = "1.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coroot"; owner = "coroot";
repo = "coroot-node-agent"; repo = "coroot-node-agent";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LLRAKmtHDsYzo17NW2/fkUu7z4dr3OlXe/QyUDypQOM="; hash = "sha256-48bKV1z5D8FhRIm5cl5PcJ2pVGux6sV985Hk855B8Ng=";
}; };
vendorHash = "sha256-11gj+s1fG6uOUTiezNk+/eS4g/bdth09Gl5jcOa9joo="; vendorHash = "sha256-wOR0xdI+5oP+wZwyXKgWHQyUVMNH7yRk1h1m4vCEXTs=";
buildInputs = [ systemdLibs ]; buildInputs = [ systemdLibs ];

View file

@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cyme"; pname = "cyme";
version = "2.2.0"; version = "2.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tuna-f1sh"; owner = "tuna-f1sh";
repo = "cyme"; repo = "cyme";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-asg8ATzM2cwh+crnzqjWMsee1I9BPm9an8d3lzj6yS4="; hash = "sha256-oOr7LYQfA/ZtC1Up4/dAHFdtWAM+8J+OPiHIOtVLQxY=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-DFAlFEJfR6jUplQ50AK4SszdBIw0jbxFRgYNHg3sN8c="; cargoHash = "sha256-PaX2Eod/5eCZFzMzkLovhE/TpQqNyhqCHaF1LiRxndg=";
nativeBuildInputs = nativeBuildInputs =
[ [

View file

@ -1,44 +1,31 @@
{ {
lib,
stdenv,
buildGoModule, buildGoModule,
dependabot-cli, dependabot-cli,
dockerTools, dockerTools,
fetchFromGitHub, fetchFromGitHub,
installShellFiles, installShellFiles,
lib,
makeWrapper, makeWrapper,
symlinkJoin, symlinkJoin,
testers, testers,
}: }:
let let
pname = "dependabot-cli"; pname = "dependabot-cli";
version = "1.64.0"; version = "1.65.0";
# vv Also update this vv # `tag` is what `dependabot` uses to find the relevant docker images.
tag = "nixpkgs-dependabot-cli-${version}"; tag = "nixpkgs-dependabot-cli-${version}";
updateJobProxy = dockerTools.pullImage { # Get these hashes from
imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy"; # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
# Get these hashes from updateJobProxy.imageDigest = "sha256:ef245bd38aaa3cf89cafcffe0630d3ad3cff840488a2051a48517454e7f42368";
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} updateJobProxy.hash = "sha256-yndoGLpyV2MiIs0QXbF/W0xJ6jtmnw/ezL54VM80/CI=";
imageDigest = "sha256:3030ba5ff8f556e47016fca94d81c677b5c6abde99fef228341e1537588e503a";
hash = "sha256-RiXUae5ONScoDu85L6BEf3T4JodBYha6v+d9kWl8oWc=";
# Don't update this, it's used to refer to the imported image later # Get these hashes from
finalImageName = "dependabot-update-job-proxy"; # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
finalImageTag = tag; updaterGitHubActions.imageDigest = "sha256:adeaa00b4ae49e942adccec76d4487a393eebd0dec27cd75a3cdf6cc46d801d7";
}; updaterGitHubActions.hash = "sha256-ni9rSEpeo0gIdYy2CIIpnIWg0kttoTnvRwbZ71QwmIg=";
updaterGitHubActions = dockerTools.pullImage {
imageName = "ghcr.io/dependabot/dependabot-updater-github-actions";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
imageDigest = "sha256:a356576adbec11bc34b142b6ef69a5856a09dc3654bdc9f9b046c08ee2d73ff8";
hash = "sha256-zqydb2v39xiSBT5ayWEacD0NIH6LoFX8lkRcCKppH08=";
# Don't update this, it's used to refer to the imported image later
finalImageName = "dependabot-updater-github-actions";
finalImageTag = tag;
};
in in
buildGoModule { buildGoModule {
inherit pname version; inherit pname version;
@ -47,7 +34,7 @@ buildGoModule {
owner = "dependabot"; owner = "dependabot";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-NcmDYCXdhMY1KFz3if0XlX4EisQFr0YhJItllXnOfaA="; hash = "sha256-A7CPn0YDeyr+d1OUde2TGfSt3eCfrK4k3S7NWsvCGx0=";
}; };
vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo="; vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo=";
@ -63,7 +50,7 @@ buildGoModule {
installShellFiles installShellFiles
]; ];
postInstall = '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd dependabot \ installShellCompletion --cmd dependabot \
--bash <($out/bin/dependabot completion bash) \ --bash <($out/bin/dependabot completion bash) \
--fish <($out/bin/dependabot completion fish) \ --fish <($out/bin/dependabot completion fish) \
@ -79,18 +66,36 @@ buildGoModule {
$out/bin/dependabot --help $out/bin/dependabot --help
''; '';
passthru.updateScript = ./update.sh;
passthru.withDockerImages = symlinkJoin { passthru.withDockerImages = symlinkJoin {
name = "dependabot-cli-with-docker-images"; name = "dependabot-cli-with-docker-images";
paths = [ dependabot-cli ]; paths = [ dependabot-cli ];
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
postBuild = '' postBuild =
# Create a wrapper that pins the docker images that are depended upon let
wrapProgram $out/bin/dependabot \ updateJobProxyImage = dockerTools.pullImage {
--run "docker load --input ${updateJobProxy} >&2" \ imageName = "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy";
--add-flags "--proxy-image=dependabot-update-job-proxy:${tag}" \ finalImageName = "dependabot-update-job-proxy";
--run "docker load --input ${updaterGitHubActions} >&2" \ finalImageTag = tag;
--add-flags "--updater-image=dependabot-updater-github-actions:${tag}" inherit (updateJobProxy) imageDigest hash;
''; };
updaterGitHubActionsImage = dockerTools.pullImage {
imageName = "ghcr.io/dependabot/dependabot-updater-github-actions";
finalImageName = "dependabot-updater-github-actions";
finalImageTag = tag;
inherit (updaterGitHubActions) imageDigest hash;
};
in
''
# Create a wrapper that pins the docker images that `dependabot` uses.
wrapProgram $out/bin/dependabot \
--run "docker load --input ${updateJobProxyImage} >&2" \
--add-flags "--proxy-image=dependabot-update-job-proxy:${tag}" \
--run "docker load --input ${updaterGitHubActionsImage} >&2" \
--add-flags "--updater-image=dependabot-updater-github-actions:${tag}"
'';
}; };
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
@ -99,14 +104,15 @@ buildGoModule {
version = "v${version}"; version = "v${version}";
}; };
meta = with lib; { meta = {
changelog = "https://github.com/dependabot/cli/releases/tag/v${version}"; changelog = "https://github.com/dependabot/cli/releases/tag/v${version}";
description = "Tool for testing and debugging Dependabot update jobs"; description = "Tool for testing and debugging Dependabot update jobs";
mainProgram = "dependabot"; mainProgram = "dependabot";
homepage = "https://github.com/dependabot/cli"; homepage = "https://github.com/dependabot/cli";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
infinisil infinisil
philiptaron
]; ];
}; };
} }

View file

@ -0,0 +1,48 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep gnused jq gh nix-prefetch-docker nix gitMinimal
set -x -eu -o pipefail
cd $(dirname "${BASH_SOURCE[0]}")
NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
temp_dir=$(mktemp -d)
trap 'rm -rf "$temp_dir"' EXIT
gh api repos/dependabot/cli/releases/latest > "$temp_dir/latest.json"
VERSION="$(jq -r .tag_name "$temp_dir/latest.json" | sed 's/^v//')"
OLD_VERSION="$(grep -m1 'version = "' ./package.nix | cut -d'"' -f2)"
if [ "$OLD_VERSION" = "$VERSION" ]; then
echo "dependabot is already up-to-date at $OLD_VERSION"
exit 0
fi
SHA256="$(nix-prefetch-url --quiet --unpack https://github.com/dependabot/cli/archive/refs/tags/v${VERSION}.tar.gz)"
HASH="$(nix hash convert --hash-algo sha256 --to sri "$SHA256")"
nix-prefetch-docker --json --quiet --final-image-name dependabot-update-job-proxy --final-image-tag "nixpkgs-dependabot-cli-$VERSION" ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy latest > "$temp_dir/dependabot-update-job-proxy.json"
nix-prefetch-docker --json --quiet --final-image-name dependabot-updater-github-actions --final-image-tag "nixpkgs-dependabot-cli-$VERSION" ghcr.io/dependabot/dependabot-updater-github-actions latest > "$temp_dir/dependabot-updater-github-actions.json"
setKV () {
sed -i "s,$1 = \"[^v].*\",$1 = \"${2:-}\"," ./package.nix
}
setKV version "${VERSION}"
setKV hash "${HASH}"
setKV updateJobProxy.imageDigest "$(jq -r .imageDigest "$temp_dir/dependabot-update-job-proxy.json")"
setKV updateJobProxy.hash "$(jq -r .hash "$temp_dir/dependabot-update-job-proxy.json")"
setKV updaterGitHubActions.imageDigest "$(jq -r .imageDigest "$temp_dir/dependabot-updater-github-actions.json")"
setKV updaterGitHubActions.hash "$(jq -r .hash "$temp_dir/dependabot-updater-github-actions.json")"
# We need to figure out the vendorHash for this new version, so we initially set it to `lib.fakeHash`
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
setKV vendorHash "$FAKE_HASH"
set +e
VENDOR_HASH="$(nix-build --no-out-link --log-format internal-json -A dependabot-cli "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "$FAKE_HASH" | grep -o "sha256-[^\\]*" | tail -1)"
set -e
setKV vendorHash "$VENDOR_HASH"

View file

@ -17,13 +17,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "diffuse"; pname = "diffuse";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MightyCreak"; owner = "MightyCreak";
repo = "diffuse"; repo = "diffuse";
rev = "v${version}"; rev = "v${version}";
sha256 = "6GdUtdVhhIQL1cD9/e7Byv37PVKXmzVWhJC6GROK7OA="; sha256 = "Svt+llBwJKGXRJZ96dzzdzpL/5jrzXXM/FPZwA7Es8s=";
}; };
format = "other"; format = "other";

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dnsdist"; pname = "dnsdist";
version = "1.9.9"; version = "1.9.10";
src = fetchurl { src = fetchurl {
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
hash = "sha256-6GvGNtTS3IusGA7Iza+/5fNSKbYAXsFddRD7b1i0n1o="; hash = "sha256-An3b3uaVxaWXKAV7/EHFsaaR+hx6XokniwnzVTJfvtY=";
}; };
patches = [ patches = [

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "docker-language-server"; pname = "docker-language-server";
version = "0.7.0"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "docker-language-server"; repo = "docker-language-server";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-4R0GEufK++ZvihrurLwN24QnqwSt1cTkjFjbCVXqIw0="; hash = "sha256-d3lGCIssrQqZNYyQ0RlXfjp1/z5tNtNTy6LkCC77qpA=";
}; };
vendorHash = "sha256-YDBNJzTyPEM/Zvv1Ieo3GG+NlvDOrghxdOqkKsF04AE="; vendorHash = "sha256-6wngmwVtHSTPfsJQJ+swGM9H+yCbXDPLGCcTys1Zb4A=";
nativeCheckInputs = [ nativeCheckInputs = [
docker docker

View file

@ -7,13 +7,13 @@
}: }:
llvmPackages.stdenv.mkDerivation rec { llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme"; pname = "enzyme";
version = "0.0.180"; version = "0.0.181";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EnzymeAD"; owner = "EnzymeAD";
repo = "Enzyme"; repo = "Enzyme";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-jQ9IiE9cM/UhdB36vvmNxnvuDtFbzR5WbDzysdpQR9E="; hash = "sha256-4wY8gOF49VOrQ/7YbrSyh0M5S7HXxo2kktFrhShskf4=";
}; };
postPatch = '' postPatch = ''

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2025-05-26"; version = "2025-05-30";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = "exploitdb"; repo = "exploitdb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-e9a0bzlyqI3lR87X+S9XIVTpEv1a9RxlfKqyk6CsDGU="; hash = "sha256-X90stp4BiHOHoh030eqGeUGiWytF5ryY08/VYEsbnIw=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -5,13 +5,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
name = "filterpath"; name = "filterpath";
version = "1.0.2"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Sigmanificient"; owner = "Sigmanificient";
repo = "filterpath"; repo = "filterpath";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-9rHooXgpvfNNeWxS8UF6hmb8vCz+xKABrJNd+AgKFJs="; hash = "sha256-GW8f3o7D5ddHQ8WZvds6rcsKPmlTSr/w4k2mU7oR6aM=";
}; };
makeFlags = [ makeFlags = [

View file

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.3.125"; version = "0.3.132";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hBGVFXj3meMjB26qSNOp1QoJWQCkv95akdOD8byHTsk="; hash = "sha256-xuPcJchATGlGZR4dwWKp5GXlo7O1Xv2u+gDzgn1668I=";
}; };
vendorHash = "sha256-9E6Kd9TV8TplL4KU47hhOIPuO/hm0T3aaMK/rEMBUU4="; vendorHash = "sha256-9E6Kd9TV8TplL4KU47hhOIPuO/hm0T3aaMK/rEMBUU4=";

View file

@ -5,13 +5,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "git-who"; pname = "git-who";
version = "1.0"; version = "1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sinclairtarget"; owner = "sinclairtarget";
repo = "git-who"; repo = "git-who";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xJHFPf3w+6jh6vPTg4ggq652lANZkBBkKsmkvWx48ZU="; hash = "sha256-J+Rl1zmNo4MmCwtpKpNKRNXmzzCKYztA6xvoJjHPEOI=";
}; };
vendorHash = "sha256-e2P7szjtAn4EFTy+eGi/9cYf/Raw/7O+PbYEOD8i3Hs="; vendorHash = "sha256-e2P7szjtAn4EFTy+eGi/9cYf/Raw/7O+PbYEOD8i3Hs=";

View file

@ -56,24 +56,24 @@
let let
pname = "gitkraken"; pname = "gitkraken";
version = "11.1.0"; version = "11.1.1";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = { srcs = {
x86_64-linux = fetchzip { x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
hash = "sha256-42NP+23PlyIiqzwjpktz8ipJ5tjzbbszSB9qkeE5jVU="; hash = "sha256-VKJjwWAhN53h9KU06OviIEL5SiIDwPtb7cKJSR4L9YA=";
}; };
x86_64-darwin = fetchzip { x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
hash = "sha256-/GiHFVz9RyC/bliA8m2YwCwnUQfxT9C0qR+YPr6zdqQ="; hash = "sha256-CNJ5EOFTGerzCQg7E23bPTPn11c41/AYP0PHHyrpUDA=";
}; };
aarch64-darwin = fetchzip { aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
hash = "sha256-CfhloCczC2z1AHNh0vGXk9Np+BnFI0U/QrPIFBWsYjs="; hash = "sha256-5R106QjzDLDesiOaZMMLHhissvBtOQv0hgnCmVgApUc=";
}; };
}; };

View file

@ -9,13 +9,13 @@ nixpkgs=$(realpath "$scriptDir"/../../../..)
# All architectures are released together, therefore we get the latest version from the linux release # All architectures are released together, therefore we get the latest version from the linux release
# NOTE: for some reason, the darwin RELEASES (ie. /darwin/RELEASES) file returns a frozen version... # NOTE: for some reason, the darwin RELEASES (ie. /darwin/RELEASES) file returns a frozen version...
echo >&2 "=== Obtaining version data from release.axocdn.com..." echo >&2 "=== Obtaining version data from release.axocdn.com..."
version=$(curl -fsSL https://release.axocdn.com/linux/RELEASES | jq -r '.name') version=$(curl -fsSL https://api.gitkraken.dev/releases/production/linux/x64/RELEASES | jq -r '.name')
# Hardcoded URLs to compute hashes # Hardcoded URLs to compute hashes
declare -A tarballs=( declare -A tarballs=(
["x86_64-linux"]="https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz" ["x86_64-linux"]="https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz"
["x86_64-darwin"]="https://release.axocdn.com/darwin/GitKraken-v${version}.zip" ["x86_64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip"
["aarch64-darwin"]="https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip" ["aarch64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"
) )
for arch in "${!tarballs[@]}"; do for arch in "${!tarballs[@]}"; do

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "glow"; pname = "glow";
version = "2.1.0"; version = "2.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charmbracelet"; owner = "charmbracelet";
repo = "glow"; repo = "glow";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-pYXzm6HEqxJRPDdiUb+yij3iA2FhFYZOdRvQ69grcuU="; hash = "sha256-lDGCRtwCpW/bZlfcb100g7tMXN2dlCPnCY7qVFyayUo=";
}; };
vendorHash = "sha256-lnD3SdPqZO+xfsR5YhvIAr9Gy1sA1LXi4SP/d/Rv/6g="; vendorHash = "sha256-JqQnLwkxRt+CiP90F+1i4MAiOw3akMQ5BeQXCplZdxA=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -38,38 +38,38 @@ perlPackages.buildPerlPackage rec {
with perlPackages; with perlPackages;
[ [
CGI CGI
CpanelJSONXS
CryptDES
DataStructureUtil DataStructureUtil
DataUUID
DateTime
DigestSHA1
FileCopyRecursive FileCopyRecursive
HTTPDaemon
HTTPProxy HTTPProxy
HTTPServerSimple HTTPServerSimple
HTTPServerSimpleAuthen HTTPServerSimpleAuthen
IOCapture IOCapture
IOCompress
IOSocketSSL IOSocketSSL
IPCRun IPCRun
JSON JSON
LWPProtocolHttps LWPProtocolHttps
ModuleInstall ModuleInstall
NetPing
NetSNMP NetSNMP
ParallelForkManager
ParseEDID
TestCompile TestCompile
TestDeep TestDeep
TestException TestException
TestMockModule TestMockModule
TestMockObject TestMockObject
TestNoWarnings TestNoWarnings
CpanelJSONXS
XMLLibXML
NetPing
ParallelForkManager
DigestSHA1
CryptDES
FileCopyRecursive
URIEscapeXS
DateTime
DataUUID
URI URI
HTTPDaemon URIEscapeXS
XMLLibXML
YAML YAML
IOCompress
] ]
); );

View file

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "go-blueprint"; pname = "go-blueprint";
version = "0.10.9"; version = "0.10.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Melkeydev"; owner = "Melkeydev";
repo = "go-blueprint"; repo = "go-blueprint";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5xVmMHQE0Jl15ZZnmvJQDUsCBfMaE5hWUighUdfoN/g="; hash = "sha256-yUuI7FrrSTTlaFfb/hh0YSzaOzE2dBlXoSCaNuKFdrM=";
}; };
ldflags = [ ldflags = [

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "go-judge"; pname = "go-judge";
version = "1.9.3"; version = "1.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "criyle"; owner = "criyle";
repo = "go-judge"; repo = "go-judge";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-AmbhfCKUpvZt/me73EhBQqw8yDnItn1zKiemf/JRz24="; hash = "sha256-26Fx3bPhAM/Clb5vkU5ml++W0uYT8dnDNabP5Ir1Lx4=";
}; };
vendorHash = "sha256-eUtkelLucf11ANT6vkWuBOaL5bgb+9D8YsVsZTMMjmg="; vendorHash = "sha256-vkPuGoEBU8FPCW6/10HJZYtI2FzjydsWwv9wy8DXwA8=";
tags = [ tags = [
"nomsgpack" "nomsgpack"

View file

@ -10,8 +10,7 @@
goocanvas2 = goocanvas3; goocanvas2 = goocanvas3;
}).overrideAttrs }).overrideAttrs
(finalAttrs: { (finalAttrs: {
# Next version is 2.4.0 version = "2.2.1-unstable-2024-09-17";
version = "2.4.0-unstable-2024-09-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "csete"; owner = "csete";

View file

@ -6,16 +6,16 @@
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "hebcal"; pname = "hebcal";
version = "5.9.1"; version = "5.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hebcal"; owner = "hebcal";
repo = "hebcal"; repo = "hebcal";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-IhN0n3qa+QlWtSxHyzm3muldsFFrkRzCwulgCcg50eA="; hash = "sha256-6iyltrnA1pLtTUg0AUIp0yciN53oeoLE88dAbTxBK6I=";
}; };
vendorHash = "sha256-Rpg+PVXY01+diJnE26iZ/oJhVVSoLdM7nWJFmfXBuHc="; vendorHash = "sha256-azKie/qJUmRSVgkfqsL04NpnePx9ToUPjz6RUOFRdUw=";
preBuild = '' preBuild = ''
make dcity.go make dcity.go

View file

@ -15,13 +15,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "immudb"; pname = "immudb";
version = "1.9.6"; version = "1.9.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "codenotary"; owner = "codenotary";
repo = "immudb"; repo = "immudb";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-sQLxHHaKdqocjJVXuuuQqx+BNubl6bjVcp50r4kPQEs="; sha256 = "sha256-tYQYQyYhHMn0+PQWDEb4zY9EbDt1pVzZIcP0Gnsplrk=";
}; };
postPatch = '' postPatch = ''

View file

@ -7,15 +7,15 @@
buildGoModule rec { buildGoModule rec {
pname = "istioctl"; pname = "istioctl";
version = "1.26.0"; version = "1.26.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "istio"; owner = "istio";
repo = "istio"; repo = "istio";
rev = version; rev = version;
hash = "sha256-uoAnm2XNVESI4yiPpfO/Hkaz39QLwSpkwFpH1JF+ZJg="; hash = "sha256-+sLObdWGl4wTLzqA4EImRDB6R6Ted9hEJKs0CPYkFxA=";
}; };
vendorHash = "sha256-By0XPBjnJ35STNeuktmffTu/YGc3huHUgDYOpWgBIck="; vendorHash = "sha256-K3fUJexe/mTViRX5UEhJM5sPQ/J5fWjMIJUovpaUV+w=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -10,7 +10,7 @@
}: }:
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "katawa-shoujo-re-engineered"; pname = "katawa-shoujo-re-engineered";
version = "2.0.1-1"; version = "2.0.2-1";
src = fetchFromGitea { src = fetchFromGitea {
# GitHub mirror at fleetingheart/ksre # GitHub mirror at fleetingheart/ksre
@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "fhs"; owner = "fhs";
repo = "katawa-shoujo-re-engineered"; repo = "katawa-shoujo-re-engineered";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-5AK6QtF47EGiKDihiUv4FHsw1sjraq/Mh838wbb1hac="; hash = "sha256-skCcNFUmAQMZWRCXsABJR6elDlbVZFRParq7nOzZL4M=";
}; };
desktopItems = [ desktopItems = [

View file

@ -39,17 +39,17 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "liana"; pname = "liana";
version = "10.0"; # keep in sync with lianad version = "11.0"; # keep in sync with lianad
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wizardsardine"; owner = "wizardsardine";
repo = "liana"; repo = "liana";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA="; hash = "sha256-mpHXaqMbThjCSJIZqg0t7Zz0hCsC3sSrSf3Npn19RpA=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes="; cargoHash = "sha256-nyWTcKGTVCS1MHmSCiF2aEUtQaVyUfLYzJed+APrdCo=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "lianad"; pname = "lianad";
version = "10.0"; # keep in sync with liana version = "11.0"; # keep in sync with liana
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wizardsardine"; owner = "wizardsardine";
repo = "liana"; repo = "liana";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA="; hash = "sha256-mpHXaqMbThjCSJIZqg0t7Zz0hCsC3sSrSf3Npn19RpA=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes="; cargoHash = "sha256-nyWTcKGTVCS1MHmSCiF2aEUtQaVyUfLYzJed+APrdCo=";
buildInputs = [ udev ]; buildInputs = [ udev ];

View file

@ -8,7 +8,8 @@
usePam ? !isStatic, usePam ? !isStatic,
pam ? null, pam ? null,
isStatic ? stdenv.hostPlatform.isStatic, isStatic ? stdenv.hostPlatform.isStatic,
withGo ? pkgsBuildHost.go.meta.available, go,
withGo ? lib.meta.availableOn stdenv.buildPlatform go && stdenv.hostPlatform.go.GOARCH != null,
# passthru.tests # passthru.tests
bind, bind,
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = lib.optionals withGo [ nativeBuildInputs = lib.optionals withGo [
pkgsBuildHost.go go
]; ];
buildInputs = lib.optional usePam pam; buildInputs = lib.optional usePam pam;

View file

@ -2,7 +2,6 @@
collectd.overrideAttrs (oldAttrs: { collectd.overrideAttrs (oldAttrs: {
pname = "libcollectdclient"; pname = "libcollectdclient";
inherit (collectd) version;
buildInputs = [ ]; buildInputs = [ ];
configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ configureFlags = (oldAttrs.configureFlags or [ ]) ++ [

View file

@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
broken = true;
description = "Japanese Kana Kanji conversion input method library"; description = "Japanese Kana Kanji conversion input method library";
homepage = "https://github.com/ueno/libkkc"; homepage = "https://github.com/ueno/libkkc";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;

View file

@ -2,26 +2,27 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
autoreconfHook, cmake,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marisa"; pname = "marisa";
version = "0.2.7"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "s-yata"; owner = "s-yata";
repo = "marisa-trie"; repo = "marisa-trie";
rev = "v${version}"; tag = "v${version}";
sha256 = "sha256-+OGtDbwl7ar3i65POkTGyC4AYkOT4YuASfdt5FGJ8yM="; hash = "sha256-XOXX0NuU+erL/KDAZgBeX+LKO9uSEOyP1/VuMDE5pi0=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ cmake ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/s-yata/marisa-trie"; homepage = "https://github.com/s-yata/marisa-trie";
changelog = "https://github.com/s-yata/marisa-trie/releases/tag/${src.tag}";
description = "Static and space-efficient trie data structure library"; description = "Static and space-efficient trie data structure library";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ sifmelcara ]; maintainers = with maintainers; [ sifmelcara ];

View file

@ -6,7 +6,7 @@
openssl, openssl,
}: }:
let let
version = "0.21.0"; version = "0.22.0";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "markuplinkchecker"; pname = "markuplinkchecker";
@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
owner = "becheran"; owner = "becheran";
repo = "mlc"; repo = "mlc";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-16ZGYUP7h6WmwjadLHqOQClejZ35LwavFgjs9x3NYVo="; hash = "sha256-3saRIAKVTCi145hoD0SGPloCeIwVKR3Wp3Qo3zo9g7k=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-u60hjpQaF+EnWzMcM7T8UjcERF0+0ArltKcQXkEaxmc="; cargoHash = "sha256-DHpOReEdufQ4++74CJDnW6EJtUwhtq+RgZ6hVGqHkKE=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -7,16 +7,16 @@
buildGo124Module rec { buildGo124Module rec {
pname = "matrix-alertmanager-receiver"; pname = "matrix-alertmanager-receiver";
version = "2025.4.23"; version = "2025.5.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metio"; owner = "metio";
repo = "matrix-alertmanager-receiver"; repo = "matrix-alertmanager-receiver";
tag = version; tag = version;
hash = "sha256-ubSrj8mUc0b6fwRuvaw8oapTyIbDRvlzEqpjIFEY1FQ="; hash = "sha256-W0dvaJ1o43un5UskAmpKomZjIHiclOoiOkxGawP0fyk=";
}; };
vendorHash = "sha256-8LQ4SJ1zapBRuFDX8VxYUvA6jzukVml8Jr+B3zQKFOs="; vendorHash = "sha256-ZM7qA73fPPRgs378uDQoYs32e7i8LmBjqZ7RjzWEW28=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "melodeon"; pname = "melodeon";
version = "0.4.4"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CDrummond"; owner = "CDrummond";
repo = "melodeon"; repo = "melodeon";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-RlUQdidBUI3+xNpzgcffjQHjMpz7L7cJQPPCcTkvLRw="; hash = "sha256-qIqCk6nMwbJv1stXwZoK89IQjbD0Wv6jmK2g+zyCpNU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -1,23 +0,0 @@
diff --git a/plugin/httpgetter/html_meta_test.go b/plugin/httpgetter/html_meta_test.go
index d0b0d903..d1668db1 100644
--- a/plugin/httpgetter/html_meta_test.go
+++ b/plugin/httpgetter/html_meta_test.go
@@ -2,7 +2,6 @@ package httpgetter
import (
"errors"
- "strings"
"testing"
"github.com/stretchr/testify/require"
@@ -30,10 +29,4 @@ func TestGetHTMLMetaForInternal(t *testing.T) {
if _, err := GetHTMLMeta("http://localhost"); !errors.Is(err, ErrInternalIP) {
t.Errorf("Expected error for resolved internal IP, got %v", err)
}
-
- // test for redirected internal IP
- // 49.232.126.226:1110 will redirects to 127.0.0.1
- if _, err := GetHTMLMeta("http://49.232.126.226:1110"); !(errors.Is(err, ErrInternalIP) && strings.Contains(err.Error(), "redirect")) {
- t.Errorf("Expected error for redirected internal IP, got %v", err)
- }
}

View file

@ -14,15 +14,15 @@
protoc-gen-validate, protoc-gen-validate,
}: }:
let let
version = "0.24.2"; version = "0.24.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "usememos"; owner = "usememos";
repo = "memos"; repo = "memos";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DWOJ6+lUTbOzMLsfTDNZfhgNomajNCnNi7U1A+tqXm4="; hash = "sha256-lTMHUVrg3JzTneBh874tr0mbQPp7X3rMKrkOe+wcOL4=";
}; };
protobufsGenerated = stdenvNoCC.mkDerivation { memos-protobuf-gen = stdenvNoCC.mkDerivation {
name = "memos-protobuf-gen"; name = "memos-protobuf-gen";
inherit src; inherit src;
@ -52,16 +52,16 @@ let
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "sha256-u+Wq/fXvWTjXdhC2h6RCsn7pjdFJ+gUdTPRvrn9cZ+k="; outputHash = "sha256-cJK9wT5uj1MYjYZkzgMSL9nShCO2xPJOYZT+ebndwlY=";
}; };
frontend = stdenvNoCC.mkDerivation (finalAttrs: { memos-web = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "memos-web"; pname = "memos-web";
inherit version src; inherit version src;
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/web"; sourceRoot = "${finalAttrs.src.name}/web";
hash = "sha256-lopCa7F/foZ42cAwCxE+TWAnglTZg8jY8eRWmeck/W8="; hash = "sha256-ooiH13yzMTCSqzmZVvVy2jWoIfJecMlE6JkwcG5EV5k=";
}; };
pnpmRoot = "web"; pnpmRoot = "web";
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,7 +69,7 @@ let
pnpm.configHook pnpm.configHook
]; ];
preBuild = '' preBuild = ''
cp -r {${protobufsGenerated},.}/web/src/types/proto cp -r {${memos-protobuf-gen},.}/web/src/types/proto
''; '';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -85,21 +85,21 @@ let
in in
buildGoModule { buildGoModule {
pname = "memos"; pname = "memos";
inherit version src; inherit
version
src
memos-web
memos-protobuf-gen
;
vendorHash = "sha256-hdL4N0tg/lYGTeiKl9P2QsV8HTxlvHfsSqsqq/C0cg8="; vendorHash = "sha256-SWpnsTdti3hD1alvItpXllTJHGxeKP8q7WD2nBzFG7o=";
preBuild = '' preBuild = ''
rm -rf server/router/frontend/dist rm -rf server/router/frontend/dist
cp -r ${frontend} server/router/frontend/dist cp -r ${memos-web} server/router/frontend/dist
cp -r {${protobufsGenerated},.}/proto/gen cp -r {${memos-protobuf-gen},.}/proto/gen
''; '';
patches = [
# to be removed in next release (test was removed upstream as part of a bigger commit)
./nixbuild-check.patch
];
passthru.updateScript = nix-update-script { passthru.updateScript = nix-update-script {
extraArgs = [ extraArgs = [
"--subpackage" "--subpackage"

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "meteor-git"; pname = "meteor-git";
version = "0.26.0"; version = "0.27.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stefanlogue"; owner = "stefanlogue";
repo = "meteor"; repo = "meteor";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DWnwofNJhILdVITRDh8MNlGl6PSENCS2PkaFm1o+MW8="; hash = "sha256-OH4WQNSbTMaysaHoKcy3S9V7BWu93Djr8toWtQ7Xj/w=";
}; };
vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo="; vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo=";

View file

@ -35,13 +35,13 @@ let
in in
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "moonraker"; pname = "moonraker";
version = "0.9.3-unstable-2025-04-22"; version = "0.9.3-unstable-2025-05-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Arksine"; owner = "Arksine";
repo = "moonraker"; repo = "moonraker";
rev = "1c124149720e24f52b80ce82ce906e69476b7724"; rev = "0310d0be9fd207c510554ff64ca418cf4bcdaf9f";
sha256 = "sha256-+Yk0TBU8dIa9mf0s+F+mTop8jLxdVDDCP8ST8pRgCiY="; sha256 = "sha256-tTCMNn1UmEeeBEGm8Sw0TrlNcVYHLjw57HH0LIA2y8k=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -95,7 +95,7 @@ stdenv.mkDerivation (
in in
{ {
pname = "neovim-unwrapped"; pname = "neovim-unwrapped";
version = "0.11.1"; version = "0.11.2";
__structuredAttrs = true; __structuredAttrs = true;
@ -103,7 +103,7 @@ stdenv.mkDerivation (
owner = "neovim"; owner = "neovim";
repo = "neovim"; repo = "neovim";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-kJvKyNjpqIKa5aBi62jHTCb1KxQ4YgYtBh/aNYZSeO8="; hash = "sha256-sNunEdIFrSMqYaNg0hbrSXALRQXxFkdDOl/hhX1L1WA=";
}; };
patches = [ patches = [

View file

@ -31,13 +31,13 @@ assert (blas.isILP64 == arpack.isILP64);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "octopus"; pname = "octopus";
version = "15.1"; version = "16.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "octopus-code"; owner = "octopus-code";
repo = "octopus"; repo = "octopus";
rev = version; rev = version;
hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM="; hash = "sha256-sByiRTgAntJtSeL4h+49Mi9Rcxw2wK/BvXvsePa77HE=";
}; };
patches = [ patches = [

View file

@ -31,13 +31,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openvas-scanner"; pname = "openvas-scanner";
version = "23.19.0"; version = "23.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "greenbone"; owner = "greenbone";
repo = "openvas-scanner"; repo = "openvas-scanner";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-f5rK5029+Gz2klb6UAEfExWpDVxdkb2SVFgou4H5jKk="; hash = "sha256-JXZMgf7HTmRADApnriWxszvFcVNxIb4ylfdgb5ebVSw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -10,13 +10,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "outfieldr"; pname = "outfieldr";
version = "1.1.0"; version = "1.1.1";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ve-nt"; owner = "ve-nt";
repo = "outfieldr"; repo = "outfieldr";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-Xz5BxwPWrZfDsWnvVR9KvHidbUdPsxy7b2ONiSZY+uk="; hash = "sha256-rokGB1be09ExK9VH5tCW8ccZiIMd3A9pbuMFrOouhOc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "patch2pr"; pname = "patch2pr";
version = "0.34.0"; version = "0.35.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bluekeyes"; owner = "bluekeyes";
repo = "patch2pr"; repo = "patch2pr";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5Xb/M7M8PAVXMyr7dwpoT0H4BV7o6okPQQw2e273ogQ="; hash = "sha256-dj8xDTl7S1XETJqDI61rdRvQebJ4xgit+xc1xRyaV4M=";
}; };
vendorHash = "sha256-B/Xw8rR+cldLKHr5N6ifBRHWAzJLayiejLi/winPjKg="; vendorHash = "sha256-pn2x6f+N9VYncc490VtPzXkJxwC0nZgj4pDNB+no2Lo=";
ldflags = [ ldflags = [
"-X main.version=${version}" "-X main.version=${version}"

View file

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "phase-cli"; pname = "phase-cli";
version = "1.19.1"; version = "1.19.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "phasehq"; owner = "phasehq";
repo = "cli"; repo = "cli";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-2FVnOQ6A7PopqE9KRlZP1QhGP6Ia5kGPDvguOI45aPI="; hash = "sha256-XicOP/V9j74kogu6KEUyk06D0kCq/oG5N635h6X1eng=";
}; };
build-system = with python3Packages; [ build-system = with python3Packages; [

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pyenv"; pname = "pyenv";
version = "2.5.7"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pyenv"; owner = "pyenv";
repo = "pyenv"; repo = "pyenv";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-JTD++YQzO84zFVhp9BMBqA8Hln990tAFpfZ8YjmrhvU="; hash = "sha256-GZLcxRt7pcjnrodnF9iaeOhZLKkcpXQxy5PBHyvfp4A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -7,13 +7,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "pyradio"; pname = "pyradio";
version = "0.9.3.11.11"; version = "0.9.3.11.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coderholic"; owner = "coderholic";
repo = "pyradio"; repo = "pyradio";
tag = version; tag = version;
hash = "sha256-yVXq9wHuPO87SRxJdFtYeQWFzeX6IwhKdMchhuzo0ms="; hash = "sha256-thHx1IJLYG83qxV6QSHRn7Jt1a1LUR47noDvAtcFZuE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "rancher"; pname = "rancher";
version = "2.11.1"; version = "2.11.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rancher"; owner = "rancher";
repo = "cli"; repo = "cli";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-puwbZQ6JOdRODOChb2hOqW4KPIxxubOkMILFHUP/I78="; hash = "sha256-C7Ihl7JnURltVk6Qt7H/UYeHqjcfKuFyFCFx8ENPDyI=";
}; };
ldflags = [ ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
"-static" "-static"
]; ];
vendorHash = "sha256-NQ5R2rYmPc5Y6tpnWm9/QL5TNe70ZWwXF51KgShyovQ="; vendorHash = "sha256-eUA+hm+vuVUpkF7ojruEydkXbtMM58i0Ka+6Z9G4EYQ=";
postInstall = '' postInstall = ''
mv $out/bin/cli $out/bin/rancher mv $out/bin/cli $out/bin/rancher

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rtg-tools"; pname = "rtg-tools";
version = "3.12.1"; version = "3.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RealTimeGenomics"; owner = "RealTimeGenomics";
repo = "rtg-tools"; repo = "rtg-tools";
rev = version; rev = version;
hash = "sha256-fMrrjrgaGxBVxn6qMq2g0oFv6qtfhZcQlkvv1E9Os6Y="; hash = "sha256-vPzKrgnX6BCQmn9aOVWWpFLC6SbPBHZhZ+oL1LCbvmo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,12 +47,11 @@ stdenv.mkDerivation rec {
# Use a location outside nix (must be writable) # Use a location outside nix (must be writable)
substituteInPlace installer/rtg \ substituteInPlace installer/rtg \
--replace-fail '$THIS_DIR/rtg.cfg' '$HOME/.config/rtg-tools/rtg.cfg' \ --replace-fail '$THIS_DIR/rtg.cfg' '$HOME/.config/rtg-tools/rtg.cfg' \
--replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${jdk}/lib/opendk/bin/java"' \ --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${lib.getExe jdk}"' \
--replace-fail uname ${lib.getExe' coreutils "uname"} \ --replace-fail uname ${lib.getExe' coreutils "uname"} \
--replace-fail awk ${lib.getExe gawk} \ --replace-fail awk ${lib.getExe gawk} \
--replace-fail "hostname -s" "${lib.getExe hostname} -s" --replace-fail "hostname -s" "${lib.getExe hostname} -s"
sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools' installer/rtg sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools' installer/rtg
''; '';

View file

@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "sn-pro"; pname = "sn-pro";
version = "1.4.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "supernotes"; owner = "supernotes";
repo = "sn-pro"; repo = "sn-pro";
rev = version; rev = version;
hash = "sha256-bagirVJtpGZOB3rULKemniGj1BkN9SQYpFhTm4ZX/is="; hash = "sha256-H8YG7FMn03tiBxz5TZDzowicqtewfX6rYd03pdTPYSo=";
}; };
installPhase = '' installPhase = ''

View file

@ -9,16 +9,16 @@
php84.buildComposerProject2 (finalAttrs: { php84.buildComposerProject2 (finalAttrs: {
pname = "snipe-it"; pname = "snipe-it";
version = "8.1.3"; version = "8.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grokability"; owner = "grokability";
repo = "snipe-it"; repo = "snipe-it";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-SzL1api9hObdvhKRtBrzgvZNuJHAoeB2GCt2etCZ6Kw="; hash = "sha256-Mz+8f8VRwBf80tfrtecKnkFDIP7lsjJVPezyZI2uFbg=";
}; };
vendorHash = "sha256-KOzPzKN1HXFidjXWe8tNPwFJ8DmdrkCDKeChNhGcTDo="; vendorHash = "sha256-w+wdGGCACzpJMFuKk48h71DVMfsGguxeJLTen1U8Pp8=";
postInstall = '' postInstall = ''
snipe_it_out="$out/share/php/snipe-it" snipe_it_out="$out/share/php/snipe-it"

View file

@ -14,17 +14,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "snphost"; pname = "snphost";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "virtee"; owner = "virtee";
repo = "snphost"; repo = "snphost";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM="; hash = "sha256-sBEIQQ0vfwQh5eqsC6x37VDlbXuBUybRh4LNUjfEJ5A=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-11D26PqCcKPoyCk4Zx29pkc6/B8DR+9+y+RJAq6ZbCs="; cargoHash = "sha256-aNXv6Av3JvnTqTbxX70FmwEF4jJaQmD6FHjvh7om9iE=";
nativeBuildInputs = [ nativeBuildInputs = [
asciidoctor asciidoctor

View file

@ -5,7 +5,7 @@
cmake, cmake,
}: }:
let let
version = "9.3.1"; version = "9.3.4";
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "source-meta-json-schema"; pname = "source-meta-json-schema";
@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "sourcemeta"; owner = "sourcemeta";
repo = "jsonschema"; repo = "jsonschema";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-uqx2GBG4sTmFWexTr8fCP9r/o37d3vTD93giB/OEmac="; hash = "sha256-DDJlUH/FWMYz/sFkW4HbLbAYi967QWUjTyfZp5S8F1A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "stargazer"; pname = "stargazer";
version = "1.3.2"; version = "1.3.3";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~zethra"; owner = "~zethra";
repo = "stargazer"; repo = "stargazer";
rev = version; rev = version;
hash = "sha256-Yulm0XkVaN+yBKj8LDsn8pBYXEqTOSGLqbpIKDN0G2U="; hash = "sha256-ZkJ0X++QmQIsDKBjLEHRHeWJxFLooqXBBijIwSF6dcQ=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-MtpJTLKhlVF5AE3huL0JRWXtNCtc0Z5b/S28ekzirPA="; cargoHash = "sha256-ufp9ib0wkehJcKHpt2yyV//000isY2+HaOzlPVMz50Y=";
passthru = { passthru = {
tests.basic-functionality = nixosTests.stargazer; tests.basic-functionality = nixosTests.stargazer;

View file

@ -6,14 +6,14 @@
stdenv, stdenv,
}: }:
buildGoModule rec { buildGoModule (finalAttrs: {
pname = "temporal-cli"; pname = "temporal-cli";
version = "1.3.0"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "temporalio"; owner = "temporalio";
repo = "cli"; repo = "cli";
rev = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-9O+INXJhNwgwwvC0751ifdHmxbD0qI5A3LdDb4Krk/o="; hash = "sha256-9O+INXJhNwgwwvC0751ifdHmxbD0qI5A3LdDb4Krk/o=";
}; };
@ -36,7 +36,7 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/temporalio/cli/temporalcli.Version=${version}" "-X github.com/temporalio/cli/temporalcli.Version=${finalAttrs.version}"
]; ];
# Tests fail with x86 on macOS Rosetta 2 # Tests fail with x86 on macOS Rosetta 2
@ -62,4 +62,4 @@ buildGoModule rec {
maintainers = with lib.maintainers; [ aaronjheng ]; maintainers = with lib.maintainers; [ aaronjheng ];
mainProgram = "temporal"; mainProgram = "temporal";
}; };
} })

View file

@ -1,59 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
python311Packages,
go,
}:
python311Packages.buildPythonApplication rec {
pname = "thefuck";
version = "3.32";
src = fetchFromGitHub {
owner = "nvbn";
repo = "thefuck";
tag = version;
hash = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I=";
};
dependencies = with python311Packages; [
colorama
decorator
psutil
pyte
six
];
nativeCheckInputs =
[ go ]
++ (with python311Packages; [
mock
pytest7CheckHook
pytest-mock
]);
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
"test_settings_defaults"
"test_from_file"
"test_from_env"
"test_settings_from_args"
"test_get_all_executables_exclude_paths"
"test_with_blank_cache"
"test_with_filled_cache"
"test_when_etag_changed"
"test_for_generic_shell"
"test_on_first_run"
"test_on_run_after_other_commands"
"test_when_cant_configure_automatically"
"test_when_already_configured"
"test_when_successfully_configured"
];
meta = {
homepage = "https://github.com/nvbn/thefuck";
description = "Magnificent app which corrects your previous console command";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ marcusramberg ];
};
}

View file

@ -1,27 +0,0 @@
diff --git a/src/malloc.h b/src/malloc.h
index cc4d3bf..bbf78cd 100644
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -34,6 +34,10 @@ extern int low_memory_warning;
# define realloc(ptr, size) mrealloc(NULL, ptr, size)
# define free(ptr) mfree(NULL, ptr)
#else
+#ifdef __APPLE__
+ #include <stdlib.h>
+ #include <sys/types.h>
+#endif
# define mmalloc(md, size) malloc(size)
# define mcalloc(md, size) calloc(size)
# define mrealloc(md, ptr, size) realloc(ptr, size)
diff --git a/src/tfio.c b/src/tfio.c
index 2cd2103..8640f2b 100644
--- a/src/tfio.c
+++ b/src/tfio.c
@@ -70,6 +70,7 @@ static void fileputs(const char *str, FILE *fp);
static void filenputs(const char *str, int n, FILE *fp);
static void queueputline(conString *line, TFILE *file);
+extern void main_loop(void);
void init_tfio(void)
{

View file

@ -0,0 +1,46 @@
diff -ur a/src/malloc.c b/src/malloc.c
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,6 @@
#include "signals.h"
#include "malloc.h"
-caddr_t mmalloc_base = NULL;
int low_memory_warning = 0;
static char *reserve = NULL;
diff -ur a/src/malloc.h b/src/malloc.h
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -34,6 +34,8 @@
# define realloc(ptr, size) mrealloc(NULL, ptr, size)
# define free(ptr) mfree(NULL, ptr)
#else
+# include <stdlib.h>
+# include <sys/types.h>
# define mmalloc(md, size) malloc(size)
# define mcalloc(md, size) calloc(size)
# define mrealloc(md, ptr, size) realloc(ptr, size)
diff -ur a/src/socket.c b/src/socket.c
--- a/src/socket.c
+++ b/src/socket.c
@@ -2600,7 +2600,7 @@
socks_with_lines--;
if (line->attrs & (F_TFPROMPT)) {
- incoming_text = line;
+ incoming_text = (String*)line;
handle_prompt(incoming_text, 0, TRUE);
continue;
}
diff -ur a/src/tfio.c b/src/tfio.c
--- a/src/tfio.c
+++ b/src/tfio.c
@@ -70,6 +70,7 @@
static void filenputs(const char *str, int n, FILE *fp);
static void queueputline(conString *line, TFILE *file);
+extern void main_loop(void);
void init_tfio(void)
{

View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
}; };
patches = [ patches = [
./001-darwin-fixes.patch ./fix-build.patch
]; ];
configureFlags = optional (!sslSupport) "--disable-ssl"; configureFlags = optional (!sslSupport) "--disable-ssl";

View file

@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
++ lib.optionals mediaSupport [ ffmpeg ] ++ lib.optionals mediaSupport [ ffmpeg ]
); );
version = "14.5.2"; version = "14.5.3";
sources = { sources = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
]; ];
hash = "sha256-ZvNje6LtrjS8gURyp38eLzPD7ji2DlOkkphW4KBmus0="; hash = "sha256-1MgXLdoRrmwFAG2JtkCUa2NQ/H3Xxd9+2jbV+fRRVXA=";
}; };
i686-linux = fetchurl { i686-linux = fetchurl {
@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
]; ];
hash = "sha256-+Dt1uDZeUV65jbJ5pYv8v/P8UxTy37cHjIqmPd8SuGg="; hash = "sha256-T6BdLhEXYzo3zIJZ2aREjAWmIRDV/xtVhVvkDUozoo4=";
}; };
}; };

View file

@ -13,12 +13,12 @@
let let
pname = "uhk-agent"; pname = "uhk-agent";
version = "7.0.0"; version = "7.0.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
name = "${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage";
sha256 = "sha256-C/ngBu9Fr4oqp2YB54c2VGVqsYfH9d03YEnGa/+Z2XI="; sha256 = "sha256-8zf6vhgZj8cY9XoI/6FZH1/xh7/I3vboVumLsTq3q8Q=";
}; };
appimageContents = appimageTools.extract { appimageContents = appimageTools.extract {

View file

@ -9,12 +9,12 @@
let let
generator = pkgsBuildBuild.buildGoModule rec { generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community"; pname = "v2ray-domain-list-community";
version = "20250508005311"; version = "20250526033544";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "domain-list-community"; repo = "domain-list-community";
rev = version; rev = version;
hash = "sha256-RVI+FmNjAaBurodGTqO+/UiEd0NxPdcmlYA1ag2TvNM="; hash = "sha256-XA6kB8mwnwZwioviIlKbYr40pJ1ndOXecjMToE9mAYE=";
}; };
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
meta = with lib; { meta = with lib; {

View file

@ -5,13 +5,13 @@
}: }:
mkYaziPlugin { mkYaziPlugin {
pname = "bypass.yazi"; pname = "bypass.yazi";
version = "25.3.2-unstable-2025-05-11"; version = "25.3.2-unstable-2025-05-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Rolv-Apneseth"; owner = "Rolv-Apneseth";
repo = "bypass.yazi"; repo = "bypass.yazi";
rev = "85b5e9624a9eaa14c70b17b873209a2054f4062a"; rev = "381fb89a21a58605c555c109f190309b2d116d30";
hash = "sha256-2fblXb2uE6tq9goZKzMFgiEUVsx+uaRLyIq9BzTM8KA="; hash = "sha256-04cyOlG843Ot+jRT8GNFjJOzV4YdPBpI9XqbaK6KXu0=";
}; };
meta = { meta = {

Some files were not shown because too many files have changed in this diff Show more