Merge master into staging-nixos
This commit is contained in:
@@ -34,10 +34,6 @@ body {
|
||||
}
|
||||
}
|
||||
|
||||
.list-of-examples {
|
||||
display: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 2em;
|
||||
margin: 0.67em 0;
|
||||
|
||||
@@ -604,6 +604,12 @@
|
||||
{ fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; }
|
||||
];
|
||||
};
|
||||
ad030 = {
|
||||
name = "Alex Dam";
|
||||
github = "ad030";
|
||||
githubId = 68517956;
|
||||
email = "work.a.dam.030@proton.me";
|
||||
};
|
||||
adam-tj = {
|
||||
github = "adam-tj";
|
||||
githubId = 9314405;
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
- [scx_loader](https://github.com/sched-ext/scx-loader), a system daemon and DBus-based loader for sched_ext schedulers. `scxctl` is the command-line client for interacting with the loader, allowing users to switch schedulers, modes, and arguments dynamically. Available as [services.scx-loader](#opt-services.scx-loader.enable)
|
||||
|
||||
- [tap](https://github.com/bluesky-social/indigo/tree/main/cmd/tap), an ATProtocol firehose synchronisation utility. Available as [services.tap](#opt-services.tap.enable).
|
||||
|
||||
- [Nezha](https://github.com/nezhahq/nezha), a self-hosted, lightweight server and website monitoring and O&M tool. Available as [services.nezha](#opt-services.nezha.enable).
|
||||
|
||||
- [mail-tlsa-check-exporter](https://github.com/ietf-tools/mail-tlsa-check-exporter), validates SMTP / IMAP server certificates against a TLSA record as a Prometheus exporter. Available as [services.prometheus.exporters.mail-tlsa-check](#opt-services.prometheus.exporters.mail-tlsa-check.enable).
|
||||
|
||||
@@ -193,6 +193,7 @@
|
||||
./programs/chrysalis.nix
|
||||
./programs/clash-verge.nix
|
||||
./programs/cnping.nix
|
||||
./programs/comma.nix
|
||||
./programs/command-not-found/command-not-found.nix
|
||||
./programs/coolercontrol.nix
|
||||
./programs/corefreq.nix
|
||||
@@ -1428,6 +1429,7 @@
|
||||
./services/networking/tailscale-derper.nix
|
||||
./services/networking/tailscale-serve.nix
|
||||
./services/networking/tailscale.nix
|
||||
./services/networking/tap.nix
|
||||
./services/networking/tayga.nix
|
||||
./services/networking/tcpcrypt.nix
|
||||
./services/networking/teamspeak3.nix
|
||||
@@ -1848,7 +1850,6 @@
|
||||
./services/web-servers/minio.nix
|
||||
./services/web-servers/molly-brown.nix
|
||||
./services/web-servers/nginx/default.nix
|
||||
./services/web-servers/nginx/gitweb.nix
|
||||
./services/web-servers/nginx/tailscale-auth.nix
|
||||
./services/web-servers/phpfpm/default.nix
|
||||
./services/web-servers/pomerium.nix
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.comma;
|
||||
in
|
||||
{
|
||||
options.programs.comma = {
|
||||
enable = lib.mkEnableOption "comma";
|
||||
package = lib.mkPackageOption pkgs "comma" { };
|
||||
enableBashIntegration = lib.mkEnableOption "comma command-not-found handler for bash" // {
|
||||
default = true;
|
||||
};
|
||||
enableZshIntegration = lib.mkEnableOption "comma command-not-found handler for zsh" // {
|
||||
default = true;
|
||||
};
|
||||
enableFishIntegration = lib.mkEnableOption "comma command-not-found handler for fish" // {
|
||||
default = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
programs = {
|
||||
bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
|
||||
source ${cfg.package}/share/comma/command-not-found.sh
|
||||
'';
|
||||
zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
|
||||
source ${cfg.package}/share/comma/command-not-found.sh
|
||||
'';
|
||||
fish.interactiveShellInit = ''
|
||||
source ${cfg.package}/share/comma/command-not-found.fish
|
||||
'';
|
||||
|
||||
# Disable *other* command-not-found handlers
|
||||
command-not-found.enable = lib.mkIf (
|
||||
cfg.enableBashIntegration || cfg.enableZshIntegration || cfg.enableFishIntegration
|
||||
) (lib.mkDefault false);
|
||||
nix-index = {
|
||||
enableBashIntegration = lib.mkIf (cfg.enableBashIntegration) (lib.mkDefault false);
|
||||
enableZshIntegration = lib.mkIf (cfg.enableZshIntegration) (lib.mkDefault false);
|
||||
enableFishIntegration = lib.mkIf (cfg.enableFishIntegration) (lib.mkDefault false);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ pandapip1 ];
|
||||
}
|
||||
@@ -11,11 +11,17 @@ let
|
||||
inherit (lib) maintainers teams;
|
||||
inherit (lib.attrsets)
|
||||
attrByPath
|
||||
attrsToList
|
||||
concatMapAttrs
|
||||
filterAttrs
|
||||
mapAttrs'
|
||||
nameValuePair
|
||||
;
|
||||
inherit (lib.lists)
|
||||
elem
|
||||
flatten
|
||||
optional
|
||||
optionals
|
||||
;
|
||||
inherit (lib.lists) flatten optional optionals;
|
||||
inherit (lib.modules) mkIf mkRemovedOptionModule;
|
||||
inherit (lib.options)
|
||||
literalExpression
|
||||
@@ -23,7 +29,7 @@ let
|
||||
mkOption
|
||||
mkPackageOption
|
||||
;
|
||||
inherit (lib.strings) concatMapStringsSep hasPrefix optionalString;
|
||||
inherit (lib.strings) hasPrefix optionalString;
|
||||
inherit (lib.types)
|
||||
attrsOf
|
||||
bool
|
||||
@@ -32,17 +38,6 @@ let
|
||||
;
|
||||
|
||||
json = pkgs.formats.json { };
|
||||
mapToFiles =
|
||||
location: config:
|
||||
concatMapAttrs (name: value: {
|
||||
"share/pipewire/${location}.conf.d/${name}.conf" = json.generate "${name}" value;
|
||||
}) config;
|
||||
extraConfigPkgFromFiles =
|
||||
locations: filesSet:
|
||||
pkgs.runCommand "pipewire-extra-config" { } ''
|
||||
mkdir -p ${concatMapStringsSep " " (l: "$out/share/pipewire/${l}.conf.d") locations}
|
||||
${concatMapStringsSep ";" ({ name, value }: "ln -s ${value} $out/${name}") (attrsToList filesSet)}
|
||||
'';
|
||||
cfg = config.services.pipewire;
|
||||
enable32BitAlsaPlugins =
|
||||
cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.pipewire != null;
|
||||
@@ -58,11 +53,24 @@ let
|
||||
|
||||
configPackages = cfg.configPackages;
|
||||
|
||||
extraConfigPkg = extraConfigPkgFromFiles [ "pipewire" "client" "jack" "pipewire-pulse" ] (
|
||||
mapToFiles "pipewire" cfg.extraConfig.pipewire
|
||||
// mapToFiles "client" cfg.extraConfig.client
|
||||
// mapToFiles "jack" cfg.extraConfig.jack
|
||||
// mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse
|
||||
extraConfigPkg = pkgs.linkFarm "pipewire-extra-config" (
|
||||
concatMapAttrs
|
||||
(
|
||||
location: config:
|
||||
mapAttrs' (
|
||||
name: value:
|
||||
nameValuePair "share/pipewire/${location}.conf.d/${name}.conf" (json.generate name value)
|
||||
) config
|
||||
)
|
||||
# cfg.extraConfig contains deprecated options, i.e. client-rt
|
||||
{
|
||||
inherit (cfg.extraConfig)
|
||||
pipewire
|
||||
client
|
||||
jack
|
||||
pipewire-pulse
|
||||
;
|
||||
}
|
||||
);
|
||||
|
||||
configs = pkgs.buildEnv {
|
||||
|
||||
@@ -6,7 +6,12 @@
|
||||
}:
|
||||
let
|
||||
cfg = config.services.gitweb;
|
||||
|
||||
cfgNginx = config.services.gitweb.nginx;
|
||||
package = pkgs.gitweb.override (
|
||||
lib.optionalAttrs cfg.gitwebTheme {
|
||||
gitwebTheme = true;
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
|
||||
@@ -55,6 +60,104 @@ in
|
||||
internal = true;
|
||||
};
|
||||
|
||||
nginx = {
|
||||
enable = lib.mkOption {
|
||||
default = false;
|
||||
type = lib.types.bool;
|
||||
description = ''
|
||||
If true, enable gitweb in nginx.
|
||||
'';
|
||||
};
|
||||
|
||||
location = lib.mkOption {
|
||||
default = "/gitweb";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Location to serve gitweb on.
|
||||
'';
|
||||
};
|
||||
|
||||
user = lib.mkOption {
|
||||
default = "nginx";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Existing user that the CGI process will belong to. (Default almost surely will do.)
|
||||
'';
|
||||
};
|
||||
|
||||
group = lib.mkOption {
|
||||
default = "nginx";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.)
|
||||
'';
|
||||
};
|
||||
|
||||
virtualHost = lib.mkOption {
|
||||
default = "_";
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
VirtualHost to serve gitweb on. Default is catch-all.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "nginx" "gitweb" "enable" ]
|
||||
[ "services" "gitweb" "nginx" "enable" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "nginx" "gitweb" "location" ]
|
||||
[ "services" "gitweb" "nginx" "location" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "nginx" "gitweb" "user" ]
|
||||
[ "services" "gitweb" "nginx" "user" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "nginx" "gitweb" "group" ]
|
||||
[ "services" "gitweb" "nginx" "group" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "nginx" "gitweb" "virtualHost" ]
|
||||
[ "services" "gitweb" "nginx" "virtualHost" ]
|
||||
)
|
||||
];
|
||||
|
||||
config = lib.mkIf cfgNginx.enable {
|
||||
|
||||
systemd.services.gitweb = {
|
||||
description = "GitWeb service";
|
||||
script = "${package}/gitweb.cgi --fastcgi --nproc=1";
|
||||
environment = {
|
||||
FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock";
|
||||
};
|
||||
serviceConfig = {
|
||||
User = cfgNginx.user;
|
||||
Group = cfgNginx.group;
|
||||
RuntimeDirectory = [ "gitweb" ];
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts.${cfgNginx.virtualHost} = {
|
||||
locations."${cfgNginx.location}/static/" = {
|
||||
alias = "${package}/static/";
|
||||
};
|
||||
locations."${cfgNginx.location}/" = {
|
||||
extraConfig = ''
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile};
|
||||
fastcgi_pass unix:/run/gitweb/gitweb.sock;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = [ ];
|
||||
|
||||
@@ -176,22 +176,32 @@ in
|
||||
StartLimitBurst = 10;
|
||||
};
|
||||
|
||||
preStart = lib.optionalString (settings != null) ''
|
||||
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
|
||||
&& [ "${toString cfg.mutableSettings}" = "1" ]; then
|
||||
# First run a schema_version update on the existing configuration
|
||||
# This ensures that both the new config and the existing one have the same schema_version
|
||||
# Note: --check-config has the side effect of modifying the file at rest!
|
||||
${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config
|
||||
preStart =
|
||||
let
|
||||
installFresh = ''
|
||||
cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
'';
|
||||
in
|
||||
lib.optionalString (settings != null) (
|
||||
if cfg.mutableSettings then
|
||||
''
|
||||
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ]; then
|
||||
# First run a schema_version update on the existing configuration
|
||||
# This ensures that both the new config and the existing one have the same schema_version
|
||||
# Note: --check-config has the side effect of modifying the file at rest!
|
||||
${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config
|
||||
|
||||
# Writing directly to AdGuardHome.yaml results in empty file
|
||||
${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
|
||||
mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
else
|
||||
cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
fi
|
||||
'';
|
||||
# Writing directly to AdGuardHome.yaml results in empty file
|
||||
${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
|
||||
mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
else
|
||||
${installFresh}
|
||||
fi
|
||||
''
|
||||
else
|
||||
installFresh
|
||||
);
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.tap;
|
||||
in
|
||||
{
|
||||
options.services.tap = {
|
||||
enable = lib.mkEnableOption "Tap, ATProtocol firehose sync utility";
|
||||
|
||||
package = lib.mkPackageOption pkgs "tap" { };
|
||||
|
||||
environmentFiles = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Files to load environment variables from. Use for secrets such as
|
||||
{env}`TAP_ADMIN_PASSWORD` that should not be readable in the Nix store.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for Tap as environment variables. See the
|
||||
[README](https://github.com/bluesky-social/indigo/blob/main/cmd/tap/README.md)
|
||||
for all available options.
|
||||
|
||||
Secrets such as {option}`settings.TAP_ADMIN_PASSWORD` should be set via
|
||||
{option}`environmentFiles` rather than here, as values set here will
|
||||
be readable in the Nix store.
|
||||
'';
|
||||
type = lib.types.submodule {
|
||||
freeformType = lib.types.attrsOf (
|
||||
lib.types.nullOr (
|
||||
lib.types.oneOf [
|
||||
lib.types.bool
|
||||
lib.types.int
|
||||
lib.types.float
|
||||
lib.types.str
|
||||
]
|
||||
)
|
||||
);
|
||||
|
||||
options = {
|
||||
TAP_BIND = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1:2480";
|
||||
description = "Address and port the HTTP server will listen on.";
|
||||
};
|
||||
|
||||
TAP_DATABASE_URL = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "sqlite:///var/lib/tap/tap.db";
|
||||
description = ''
|
||||
Database connection string. Accepts SQLite (`sqlite://path`) or
|
||||
PostgreSQL (`postgres://...`) connection strings.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.tap = {
|
||||
description = "Tap - ATProtocol firehose sync utility";
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
User = "tap";
|
||||
DynamicUser = true;
|
||||
|
||||
ExecStart = "${lib.getExe cfg.package} run";
|
||||
Environment = lib.mapAttrsToList (
|
||||
k: v: "${k}=${if lib.isBool v then lib.boolToString v else toString v}"
|
||||
) (lib.filterAttrs (_: v: v != null) cfg.settings);
|
||||
EnvironmentFile = cfg.environmentFiles;
|
||||
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
StateDirectory = "tap";
|
||||
StateDirectoryMode = "0750";
|
||||
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
ProtectSystem = "strict";
|
||||
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
|
||||
LockPersonality = true;
|
||||
NoNewPrivileges = true;
|
||||
AmbientCapabilities = "";
|
||||
CapabilityBoundingSet = "";
|
||||
RemoveIPC = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ blooym ];
|
||||
}
|
||||
@@ -80,8 +80,8 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
ExecStartPre = "${lib.getExe pkgs.tsx} ${cfg.package}/lib/src/scripts/migrate-up.script.ts";
|
||||
ExecStart = "${cfg.package}/bin/papra";
|
||||
ExecStartPre = "${lib.getExe' cfg.package "papra-migrate-up"}";
|
||||
ExecStart = "${lib.getExe' cfg.package "papra"}";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
StateDirectory = "papra";
|
||||
|
||||
@@ -412,7 +412,7 @@ let
|
||||
"
|
||||
listen ${addr}${optionalString (port != null) ":${toString port}"} quic "
|
||||
+ optionalString vhost.default "default_server "
|
||||
+ optionalString vhost.reuseport "reuseport "
|
||||
+ optionalString (vhost.reuseport && !(lib.hasPrefix "unix:" addr)) "reuseport "
|
||||
+ optionalString (extraParameters != [ ]) (
|
||||
concatStringsSep " " (
|
||||
let
|
||||
@@ -438,7 +438,7 @@ let
|
||||
+ optionalString (ssl && vhost.http2 && oldHTTP2) "http2 "
|
||||
+ optionalString ssl "ssl "
|
||||
+ optionalString vhost.default "default_server "
|
||||
+ optionalString vhost.reuseport "reuseport "
|
||||
+ optionalString (vhost.reuseport && !(lib.hasPrefix "unix:" addr)) "reuseport "
|
||||
+ optionalString proxyProtocol "proxy_protocol "
|
||||
+ optionalString (extraParameters != [ ]) (concatStringsSep " " extraParameters)
|
||||
+ ";";
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.nginx.gitweb;
|
||||
gitwebConfig = config.services.gitweb;
|
||||
package = pkgs.gitweb.override (
|
||||
optionalAttrs gitwebConfig.gitwebTheme {
|
||||
gitwebTheme = true;
|
||||
}
|
||||
);
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
options.services.nginx.gitweb = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If true, enable gitweb in nginx.
|
||||
'';
|
||||
};
|
||||
|
||||
location = mkOption {
|
||||
default = "/gitweb";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Location to serve gitweb on.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
default = "nginx";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Existing user that the CGI process will belong to. (Default almost surely will do.)
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
default = "nginx";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.)
|
||||
'';
|
||||
};
|
||||
|
||||
virtualHost = mkOption {
|
||||
default = "_";
|
||||
type = types.str;
|
||||
description = ''
|
||||
VirtualHost to serve gitweb on. Default is catch-all.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.gitweb = {
|
||||
description = "GitWeb service";
|
||||
script = "${package}/gitweb.cgi --fastcgi --nproc=1";
|
||||
environment = {
|
||||
FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock";
|
||||
};
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
RuntimeDirectory = [ "gitweb" ];
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts.${cfg.virtualHost} = {
|
||||
locations."${cfg.location}/static/" = {
|
||||
alias = "${package}/static/";
|
||||
};
|
||||
locations."${cfg.location}/" = {
|
||||
extraConfig = ''
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile};
|
||||
fastcgi_pass unix:/run/gitweb/gitweb.sock;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = [ ];
|
||||
|
||||
}
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fceumm";
|
||||
version = "0-unstable-2026-06-23";
|
||||
version = "0-unstable-2026-06-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-fceumm";
|
||||
rev = "f87bc875bd68262211e2e01ffbaf3662626a3e4f";
|
||||
hash = "sha256-TUrhDbRArO/RISZawu5p9FIZlFf8pPlBrD9WRrdSRPk=";
|
||||
rev = "6e00afac498903586330492cdd81354a6c4c0d4c";
|
||||
hash = "sha256-0WPMqXj/hNtFxUAIL16B80SxZ8FW31M4g/8wVMZLv/w=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
coreutils,
|
||||
devShellTools,
|
||||
e2fsprogs,
|
||||
pkgsBuildBuild,
|
||||
proot,
|
||||
fakeNss,
|
||||
fakeroot,
|
||||
@@ -1246,7 +1247,7 @@ rec {
|
||||
# take images can know in advance how the image is supposed to be used.
|
||||
isExe = true;
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ pkgsBuildBuild.makeWrapper ];
|
||||
inherit meta;
|
||||
}
|
||||
''
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cargo,
|
||||
cmake,
|
||||
rustc,
|
||||
@@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ppuDNObfKhneD9AlnPAvyCRHKW3BidXKglD1j/LE9CM=";
|
||||
};
|
||||
patches = [
|
||||
# Fix for this hard to debug issue in dependent packages:
|
||||
# https://github.com/corrosion-rs/corrosion/issues/588
|
||||
(fetchpatch {
|
||||
url = "https://github.com/corrosion-rs/corrosion/commit/7dab832903ddfb0f644cbd014252d477e692012b.patch";
|
||||
hash = "sha256-T9ILTfAd/i63v45YJQsz8F/P3NBwrP1mL2bKNU0NaLw=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20260611";
|
||||
version = "20260702";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-wK6PuUy+2qeh935Oz26MMjlfB+PmRSPQMIYCnBGfThE=";
|
||||
sha256 = "sha256-Jv/NYaynTvvV9zQLtvRfUBYzORWOCqP82/mVMR4Evjg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanpii";
|
||||
owner = "todotxt-rs";
|
||||
repo = "effitask";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ=";
|
||||
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
Or use it as standalone program by defining some environment variables
|
||||
like described in the projects readme.
|
||||
'';
|
||||
homepage = "https://github.com/sanpii/effitask";
|
||||
homepage = "https://github.com/todotxt-rs/effitask";
|
||||
maintainers = with lib.maintainers; [ davidak ];
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "effitask";
|
||||
|
||||
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
|
||||
version = "0.226.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
owner = "eksctl-io";
|
||||
repo = "eksctl";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XjiM4o4xJPY+ZFtvWi5K99tQaZwNxiCla/jUeQQo+5E=";
|
||||
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "CLI for Amazon EKS";
|
||||
homepage = "https://github.com/weaveworks/eksctl";
|
||||
homepage = "https://github.com/eksctl-io/eksctl";
|
||||
changelog = "https://github.com/eksctl-io/eksctl/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruslashev";
|
||||
owner = "rbakbashev";
|
||||
repo = "elfcat";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg=";
|
||||
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "ELF visualizer, generates HTML files from ELF binaries";
|
||||
homepage = "https://github.com/ruslashev/elfcat";
|
||||
homepage = "https://github.com/rbakbashev/elfcat";
|
||||
license = lib.licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ moni ];
|
||||
mainProgram = "elfcat";
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "embree";
|
||||
owner = "RenderKit";
|
||||
repo = "embree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZJItp33XUmaTk5s4AbM/uzWGxSdGh5scdZAZDBYy28M=";
|
||||
|
||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altonen";
|
||||
owner = "eepnet";
|
||||
repo = "emissary";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fLhvMzdxXAuEB99NgIfTLxYezIIZVaC8Z6snK9UUEl0=";
|
||||
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/altonen/emissary/releases/tag/${finalAttrs.version}";
|
||||
changelog = "https://github.com/eepnet/emissary/releases/tag/${finalAttrs.version}";
|
||||
description = "Rust implementation of the I2P protocol stack";
|
||||
homepage = "https://altonen.github.io/emissary/";
|
||||
license = lib.licenses.mit; # https://github.com/altonen/emissary/blob/master/LICENSE (found an apache2 as well but thats for https://github.com/altonen/emissary/commit/c4a1c849ebfceba892adce53f512f1f099721de2)
|
||||
license = lib.licenses.mit; # https://github.com/eepnet/emissary/blob/master/LICENSE (found an apache2 as well but thats for https://github.com/eepnet/emissary/commit/c4a1c849ebfceba892adce53f512f1f099721de2)
|
||||
mainProgram = "emissary-cli";
|
||||
maintainers = [ lib.maintainers.N4CH723HR3R ];
|
||||
};
|
||||
|
||||
@@ -20,7 +20,7 @@ flutter.buildFlutterApplication rec {
|
||||
version = "4.4.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
owner = "ente";
|
||||
repo = "ente";
|
||||
sparseCheckout = [ "mobile" ];
|
||||
tag = "auth-v${version}";
|
||||
@@ -94,8 +94,8 @@ flutter.buildFlutterApplication rec {
|
||||
"--dart-define=app.flavor=independent"
|
||||
];
|
||||
|
||||
# Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
|
||||
# and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
|
||||
# Based on https://github.com/ente/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
|
||||
# and https://github.com/ente/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = desktopId;
|
||||
@@ -138,7 +138,7 @@ flutter.buildFlutterApplication rec {
|
||||
Ente's 2FA app. An end-to-end encrypted, cross platform and free app for storing your 2FA codes with cloud backups. Works offline. You can even use it without signing up for an account if you don't want the cloud backups or multi-device sync.
|
||||
'';
|
||||
homepage = "https://ente.io/auth/";
|
||||
changelog = "https://github.com/ente-io/ente/releases/tag/auth-v${version}";
|
||||
changelog = "https://github.com/ente/ente/releases/tag/auth-v${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
niklaskorz
|
||||
|
||||
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
owner = "ente";
|
||||
repo = "ente";
|
||||
tag = "cli-v${finalAttrs.version}";
|
||||
hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI=";
|
||||
@@ -83,8 +83,8 @@ buildGoModule (finalAttrs: {
|
||||
longDescription = ''
|
||||
The Ente CLI is a Command Line Utility for exporting data from Ente. It also does a few more things, for example, you can use it to decrypting the export from Ente Auth.
|
||||
'';
|
||||
homepage = "https://github.com/ente-io/ente/tree/main/cli#readme";
|
||||
changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${finalAttrs.version}";
|
||||
homepage = "https://github.com/ente/ente/tree/main/cli#readme";
|
||||
changelog = "https://github.com/ente/ente/releases/tag/cli-v${finalAttrs.version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ zi3m5f ];
|
||||
mainProgram = "ente";
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.7.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
owner = "ente";
|
||||
repo = "ente";
|
||||
fetchSubmodules = true;
|
||||
sparseCheckout = [
|
||||
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
# The desktop item properties should be kept in sync with data from upstream:
|
||||
# https://github.com/ente-io/ente/blob/main/desktop/electron-builder.yml
|
||||
# https://github.com/ente/ente/blob/main/desktop/electron-builder.yml
|
||||
desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
(makeDesktopItem {
|
||||
name = "ente-desktop";
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.3.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
owner = "ente";
|
||||
repo = "ente";
|
||||
sparseCheckout = [
|
||||
"rust"
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wasm-pack
|
||||
];
|
||||
|
||||
# See: https://github.com/ente-io/ente/blob/main/web/apps/photos/.env
|
||||
# See: https://github.com/ente/ente/blob/main/web/apps/photos/.env
|
||||
env = extraBuildEnv;
|
||||
|
||||
postPatch =
|
||||
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Ente application web frontends";
|
||||
homepage = "https://ente.io/";
|
||||
changelog = "https://github.com/ente-io/ente/releases";
|
||||
changelog = "https://github.com/ente/ente/releases";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
pinpox
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "envio";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "humblepenguinn";
|
||||
repo = "envio";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-uiuJ3yFuU5S0e6SrD1C4tU5Ve/VBoGmyclbokESDZAw=";
|
||||
hash = "sha256-3bcIGQ+4abdG7Xw4Sta+I8a1XllO8h7V09egwuogcxk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eECjTnqjy38jA5kHddPaBZaZ/1ErHB7uQPbZYNFBcSU=";
|
||||
cargoHash = "sha256-QwuGpIhPS0p+TsbWdGknXcN655IP/AzE44a6m9HY8K0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
version = "0-unstable-2020-08-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cmcsun";
|
||||
owner = "chrismcfee";
|
||||
repo = "esshader";
|
||||
rev = "506eb02f3de52d3d1f4d81ac9ee145655216dee5";
|
||||
sha256 = "sha256-euxJw7CqOwi6Ndzalps37kDr5oOIL3tZICCfmxsujfk=";
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Offline ShaderToy-compatible GLSL shader viewer using OpenGL ES 2.0";
|
||||
homepage = "https://github.com/cmcsun/esshader";
|
||||
homepage = "https://github.com/chrismcfee/esshader";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ astro ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ether";
|
||||
repo = "etherpad-lite";
|
||||
repo = "etherpad";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8DCgbfp3ttpMTXS9SNkN1R63LZHaklsNHViRhmWVFuk=";
|
||||
};
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
It provides full data export capabilities, and runs on your server, under your control.
|
||||
'';
|
||||
homepage = "https://etherpad.org/";
|
||||
changelog = "https://github.com/ether/etherpad-lite/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/ether/etherpad/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
erdnaxe
|
||||
f2k1de
|
||||
|
||||
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
owner = "evcxr";
|
||||
repo = "evcxr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-8dV+NNtU4HFerrgRyc1kO+MSsMTJJItTtJylEIN014g=";
|
||||
@@ -91,7 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Evaluation context for Rust";
|
||||
homepage = "https://github.com/google/evcxr";
|
||||
homepage = "https://github.com/evcxr/evcxr";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
protoben
|
||||
|
||||
@@ -19,8 +19,8 @@ buildDotnetModule rec {
|
||||
version = "24.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EventStore";
|
||||
repo = "EventStore";
|
||||
owner = "kurrent-io";
|
||||
repo = "KurrentDB";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8/sagvMyJ1/onGMuJ28QLWI5M8dBDWyGOcZKUv3PJsQ=";
|
||||
leaveDotGit = true;
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinmoene";
|
||||
owner = "nonstd-lite";
|
||||
repo = "expected-lite";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nxwdymBNbd+RuL8rKi2Fx2gC68TnJe7WnoN0O01lecQ=";
|
||||
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = ''
|
||||
Expected objects in C++11 and later in a single-file header-only library
|
||||
'';
|
||||
homepage = "https://github.com/martinmoene/expected-lite";
|
||||
changelog = "https://github.com/martinmoene/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt";
|
||||
homepage = "https://github.com/nonstd-lite/expected-lite";
|
||||
changelog = "https://github.com/nonstd-lite/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt";
|
||||
license = lib.licenses.boost;
|
||||
maintainers = with lib.maintainers; [ azahi ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moka-project";
|
||||
owner = "snwh";
|
||||
repo = "faba-icon-theme";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation {
|
||||
version = "0-unstable-2024-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ch3n9w";
|
||||
owner = "ch4xer";
|
||||
repo = "fcitx5-Tokyonight";
|
||||
rev = "f7454ab387d6b071ee12ff7ee819f0c7030fdf2c";
|
||||
hash = "sha256-swOy0kDZUdqtC2sPSZEBLnHSs8dpQ/QfFMObI6BARfo=";
|
||||
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Fcitx5 theme based on Tokyo Night color";
|
||||
homepage = "https://github.com/ch3n9w/fcitx5-Tokyonight";
|
||||
homepage = "https://github.com/ch4xer/fcitx5-Tokyonight";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ Guanran928 ];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freundlich";
|
||||
owner = "cpreh";
|
||||
repo = "fcppt";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8dBG6LdSngsutBboqb3WVVg3ylayoUYDOJV6p/ZFkoE=";
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darbyjohnston";
|
||||
owner = "grizzlypeak3d";
|
||||
repo = "feather-tk";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-hcV99y14o3YFUtKDLEKaR7MxBB3pBdd3sferrYvtvYw=";
|
||||
@@ -90,12 +90,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Lightweight toolkit for building cross-platform applications";
|
||||
homepage = "https://github.com/darbyjohnston/feather-tk";
|
||||
homepage = "https://github.com/grizzlypeak3d/feather-tk";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ liberodark ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
badPlatforms = [
|
||||
# Broken on darwin with latest SDK, see https://github.com/darbyjohnston/feather-tk/issues/1
|
||||
# Broken on darwin with latest SDK, see https://github.com/grizzlypeak3d/feather-tk/issues/1
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
];
|
||||
};
|
||||
|
||||
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nik-rev";
|
||||
repo = "ferrishot";
|
||||
repo = "peashot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QnIHLkxqL/4s6jgIbGmzR5tqCjH7yJcfpx0AhdxqVKc=";
|
||||
};
|
||||
@@ -60,8 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Screenshot app written in Rust";
|
||||
homepage = "https://github.com/nik-rev/ferrishot";
|
||||
changelog = "https://github.com/nik-rev/ferrishot/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/nik-rev/peashot";
|
||||
changelog = "https://github.com/nik-rev/peashot/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "ferrishot";
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "6gk";
|
||||
owner = "eepykate";
|
||||
repo = "fet.sh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E=";
|
||||
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Fetch written in posix shell without any external commands";
|
||||
homepage = "https://github.com/6gk/fet.sh";
|
||||
homepage = "https://github.com/eepykate/fet.sh";
|
||||
license = lib.licenses.isc;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ elkowar ];
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "findomain";
|
||||
version = "10.0.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "findomain";
|
||||
repo = "findomain";
|
||||
@@ -25,9 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
@@ -37,12 +41,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
installManPage findomain.1
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Fastest and cross-platform subdomain enumerator";
|
||||
homepage = "https://github.com/Findomain/Findomain";
|
||||
changelog = "https://github.com/Findomain/Findomain/releases/tag/${finalAttrs.version}";
|
||||
changelog = "https://github.com/Findomain/Findomain/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "findomain";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "booniepepper";
|
||||
owner = "so-dang-cool";
|
||||
repo = "findup";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6/rQ4xNfzJQwJgrpvFRuirqlx6fVn7sLXfVRFsG3fUw=";
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/booniepepper/findup";
|
||||
homepage = "https://github.com/so-dang-cool/findup";
|
||||
description = "Search parent directories for sentinel files";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ booniepepper ];
|
||||
|
||||
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
owner = "liquidmetal-dev";
|
||||
repo = "flintlock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk=";
|
||||
|
||||
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
repo = "flux-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l+IJtFmVR3WZaFW4aaYjirTqj+X1FGLAVgbA21MHO1k=";
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
repo = "flux-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l+IJtFmVR3WZaFW4aaYjirTqj+X1FGLAVgbA21MHO1k=";
|
||||
};
|
||||
|
||||
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenderglass";
|
||||
owner = "mikolmogorov";
|
||||
repo = "flye";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZdrAxPKY3+HJ388tGCdpDcvW70mJ5wd4uOUkuufyqK8=";
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludouzi";
|
||||
owner = "fooyin";
|
||||
repo = "fooyin";
|
||||
tag = "v" + finalAttrs.version;
|
||||
hash = "sha256-sQ1zsQ/6OHGPkofiKhusCrpW2XnO+PpMvH1M2OG5Huw=";
|
||||
|
||||
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zer0-x";
|
||||
owner = "zefr0x";
|
||||
repo = "foxmarks";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6lJ9acVo444RMxc3wUakBz4zT74oNUpwoP69rdf2mmE=";
|
||||
@@ -22,8 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "CLI read-only interface for Mozilla Firefox's bookmarks";
|
||||
homepage = "https://github.com/zer0-x/foxmarks";
|
||||
changelog = "https://github.com/zer0-x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/zefr0x/foxmarks";
|
||||
changelog = "https://github.com/zefr0x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ loicreynier ];
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pseewald";
|
||||
owner = "fortran-lang";
|
||||
repo = "fprettify";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj";
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "freebayes-${finalAttrs.version}-src";
|
||||
owner = "ekg";
|
||||
owner = "freebayes";
|
||||
repo = "freebayes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "035nriknjqq8gvil81vvsmvqwi35v80q8h1cw24vd1gdyn1x7bys";
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Bayesian haplotype-based polymorphism discovery and genotyping";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/ekg/freebayes";
|
||||
homepage = "https://github.com/freebayes/freebayes";
|
||||
maintainers = with lib.maintainers; [ jdagilliland ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbsoft";
|
||||
owner = "frescobaldi";
|
||||
repo = "frescobaldi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IgvjKj0+8oNbuZ91n4O16kGXBS7rS63HQUNQnJcOis8=";
|
||||
|
||||
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kshvmdn";
|
||||
owner = "kashav";
|
||||
repo = "fsql";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs=";
|
||||
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Search through your filesystem with SQL-esque queries";
|
||||
homepage = "https://github.com/kshvmdn/fsql";
|
||||
homepage = "https://github.com/kashav/fsql";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pSub ];
|
||||
mainProgram = "fsql";
|
||||
|
||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thatvegandev";
|
||||
owner = "jrnxf";
|
||||
repo = "fsrx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Flow state reader in the terminal";
|
||||
homepage = "https://github.com/thatvegandev/fsrx";
|
||||
homepage = "https://github.com/jrnxf/fsrx";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ MoritzBoehme ];
|
||||
mainProgram = "fsrx";
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fhunleth";
|
||||
owner = "fwup-home";
|
||||
repo = "fwup";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SIRDVlC/g+rq5m4Ind7dqPzjdCjAxRK/kAdXt6byL/8=";
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
changelog = "https://github.com/fwup-home/fwup/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Configurable embedded Linux firmware update creator and runner";
|
||||
homepage = "https://github.com/fhunleth/fwup";
|
||||
homepage = "https://github.com/fwup-home/fwup";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.georgewhewell ];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -22,7 +22,7 @@ buildDotnetModule rec {
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThePBone";
|
||||
owner = "timschneeb";
|
||||
repo = "GalaxyBudsClient";
|
||||
tag = version;
|
||||
hash = "sha256-jPVrSkf6Bybwc5glkxId5VeWkwLBoTjOzM3CCgO6h9I=";
|
||||
@@ -85,7 +85,7 @@ buildDotnetModule rec {
|
||||
|
||||
meta = {
|
||||
description = "Unofficial Galaxy Buds Manager";
|
||||
homepage = "https://github.com/ThePBone/GalaxyBudsClient";
|
||||
homepage = "https://github.com/timschneeb/GalaxyBudsClient";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ icy-thought ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "makeworld-the-better-one";
|
||||
owner = "makew0rld";
|
||||
repo = "gemget";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-P5+yRaf2HioKOclJMMm8bJ8/BtBbNEeYU57TceZVqQ8=";
|
||||
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Command line downloader for the Gemini protocol";
|
||||
homepage = "https://github.com/makeworld-the-better-one/gemget";
|
||||
homepage = "https://github.com/makew0rld/gemget";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ amfl ];
|
||||
mainProgram = "gemget";
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielDent";
|
||||
owner = "git-annex-remote-rclone";
|
||||
repo = "git-annex-remote-rclone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B6x67XXE4BHd3x7a8pQlqPPmpy0c62ziDAldB4QpqQ4=";
|
||||
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/DanielDent/git-annex-remote-rclone";
|
||||
homepage = "https://github.com/git-annex-remote-rclone/git-annex-remote-rclone";
|
||||
description = "Use rclone supported cloud storage providers with git-annex";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MichaelMure";
|
||||
owner = "git-bug";
|
||||
repo = "git-bug-migration";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
|
||||
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Tool for upgrading repositories using git-bug to new versions";
|
||||
homepage = "https://github.com/MichaelMure/git-bug-migration";
|
||||
homepage = "https://github.com/git-bug/git-bug-migration";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
DeeUnderscore
|
||||
|
||||
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlange-42";
|
||||
owner = "git-bahn";
|
||||
repo = "git-graph";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9GFwxWYDnH3kKDWpxgh7ciSLB1Zr2zExxIrIrhycmZY=";
|
||||
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Command line tool to show clear git graphs arranged for your branching model";
|
||||
homepage = "https://github.com/mlange-42/git-graph";
|
||||
homepage = "https://github.com/git-bahn/git-graph";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
cafkafk
|
||||
|
||||
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlange-42";
|
||||
owner = "git-bahn";
|
||||
repo = "git-igitt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5AVKBew+HShWFZwm4xRmRSL76N2c84Yi97jgcqsslxM=";
|
||||
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Interactive, cross-platform Git terminal application with clear git graphs arranged for your branching model";
|
||||
homepage = "https://github.com/mlange-42/git-igitt";
|
||||
homepage = "https://github.com/git-bahn/git-igitt";
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
maintainers = [ lib.maintainers.pinage404 ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "git-pkgs";
|
||||
version = "0.16.2";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-pkgs";
|
||||
repo = "git-pkgs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6AhA4CG4q6ujM3JSz5aUXvVG7vC5mL8DGiF4dO2kU3k=";
|
||||
hash = "sha256-4Q95ONe6tcrUk7TsxR347PAFQ/HuMjcqNfCLo6oZtws=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uram6wb0nTxVDy8PQa3R4os620S/XuDcTZkMhwNhd3A=";
|
||||
vendorHash = "sha256-YjKktBQT62htk/nqZp9quKEg4eI3vTz6AY64o9IT3/4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "git-quick-stats";
|
||||
owner = "arzzen";
|
||||
owner = "git-quick-stats";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-YVvlrlNRDDci7fH9LW4NxZcIkakVgvKe9FhJ2gCfoXg=";
|
||||
};
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/arzzen/git-quick-stats";
|
||||
homepage = "https://github.com/git-quick-stats/git-quick-stats";
|
||||
description = "Simple and efficient way to access various statistics in git repository";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.kmein ];
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
owner = "aosp-mirror";
|
||||
repo = "tools_repo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5ffk5B4ZA/Wy2bQNahFaXPFRSZdKz5t6TaGbN00mfxo=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-spice";
|
||||
version = "0.29.2";
|
||||
version = "0.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abhinav";
|
||||
repo = "git-spice";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZwhbsSFnzKZv8iEgI9tO2tekmzT7mh7w0+PXDyucuLw=";
|
||||
hash = "sha256-zqHTbsK/vIeNKfvIH8funMLD0ehercVkufIYcRZ7VD0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t7nfOTHncSLounY1zR4idAmDmqj9znR2IUQA2xt0Drs=";
|
||||
vendorHash = "sha256-dCAgnfnwDudTUsQE/RapWslnz/MtefdlzqneRbWrLmc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "petervanderdoes";
|
||||
repo = "gitflow";
|
||||
repo = "gitflow-avh";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";
|
||||
};
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/petervanderdoes/gitflow";
|
||||
homepage = "https://github.com/petervanderdoes/gitflow-avh";
|
||||
description = "Extend git with the Gitflow branching model";
|
||||
mainProgram = "git-flow";
|
||||
longDescription = ''
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.6.3-unstable-2025-09-11"; # cmake does not install correctly on tagged release
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "francescmm";
|
||||
owner = "francescmaestre";
|
||||
repo = "gitqlient";
|
||||
rev = "faa3e2c19205123944bb88427a569c6f1b4366a1";
|
||||
fetchSubmodules = true;
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
version = "unstable-2025-12-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimevins";
|
||||
owner = "j-evins";
|
||||
repo = "glabels-qt";
|
||||
tag = "3.99-master602";
|
||||
hash = "sha256-7MQufoU1GBvmZd8FRn331/PwmwQMuZeuFKQqViRI754=";
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "GLabels Label Designer (Qt/C++)";
|
||||
homepage = "https://github.com/jimevins/glabels-qt";
|
||||
homepage = "https://github.com/j-evins/glabels-qt";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.matthewcroughan ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wacossusca34";
|
||||
owner = "jarcode-foss";
|
||||
repo = "glava";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i";
|
||||
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
OpenGL audio spectrum visualizer
|
||||
'';
|
||||
mainProgram = "glava";
|
||||
homepage = "https://github.com/wacossusca34/glava";
|
||||
homepage = "https://github.com/jarcode-foss/glava";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seeyebe";
|
||||
owner = "marawny";
|
||||
repo = "gmap";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+klVySOgI/M57f98Cx3omkEBx/NcaWD4FuIW6cz1aN8=";
|
||||
@@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
Built for developers who live in the CLI and want quick,
|
||||
powerful insights.
|
||||
'';
|
||||
homepage = "https://github.com/seeyebe/gmap";
|
||||
changelog = "https://github.com/seeyebe/gmap/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/marawny/gmap";
|
||||
changelog = "https://github.com/marawny/gmap/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
mainProgram = "gmap";
|
||||
|
||||
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
|
||||
version = "unstable-2021-04-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ptomato";
|
||||
repo = "gnome-inform7";
|
||||
repo = "inform7-ide";
|
||||
# build from revision in the GTK3 branch as mainline requires webkit-1.0
|
||||
rev = "c37e045c159692aae2e4e79b917e5f96cfefa66a";
|
||||
sha256 = "Q4xoITs3AYXhvpWaABRAvJaUWTtUl8lYQ1k9zX7FrNw=";
|
||||
@@ -143,7 +143,7 @@ stdenv.mkDerivation {
|
||||
longDescription = ''
|
||||
This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter.
|
||||
'';
|
||||
homepage = "https://github.com/ptomato/gnome-inform7";
|
||||
homepage = "https://github.com/ptomato/inform7-ide";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.fitzgibbon ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
|
||||
version = "0.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnome-pomodoro";
|
||||
repo = "gnome-pomodoro";
|
||||
owner = "focustimerhq";
|
||||
repo = "FocusTimer";
|
||||
rev = version;
|
||||
hash = "sha256-1G0Sv6uR4rE+/TZqEM57mCdBaXoJNpC0cznY4pnPEa4=";
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@ buildGoModule {
|
||||
version = "unstable-2022-08-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "L11R";
|
||||
owner = "savely-krasovsky";
|
||||
repo = "go-autoconfig";
|
||||
rev = "b1b182202da82cc881dccd715564853395d4f76a";
|
||||
sha256 = "sha256-Rbg6Ghp5NdcLSLSIhwwFFMKmZPWsboDyHCG6ePqSSZA=";
|
||||
@@ -23,7 +23,7 @@ buildGoModule {
|
||||
|
||||
meta = {
|
||||
description = "IMAP/SMTP autodiscover feature for Thunderbird, Apple Mail and Microsoft Outlook";
|
||||
homepage = "https://github.com/L11R/go-autoconfig";
|
||||
homepage = "https://github.com/savely-krasovsky/go-autoconfig";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
mainProgram = "go-autoconfig";
|
||||
|
||||
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmachard";
|
||||
repo = "go-dnscollector";
|
||||
repo = "DNS-collector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gm5PXEEgw98NnsfKN8JxhyTqEL9KSA6L2CgRTRJirdY=";
|
||||
};
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata";
|
||||
homepage = "https://github.com/dmachard/go-dnscollector";
|
||||
homepage = "https://github.com/dmachard/DNS-collector";
|
||||
changelog = "https://github.com/dmachard/DNS-collector/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ shift ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "goshs";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patrickhener";
|
||||
repo = "goshs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bAYnwOg7CHZOKHl8pCC2IDdCkUGsw0A3e47gSuGwuig=";
|
||||
hash = "sha256-8xSYdLO+2AB044sV3JJw0RXB0RuLQ7eIzWvwgoJdp5k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CAl4yYAM/GQaLbUUNjgMN6A3Vqw4D+kpG9G2WXw6mRU=";
|
||||
vendorHash = "sha256-yKNJHs6A7Du9NvGOpwaDmABz6SBMPVzJNoQb7W32IfA=";
|
||||
|
||||
ldflags = [ "-s" ];
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
pkg-config,
|
||||
protobuf,
|
||||
fontconfig,
|
||||
libgit2,
|
||||
openssl,
|
||||
sqlite,
|
||||
zlib,
|
||||
@@ -31,7 +30,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gram";
|
||||
version = "2.2.0";
|
||||
version = "3.0.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -44,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "GramEditor";
|
||||
repo = "gram";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-w0uZ2qAc3Tt6QVRAX97LWW9aOs02fG1SEYCDhpUhinE=";
|
||||
hash = "sha256-B3RmY1h0+D0aawNzevdt9f+gzozckjInhoz+t9taf8o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -54,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-+lmDbawAIRllC7LzGJ9qPMtHXPd5aMoul47YOA7nfXA=";
|
||||
cargoHash = "sha256-pK0rUuPtWejXitbDQqh9fvdEv3aza0ZEg1XWnCmY4eE=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -71,7 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
(libgit2.override { withExperimentalSha256 = true; })
|
||||
openssl
|
||||
sqlite
|
||||
zlib
|
||||
@@ -89,16 +87,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals buildRemoteServer [ "--package=remote_server" ];
|
||||
|
||||
# Required on darwin because we don't have access to the proprietary Metal shader compiler.
|
||||
buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
|
||||
|
||||
env = {
|
||||
ALLOW_MISSING_LICENSES = true;
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
LIBGIT2_NO_VENDOR = true;
|
||||
LIBSQLITE3_SYS_USE_PKG_CONFIG = true;
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
RELEASE_VERSION = finalAttrs.version;
|
||||
GRAM_UPDATE_EXPLANATION = "Updates are handled by nixpkgs";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
pkg-config,
|
||||
python3,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
cargo,
|
||||
|
||||
# buildInputs
|
||||
qt6,
|
||||
libarchive,
|
||||
corrosion,
|
||||
hunspell,
|
||||
|
||||
# checkInputs
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "katvan";
|
||||
version = "0.12.1";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IgKh";
|
||||
repo = "katvan";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WyPiRj/5So/1vjAytnXoldwYMG++tuLl0B0v31BeJxY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-p5cMFCuDy17uMoy99R8l+e6iQcbNXSavFj0sBRRsMwo=";
|
||||
};
|
||||
|
||||
# The CMakeLists files used by upstream issue a `cargo install` command to
|
||||
# install a rust tool (cxxbridge-cmd) that is supposed to be included in the Cargo.toml's and
|
||||
# `Cargo.lock` files of upstream. Setting CARGO_HOME like that helps `cargo
|
||||
# install` find the dependencies we prefetched. See also:
|
||||
# https://github.com/GothenburgBitFactory/taskwarrior/issues/3705
|
||||
postUnpack = ''
|
||||
export CARGO_HOME=$PWD/.cargo
|
||||
'';
|
||||
|
||||
cargoRoot = "typstdriver/rust";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qt6.wrapQtAppsHook
|
||||
qt6.qttools
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
(python3.withPackages (ps: [
|
||||
ps.mistletoe
|
||||
]))
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
libarchive
|
||||
corrosion
|
||||
hunspell
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Don't set this to an absolute path, as it breaks upstream rpath settings
|
||||
# for the final executable, see: https://github.com/IgKh/katvan/issues/46
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "bare-bones editor for Typst files, with a bias for Right-to-Left editing";
|
||||
homepage = "https://github.com/IgKh/katvan";
|
||||
changelog = "https://github.com/IgKh/katvan/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
mainProgram = "katvan";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,98 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
arpa2cm,
|
||||
arpa2common,
|
||||
bison,
|
||||
cacert,
|
||||
cmake,
|
||||
cyrus_sasl,
|
||||
e2fsprogs,
|
||||
flex,
|
||||
freediameter,
|
||||
gnutls,
|
||||
json_c,
|
||||
libev,
|
||||
libkrb5,
|
||||
libressl,
|
||||
openssl,
|
||||
pkg-config,
|
||||
python3,
|
||||
quick-sasl,
|
||||
quickder,
|
||||
quickmem,
|
||||
unbound,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
python-with-packages = python3.withPackages (
|
||||
ps: with ps; [
|
||||
asn1ate
|
||||
colored
|
||||
pyparsing
|
||||
setuptools
|
||||
six
|
||||
]
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kip";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "kip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-A+tPaImjd9j1Vq69Dgh3j86xI/OcovwTZSULLkOVZaI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cacert
|
||||
cmake
|
||||
cyrus_sasl
|
||||
flex
|
||||
libkrb5
|
||||
openssl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
arpa2cm
|
||||
arpa2common
|
||||
cyrus_sasl
|
||||
e2fsprogs
|
||||
freediameter
|
||||
gnutls
|
||||
json_c
|
||||
libev
|
||||
libkrb5
|
||||
libressl
|
||||
python-with-packages
|
||||
quick-sasl
|
||||
quickder
|
||||
quickmem
|
||||
unbound
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "freeDiameter_EXTENSION_DIR" "${placeholder "out"}/lib/freeDiameter")
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs test
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Keyful Identity Protocol — symmetric-key encryption and signing via an online KIP Service";
|
||||
homepage = "https://gitlab.com/arpa2/kip";
|
||||
license = lib.licenses.bsd2;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
})
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubebuilder";
|
||||
version = "4.13.1";
|
||||
version = "4.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WOqrQb2haoEp57OHFo1Y1fon0lJedI/hEYKE4xrIbpM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iTC5HY4E54YG+isSgW2515Kz83+khzANAml78z8EG88=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1lbf1hXJfhdTu6Gm7dcbJlB3beITxBD83gMltZgg7Pg=";
|
||||
vendorHash = "sha256-7rXunagWkUWGL5v+xkmyLELwrIEuRVGPk4SK8/lotio=";
|
||||
|
||||
subPackages = [
|
||||
"internal/cli/cmd"
|
||||
@@ -69,6 +69,8 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/kubernetes-sigs/kubebuilder";
|
||||
changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
hythera
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mariadb-galera";
|
||||
version = "26.4.24";
|
||||
version = "26.4.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codership";
|
||||
repo = "galera";
|
||||
tag = "release_${finalAttrs.version}";
|
||||
hash = "sha256-mpf+YY0m+UwvemdZt6SfRP9IJlq5IZtlOJMucADc1oM=";
|
||||
hash = "sha256-Z1UtNM7HPcbFMr35JVJZCxPl43ZQxy+eBkiQFoVmFhY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
electron_40,
|
||||
electron_41,
|
||||
makeWrapper,
|
||||
testers,
|
||||
mattermost-desktop,
|
||||
@@ -10,21 +10,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_41;
|
||||
in
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mattermost-desktop";
|
||||
version = "6.1.2";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EI1bDSiWdLCXlhUk1CmbUyYU7giey366cZLuhs0qtqY=";
|
||||
hash = "sha256-KSyFJrYy+pueSrX20SPBoudWfiHmy5L2O8TdzLJRiYk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-7XUZ2rt2fZiQNpW8iHnNDbCSuK4/srWqIEKOKM6xty8=";
|
||||
npmDepsHash = "sha256-70TBP4iDKuF4X9Tf0tsbUQ3N7bluoPn65OdfdcWin4Y=";
|
||||
npmBuildScript = "build-prod";
|
||||
makeCacheWritable = true;
|
||||
|
||||
@@ -47,7 +47,7 @@ buildNpmPackage rec {
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
npm exec electron-builder -- \
|
||||
--config electron-builder.json \
|
||||
--config electron-builder.ts \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mcat-unwrapped";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skardyy";
|
||||
repo = "mcat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zedVMX3JV0jHSUzSY3x9Olimy4Y6GrNVGRSc6Eev9ow=";
|
||||
hash = "sha256-7QjnbdxUFeRDkIGnAcY2Wf8fLKuj1RuVbu0SUebOc5A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-szqXS2CRfHoCtt6Lq1DuVb199mIuf7HUPiN7fj5BGtc=";
|
||||
cargoHash = "sha256-JnSycAz/jFs9JgA3tqYZn64yNK0bv5SXEYyUOXjC4ug=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -45,7 +45,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "murmure";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Kieirra";
|
||||
repo = "murmure";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Yh1XWpwTKrYIPhbOqi0XGfqV+kVB/QVXX4y7Hb+iqrM=";
|
||||
hash = "sha256-zJ9OvpAfREyDWDISKYKCUyQSWdkQlVrSzX+wvwKk6Yk=";
|
||||
};
|
||||
|
||||
# The libappindicator_sys crate loads these libraries at runtime
|
||||
@@ -71,13 +71,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src
|
||||
;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Jtd+sxpievLyNozMJW6JAHQEKA6UVPvgLEB/3Q2Pl/s=";
|
||||
hash = "sha256-BPukv+nFcXncEwRvBd5JEmUNsX3JIXYldbaOGXakhJA=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-PRp04YHkifhFY9W03IQDu9Dd8y05zd4d9o8CDySf+Nw=";
|
||||
cargoHash = "sha256-wV0drkKgn58Yxjy+Mv2QLTQXTDwWk6/uEfk76HaMuow=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "nano-syntax-highlighting";
|
||||
version = "2026.05.01";
|
||||
version = "2026.07.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galenguyer";
|
||||
repo = "nano-syntax-highlighting";
|
||||
tag = version;
|
||||
hash = "sha256-ipnePkQEDfJ7T3GJ84D6bmo9KZ2AUkJ8aUqH0rPCsps=";
|
||||
hash = "sha256-tcRNoeg0j/z9wFZjIc1CJXOKieWrvlLq9pblB0kE6yc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -73,13 +73,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.74.0";
|
||||
version = "0.74.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lichQPWqlphUjod3nsqJokDFIIEiwIykc9fWjSn5fzs=";
|
||||
hash = "sha256-+BGWZzw6a8Fp8NlhtbX81OA3hCTcQ9r6nLuXTsbXCZ8=";
|
||||
};
|
||||
|
||||
overrideModAttrs = final: prev: {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "netbox-documents";
|
||||
version = "0.8.2";
|
||||
version = "0.8.4";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "jasonyates";
|
||||
repo = "netbox-documents";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XFVfNLU9a/0tQAVTrN2B1Oia/isOD8G5BdA3fVUn2sM=";
|
||||
hash = "sha256-6t7r/98UILL73JT1TwUBAqygQOtOWj1s1bY7IbRcUKQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -494,9 +494,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
||||
'</div>'
|
||||
)
|
||||
nav = render_entries(root.children, self._html_params.sidebar_depth)
|
||||
figures = build_list("Figures", "list-of-figures", root.figures)
|
||||
examples = build_list("Examples", "list-of-examples", root.examples)
|
||||
return f'{nav}{figures}{examples}'
|
||||
return f'{nav}'
|
||||
|
||||
def _make_hN(self, level: int) -> tuple[str, str]:
|
||||
# book heading := h1
|
||||
|
||||
@@ -3,13 +3,12 @@ from __future__ import annotations
|
||||
import dataclasses as dc
|
||||
import html
|
||||
import itertools
|
||||
|
||||
from typing import cast, get_args, Iterable, Literal, Sequence
|
||||
from typing import Iterable, Literal, Sequence, cast, get_args
|
||||
|
||||
from markdown_it.token import Token
|
||||
|
||||
from .utils import Freezeable
|
||||
from .src_error import SrcError
|
||||
from .utils import Freezeable
|
||||
|
||||
# FragmentType is used to restrict structural include blocks.
|
||||
FragmentType = Literal['preface', 'part', 'chapter', 'section', 'appendix']
|
||||
@@ -146,8 +145,6 @@ class TocEntry(Freezeable):
|
||||
next: TocEntry | None = None
|
||||
children: list[TocEntry] = dc.field(default_factory=list)
|
||||
starts_new_chunk: bool = False
|
||||
examples: list[TocEntry] = dc.field(default_factory=list)
|
||||
figures: list[TocEntry] = dc.field(default_factory=list)
|
||||
|
||||
@property
|
||||
def root(self) -> TocEntry:
|
||||
@@ -162,7 +159,7 @@ class TocEntry(Freezeable):
|
||||
|
||||
@classmethod
|
||||
def collect_and_link(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token]) -> TocEntry:
|
||||
entries, examples, figures = cls._collect_entries(xrefs, tokens, 'book')
|
||||
entries = cls._collect_entries(xrefs, tokens, 'book')
|
||||
|
||||
def flatten_with_parent(this: TocEntry, parent: TocEntry | None) -> Iterable[TocEntry]:
|
||||
this.parent = parent
|
||||
@@ -179,9 +176,6 @@ class TocEntry(Freezeable):
|
||||
prev = c
|
||||
paths_seen.add(c.target.path)
|
||||
|
||||
flat[0].examples = examples
|
||||
flat[0].figures = figures
|
||||
|
||||
for c in flat:
|
||||
c.freeze()
|
||||
|
||||
@@ -189,37 +183,30 @@ class TocEntry(Freezeable):
|
||||
|
||||
@classmethod
|
||||
def _collect_entries(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token],
|
||||
kind: TocEntryType) -> tuple[TocEntry, list[TocEntry], list[TocEntry]]:
|
||||
kind: TocEntryType) -> TocEntry:
|
||||
# we assume that check_structure has been run recursively over the entire input.
|
||||
# list contains (tag, entry) pairs that will collapse to a single entry for
|
||||
# the full sequence.
|
||||
entries: list[tuple[str, TocEntry]] = []
|
||||
examples: list[TocEntry] = []
|
||||
figures: list[TocEntry] = []
|
||||
for token in tokens:
|
||||
if token.type.startswith('included_') and (included := token.meta.get('included')):
|
||||
fragment_type_str = token.type[9:].removesuffix('s')
|
||||
assert fragment_type_str in get_args(TocEntryType)
|
||||
fragment_type = cast(TocEntryType, fragment_type_str)
|
||||
for fragment, _path in included:
|
||||
subentries, subexamples, subfigures = cls._collect_entries(xrefs, fragment, fragment_type)
|
||||
subentries = cls._collect_entries(xrefs, fragment, fragment_type)
|
||||
entries[-1][1].children.append(subentries)
|
||||
examples += subexamples
|
||||
figures += subfigures
|
||||
elif token.type == 'heading_open' and (id := cast(str, token.attrs.get('id', ''))):
|
||||
while len(entries) > 1 and entries[-1][0] >= token.tag:
|
||||
entries[-2][1].children.append(entries.pop()[1])
|
||||
entries.append((token.tag,
|
||||
TocEntry(kind if token.tag == 'h1' else 'section', xrefs[id])))
|
||||
token.meta['TocEntry'] = entries[-1][1]
|
||||
elif token.type == 'example_open' and (id := cast(str, token.attrs.get('id', ''))):
|
||||
examples.append(TocEntry('example', xrefs[id]))
|
||||
elif token.type == 'figure_open' and (id := cast(str, token.attrs.get('id', ''))):
|
||||
figures.append(TocEntry('figure', xrefs[id]))
|
||||
|
||||
|
||||
while len(entries) > 1:
|
||||
entries[-2][1].children.append(entries.pop()[1])
|
||||
return (entries[0][1], examples, figures)
|
||||
return entries[0][1]
|
||||
|
||||
_xml_id_translate_table = {
|
||||
ord('*'): ord('_'),
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "objfw";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.nil.im";
|
||||
owner = "ObjFW";
|
||||
repo = "ObjFW";
|
||||
rev = "${finalAttrs.version}-release";
|
||||
hash = "sha256-0tmttbuzEOqjvpjnreKttQRIabt+ZxRjDh7x8VZo/EQ=";
|
||||
hash = "sha256-9wrsRi3HnAhDbWsK8AcKBesFANvBLkGvgaE/mOK5KSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -60,15 +60,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "orca-slicer";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OrcaSlicer";
|
||||
repo = "OrcaSlicer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ogo+Xuz7yBz9POVKfLofnxwIQavkApPzTIdp/Phu/UU=";
|
||||
hash = "sha256-NJvJAQfkacMjMIirAoOND/G1GaXeMcNleiGQKoe+654=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "overturemaps";
|
||||
version = "0.20.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rvc1MpqCdRGuMWS5CSDev9SFgyVX8VczopXU/lWAyxg=";
|
||||
hash = "sha256-yKl13Y9kRCGHzoqeZIQEac/PrByTCtCQFaz8sUgeVIs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
@@ -20,13 +20,19 @@ python3Packages.buildPythonPackage rec {
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
click
|
||||
colorama
|
||||
geopandas
|
||||
numpy
|
||||
orjson
|
||||
pyarrow
|
||||
pyfiglet
|
||||
shapely
|
||||
tqdm
|
||||
];
|
||||
|
||||
# Drop once tqdm 4.67.3 reaches master
|
||||
pythonRelaxDeps = [ "tqdm" ];
|
||||
|
||||
pythonImportsCheck = [ "overturemaps" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "paper-mono";
|
||||
version = "0.300";
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/paper-design/paper-mono/releases/download/v${finalAttrs.version}/paper-mono-v${finalAttrs.version}.zip";
|
||||
hash = "sha256-coWJoVnVrzap8iG5UV84UVQOSDQzgF+a9G5/pn8nD6A=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Beautiful monospace font for design and code by Paper";
|
||||
homepage = "https://github.com/paper-design/paper-mono";
|
||||
changelog = "https://github.com/paper-design/paper-mono/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
nodejs_26,
|
||||
nodejs-slim_26,
|
||||
node-gyp,
|
||||
fetchPnpmDeps,
|
||||
fetchFromGitHub,
|
||||
pnpm_10,
|
||||
pnpm_11,
|
||||
pnpmConfigHook,
|
||||
stdenv,
|
||||
lib,
|
||||
@@ -12,26 +13,29 @@
|
||||
pkg-config,
|
||||
python3,
|
||||
nix-update-script,
|
||||
tsx,
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_26; };
|
||||
nodejs = nodejs_26;
|
||||
tsx' = tsx.override { nodejs-slim_24 = nodejs-slim_26; };
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papra";
|
||||
version = "26.4.0";
|
||||
version = "26.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "papra-hq";
|
||||
repo = "papra";
|
||||
tag = "@papra/app@${finalAttrs.version}";
|
||||
hash = "sha256-wQdDBS+QRarZhEIRmLQ4VRtq73I5YFIN2P3ZtAZWvxw=";
|
||||
hash = "sha256-BOeApLfB1NR07izBM3ChHqzgGx3xf1NkAXqKVeMzqx4=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU=";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-J1syB5X+sI40iPlqDVABqeWDiBjKGP3qQRIh5w3GRUU=";
|
||||
pnpmWorkspaces = [
|
||||
"@papra/app-client..."
|
||||
"@papra/app-server..."
|
||||
@@ -64,12 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm config set inject-workspace-packages true
|
||||
|
||||
pushd node_modules/sharp
|
||||
pnpm run install
|
||||
popd
|
||||
|
||||
pnpm --filter "@papra/app-client..." run build
|
||||
pnpm --filter "@papra/app-server..." run build
|
||||
|
||||
@@ -81,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
mkdir -p $out/{bin,lib}
|
||||
|
||||
pnpm deploy --filter=@papra/app-server --prod $out/lib/
|
||||
pnpm config set --location=project injectWorkspacePackages true
|
||||
pnpm deploy --ignore-script --filter=@papra/app-server --prod $out/lib/
|
||||
|
||||
mkdir -p $out/lib/public
|
||||
cp -r apps/papra-client/dist/* $out/lib/public/
|
||||
@@ -90,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--add-flags "$out/lib/dist/index.js" \
|
||||
--set "NODE_PATH" $out/lib/node_modules
|
||||
|
||||
makeWrapper "${lib.getExe tsx'}" $out/bin/papra-migrate-up \
|
||||
--add-flags "$out/lib/src/scripts/migrate-up.script.ts"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
electron_40,
|
||||
electron_42,
|
||||
}:
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_42;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "pocket-casts";
|
||||
|
||||
@@ -1,25 +1,23 @@
|
||||
{
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pyroscope";
|
||||
version = "1.20.3";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "pyroscope";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IZA6xaZgjcS/3QBsz2L12QEBeCzRFAv+Qpag+O4aOVI=";
|
||||
hash = "sha256-7bY3qmN05m/OxFyDxdwlxsvYrwzhdbkX0XhGqOzCZSA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hy/MM/VOy182MM+Fd+PDVivHwduG2zkBUOWqOnFtWRI=";
|
||||
vendorHash = "sha256-UGWfrnpTgzR09T5jDL24d/Bs8+HBWi4g1YzZyy7ULWY=";
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [
|
||||
@@ -28,10 +26,10 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-X=github.com/grafana/pyroscope/pkg/util/build.Branch=${finalAttrs.src.rev}"
|
||||
"-X=github.com/grafana/pyroscope/pkg/util/build.Version=${finalAttrs.version}"
|
||||
"-X=github.com/grafana/pyroscope/pkg/util/build.Revision=${finalAttrs.src.rev}"
|
||||
"-X=github.com/grafana/pyroscope/pkg/util/build.BuildDate=1970-01-01T00:00:00Z"
|
||||
"-X=github.com/grafana/pyroscope/v2/pkg/util/build.Branch=${finalAttrs.src.rev}"
|
||||
"-X=github.com/grafana/pyroscope/v2/pkg/util/build.Version=${finalAttrs.version}"
|
||||
"-X=github.com/grafana/pyroscope/v2/pkg/util/build.Revision=${finalAttrs.src.rev}"
|
||||
"-X=github.com/grafana/pyroscope/v2/pkg/util/build.BuildDate=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
# We're overriding the version in 'ldFlags', so we should check that the
|
||||
@@ -40,14 +38,6 @@ buildGoModule (finalAttrs: {
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd pyroscope \
|
||||
--bash <($out/bin/pyroscope completion bash) \
|
||||
--fish <($out/bin/pyroscope completion fish) \
|
||||
--zsh <($out/bin/pyroscope completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "scitokens-cpp";
|
||||
version = "1.3.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scitokens";
|
||||
repo = "scitokens-cpp";
|
||||
|
||||
rev = "v1.3.0";
|
||||
hash = "sha256-C+7tS7Mbcjt4i2SHyinNTqjO+ODsyg9zFdX8HRhhPLk=";
|
||||
rev = "v1.4.1";
|
||||
hash = "sha256-qZUW+b8drIAm21baUO1+O39O9FPP2McmdjsfGTRGRfQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
pnpmConfigHook,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "shelter";
|
||||
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_10
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -29,9 +29,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-tYeV62IZes8O5rN9uvpx0K72B88gftqpL2VXrOUxI8s=";
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-d8GGz/2aCv2YV6CIxs1vkUfjYrhzsc8LyJX2sXgelig=";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
electron_40,
|
||||
electron_42,
|
||||
cacert,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
commandLineArgs ? [ ],
|
||||
@@ -17,20 +18,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_40;
|
||||
electron = electron_42;
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "shogihome";
|
||||
version = "1.27.3";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunfish-shogi";
|
||||
repo = "shogihome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-25Iu/bKUCotJdQESxPPOiYehwn+D3RYnZiJfMWJ4cn0=";
|
||||
hash = "sha256-icFWpyfdnm0wIkTVa2ijcnBcDmxrutV38vN3/8AY4cg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-gWI21dPha7yX367r50U3C9wpX5/6oBzHGJNtFmG/GQ8=";
|
||||
npmDepsHash = "sha256-SSpw8bBbf6saWwR3ZpqMrbrdjDJTCeARBAlHO65O+Zc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
@@ -50,6 +51,11 @@ buildNpmPackage (finalAttrs: {
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
npm_config_build_from_source = "true";
|
||||
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Prevent "unable to get local issuer certificate" error
|
||||
NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "smfh";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feel-co";
|
||||
repo = "smfh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RgszLC/p9uov6aXnPGbFRkPzT5xleX17wBCdoMT1wcA=";
|
||||
hash = "sha256-mP/ln+GkafKSnK4LIrAZY45OZYErQFehHUKmBRhHJY4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7IcoDgRvpye2lm+bdPlVKj0GO6QBABiQKVwSxL4Mh5k=";
|
||||
cargoHash = "sha256-6kybKx2aZ0pTr0yXPawqTnJVntL1NNCkgEvRFQEwtCk=";
|
||||
|
||||
meta = {
|
||||
description = "Sleek Manifest File Handler";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stalwart-cli";
|
||||
version = "1.0.9";
|
||||
version = "1.0.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SZefTApX3FT6M7Zr3CAIfZfgkECJb54xTGdoPPII8Q4=";
|
||||
hash = "sha256-9fB9qkRtXIL/8qROl3FiK0w5XUA+nDVjxi1+dhwtxJM=";
|
||||
};
|
||||
cargoHash = "sha256-D6TN5IIlX9PL2+qP0e8QBoalgfgN+xT2poD7wMh5TB8=";
|
||||
cargoHash = "sha256-91S7XMbNClc349AvXixQdBnPV5+3G1RA5fpfNUfFmwk=";
|
||||
__structuredAttrs = true;
|
||||
# `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") })
|
||||
nativeCheckInputs = [ cacert ];
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{
|
||||
version = "1.27.1";
|
||||
version = "1.27.2";
|
||||
|
||||
x86_64-linux = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/linux/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-7YxZgSAhnTn0WfHvybxP16day1AHneX/zoG2Wuquq18=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/linux/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-jgT7ux3bb5ZOJFjN+EzEhPMybPZvfqjjIZQORRi32iI=";
|
||||
};
|
||||
|
||||
aarch64-linux = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/linux/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-FNLYmrwn3+EJLVjCzPKRvNPWijQdCjF4RXuIB4Kryqs=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/linux/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-j8mbSn6fbzAc8cOsq8FGKtDEJvmc0gqjNXJrpQwyuCc=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/darwin/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-yNkA3BDd/S1Ml/bvosXvMA5zgy9mqL2rMXhotCo5cgE=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-J19TcXnR4cnr5Lk8yJ7KuX25xk4YqryXonWXoKFHe60=";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/darwin/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-BsoVVd+bMpEU/5KeEGsyU9uE4RF1zxIdsnKorZO7AmA=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-WaWfY1QGIz6WxTF+QMk6iJHzM05h03soYadv4Kf/dNg=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tableplus";
|
||||
version = "0.1.284";
|
||||
version = "0.1.296";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20251230232124/https://deb.tableplus.com/debian/22/pool/main/t/tableplus/tableplus_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-TrYRRpjSVRD721XEd0gwGPv4RNq/uwaswPW2J8oVjXQ=";
|
||||
hash = "sha256-BJ+S2cBRZtehDU5DOzNEVGzhMoF4jvsNSwntoa5bnlc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
nix-update-script,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "tap";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluesky-social";
|
||||
repo = "indigo";
|
||||
rev = "tap-v${finalAttrs.version}";
|
||||
hash = "sha256-nDOLIRWTyj/R0h+70+bGi85RVe2OKLNbnSaKyyqc93Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s1S+b+QbptqJ2mxqkvsn7M5VWfLrlwpWgRjg6lq2WVE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/tap"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/tap/main.go \
|
||||
--replace-fail "versioninfo.Short()" '"${finalAttrs.version}"' \
|
||||
--replace-fail '"github.com/earthboundkid/versioninfo/v2"' ""
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "ATProtocol firehose sync utility";
|
||||
homepage = "https://github.com/bluesky-social/indigo/tree/main/cmd/tap/README.md";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
blooym
|
||||
];
|
||||
mainProgram = "tap";
|
||||
};
|
||||
})
|
||||
@@ -167,7 +167,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
postPatch =
|
||||
lib.optionalString webUISupport ''
|
||||
substituteInPlace cli/loader/src/lib.rs \
|
||||
substituteInPlace crates/xtask/src/build_wasm.rs \
|
||||
--replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";'
|
||||
''
|
||||
# when building on static platforms:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user