mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
562c842d00
123 changed files with 779 additions and 486 deletions
|
|
@ -8330,6 +8330,12 @@
|
|||
keys = [ { fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; } ];
|
||||
matrix = "@felipeqq2:pub.solar";
|
||||
};
|
||||
felissedano = {
|
||||
name = "Felis Sedano";
|
||||
email = "contact@felissedano.com";
|
||||
github = "felissedano";
|
||||
githubId = 109383955;
|
||||
};
|
||||
felixalbrigtsen = {
|
||||
email = "felix@albrigtsen.it";
|
||||
github = "felixalbrigtsen";
|
||||
|
|
@ -15289,6 +15295,12 @@
|
|||
githubId = 208297;
|
||||
name = "Luz";
|
||||
};
|
||||
lwb-2021 = {
|
||||
email = "lwb-2021@qq.com";
|
||||
github = "lwb-2021";
|
||||
githubId = 91705377;
|
||||
name = "lwb-2021";
|
||||
};
|
||||
lx = {
|
||||
email = "alex@adnab.me";
|
||||
github = "Alexis211";
|
||||
|
|
@ -24009,6 +24021,12 @@
|
|||
githubId = 617130;
|
||||
keys = [ { fingerprint = "C4F7 46C7 B560 38D8 210F 0288 5877 DEE9 7428 557F"; } ];
|
||||
};
|
||||
skohtv = {
|
||||
name = "Skoh";
|
||||
email = "contact@skoh.dev";
|
||||
github = "skohtv";
|
||||
githubId = 101289702;
|
||||
};
|
||||
skovati = {
|
||||
github = "skovati";
|
||||
githubId = 49844593;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ in
|
|||
description = ''
|
||||
The user IDs used in NixOS.
|
||||
'';
|
||||
type = types.attrsOf types.int;
|
||||
type = types.attrsOf types.ints.u32;
|
||||
};
|
||||
|
||||
ids.gids = lib.mkOption {
|
||||
|
|
@ -39,7 +39,7 @@ in
|
|||
description = ''
|
||||
The group IDs used in NixOS.
|
||||
'';
|
||||
type = types.attrsOf types.int;
|
||||
type = types.attrsOf types.ints.u32;
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ in
|
|||
};
|
||||
hostPort = mkOption {
|
||||
default = 31022;
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
example = 22;
|
||||
description = ''
|
||||
The localhost host port to forward TCP to the guest port.
|
||||
|
|
|
|||
|
|
@ -77,49 +77,49 @@ in
|
|||
SYS_UID_MIN = lib.mkOption {
|
||||
description = "Range of user IDs used for the creation of system users by useradd or newusers.";
|
||||
default = 400;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
SYS_UID_MAX = lib.mkOption {
|
||||
description = "Range of user IDs used for the creation of system users by useradd or newusers.";
|
||||
default = 999;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
UID_MIN = lib.mkOption {
|
||||
description = "Range of user IDs used for the creation of regular users by useradd or newusers.";
|
||||
default = 1000;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
UID_MAX = lib.mkOption {
|
||||
description = "Range of user IDs used for the creation of regular users by useradd or newusers.";
|
||||
default = 29999;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
SYS_GID_MIN = lib.mkOption {
|
||||
description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers";
|
||||
default = 400;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
SYS_GID_MAX = lib.mkOption {
|
||||
description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers";
|
||||
default = 999;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
GID_MIN = lib.mkOption {
|
||||
description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers.";
|
||||
default = 1000;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
GID_MAX = lib.mkOption {
|
||||
description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers.";
|
||||
default = 29999;
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.u32;
|
||||
};
|
||||
|
||||
TTYGROUP = lib.mkOption {
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ in
|
|||
|
||||
pbPort = lib.mkOption {
|
||||
default = 9989;
|
||||
type = lib.types.either lib.types.str lib.types.int;
|
||||
type = lib.types.either lib.types.str lib.types.port;
|
||||
example = "'tcp:9990:interface=127.0.0.1'";
|
||||
description = ''
|
||||
The buildmaster will listen on a TCP port of your choosing
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ in
|
|||
|
||||
sslPort = mkOption {
|
||||
default = 8154;
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Specifies port number on which the Go.CD server HTTPS interface listens.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ in
|
|||
};
|
||||
|
||||
jmxPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 7199;
|
||||
description = ''
|
||||
Specifies the default port over which Cassandra will be available for
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ in
|
|||
};
|
||||
|
||||
listenPortStart = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 4500;
|
||||
description = ''
|
||||
Starting port number for database listening sockets. Every FDB process binds to a
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ in
|
|||
};
|
||||
|
||||
nice = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr (lib.types.ints.between (-20) 19);
|
||||
default = null;
|
||||
description = ''
|
||||
Niceness of the compilation tasks.
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ in
|
|||
package = lib.mkPackageOption pkgs "journalwatch" { };
|
||||
|
||||
priority = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.between 0 7;
|
||||
default = 6;
|
||||
description = ''
|
||||
Lowest priority of message to be considered.
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ in
|
|||
description = "Password for mining server";
|
||||
};
|
||||
threads = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 0;
|
||||
description = "Number of miner threads, defaults to available processors";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ in
|
|||
description = "External address used to access registry from the internet";
|
||||
};
|
||||
externalPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
description = "External port used to access registry from the internet";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ in
|
|||
package = mkPackageOption pkgs "chromium" { };
|
||||
|
||||
maxQueueSize = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 0;
|
||||
description = "Maximum queue size for chromium-based conversions. Setting to 0 disables the limit.";
|
||||
};
|
||||
|
|
@ -143,7 +143,7 @@ in
|
|||
description = "Deny accepting URLs from these domains in the `downloadFrom` API field. Accepts a regular expression.";
|
||||
};
|
||||
maxRetries = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 4;
|
||||
description = "The maximum amount of times to retry downloading a file specified with `downloadFrom`.";
|
||||
};
|
||||
|
|
@ -158,13 +158,13 @@ in
|
|||
package = mkPackageOption pkgs "libreoffice" { };
|
||||
|
||||
restartAfter = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 10;
|
||||
description = "Restart LibreOffice after this many conversions. Setting to 0 disables this feature.";
|
||||
};
|
||||
|
||||
maxQueueSize = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 0;
|
||||
description = "Maximum queue size for LibreOffice-based conversions. Setting to 0 disables the limit.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 8082;
|
||||
description = "Port for Homepage to bind to.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ in
|
|||
};
|
||||
|
||||
log-level = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.between 0 4;
|
||||
description = ''
|
||||
Specify the log level (0:none, 1:error, 2:warning, 3:notice, 4:debug).
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 53589;
|
||||
description = ''
|
||||
Port number of the Taskserver.
|
||||
|
|
|
|||
|
|
@ -98,12 +98,7 @@ in
|
|||
'';
|
||||
};
|
||||
report_delay = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
];
|
||||
type = lib.types.ints.between 1 4;
|
||||
default = 3;
|
||||
description = ''
|
||||
The interval between system status reportings.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ in
|
|||
};
|
||||
|
||||
gatewayPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 49000;
|
||||
description = ''
|
||||
The port of the FRITZ!Box UPnP service.
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ in
|
|||
graphitePort = lib.mkOption {
|
||||
description = "Port of Graphite server (i.e. carbon-cache).";
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
};
|
||||
|
||||
extraConfig = lib.mkOption {
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ in
|
|||
};
|
||||
|
||||
mountdPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = null;
|
||||
example = 4002;
|
||||
description = ''
|
||||
|
|
@ -90,7 +90,7 @@ in
|
|||
};
|
||||
|
||||
lockdPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = null;
|
||||
example = 4001;
|
||||
description = ''
|
||||
|
|
@ -101,7 +101,7 @@ in
|
|||
};
|
||||
|
||||
statdPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = null;
|
||||
example = 4000;
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ in
|
|||
sftpd.enable = lib.mkEnableOption "SFTP service";
|
||||
sftpd.port = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
description = ''
|
||||
The port on which the SFTP server will listen.
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ in
|
|||
'';
|
||||
};
|
||||
bindPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = null;
|
||||
example = 3128;
|
||||
description = ''
|
||||
|
|
@ -192,7 +192,7 @@ in
|
|||
'';
|
||||
};
|
||||
targetPorts = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.int;
|
||||
type = lib.types.listOf lib.types.port;
|
||||
default = [ ];
|
||||
example = [
|
||||
80
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in
|
|||
description = "Name of the user the AutoSSH session should run as";
|
||||
};
|
||||
monitoringPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 0;
|
||||
example = 20000;
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ in
|
|||
services.coturn = {
|
||||
enable = lib.mkEnableOption "coturn TURN server";
|
||||
listening-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 3478;
|
||||
description = ''
|
||||
TURN listener port for UDP and TCP.
|
||||
|
|
@ -59,7 +59,7 @@ in
|
|||
'';
|
||||
};
|
||||
tls-listening-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 5349;
|
||||
description = ''
|
||||
TURN listener port for TLS.
|
||||
|
|
@ -74,7 +74,7 @@ in
|
|||
'';
|
||||
};
|
||||
alt-listening-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = cfg.listening-port + 1;
|
||||
defaultText = lib.literalExpression "listening-port + 1";
|
||||
description = ''
|
||||
|
|
@ -89,7 +89,7 @@ in
|
|||
'';
|
||||
};
|
||||
alt-tls-listening-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = cfg.tls-listening-port + 1;
|
||||
defaultText = lib.literalExpression "tls-listening-port + 1";
|
||||
description = ''
|
||||
|
|
@ -130,14 +130,14 @@ in
|
|||
'';
|
||||
};
|
||||
min-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 49152;
|
||||
description = ''
|
||||
Lower bound of UDP relay endpoints
|
||||
'';
|
||||
};
|
||||
max-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 65535;
|
||||
description = ''
|
||||
Upper bound of UDP relay endpoints
|
||||
|
|
@ -263,7 +263,7 @@ in
|
|||
'';
|
||||
};
|
||||
cli-port = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 5766;
|
||||
description = ''
|
||||
CLI server port.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ in
|
|||
enable = lib.mkEnableOption "Freenet daemon";
|
||||
|
||||
nice = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.between (-20) 19;
|
||||
default = 10;
|
||||
description = "Set the nice level for the Freenet daemon";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ in
|
|||
channel = mkOption {
|
||||
default = 0;
|
||||
example = 11;
|
||||
type = types.int;
|
||||
type = types.ints.positive;
|
||||
description = ''
|
||||
The channel to operate on. Use 0 to enable ACS (Automatic Channel Selection).
|
||||
Beware that not every device supports ACS in which case {command}`hostapd`
|
||||
|
|
@ -571,7 +571,7 @@ in
|
|||
options = {
|
||||
logLevel = mkOption {
|
||||
default = 2;
|
||||
type = types.int;
|
||||
type = types.ints.between 0 4;
|
||||
description = ''
|
||||
Levels (minimum value for logged events):
|
||||
0 = verbose debugging
|
||||
|
|
@ -957,7 +957,7 @@ in
|
|||
vlanid = mkOption {
|
||||
default = null;
|
||||
example = 1;
|
||||
type = types.nullOr types.int;
|
||||
type = types.nullOr types.ints.unsigned;
|
||||
description = "If this attribute is given, all clients using this entry will get tagged with the given VLAN ID.";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -667,7 +667,7 @@ in
|
|||
description = "Upstream outproxy bind address.";
|
||||
};
|
||||
outproxyPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 4444;
|
||||
description = "Upstream outproxy bind port.";
|
||||
};
|
||||
|
|
@ -686,7 +686,7 @@ in
|
|||
{
|
||||
options = {
|
||||
destinationPort = mkOption {
|
||||
type = with types; nullOr int;
|
||||
type = with types; nullOr port;
|
||||
default = null;
|
||||
description = "Connect to particular port at destination.";
|
||||
};
|
||||
|
|
@ -711,7 +711,7 @@ in
|
|||
{
|
||||
options = {
|
||||
inPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 0;
|
||||
description = "Service port. Default to the tunnel's listen port.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ in
|
|||
};
|
||||
|
||||
nice = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.between (-20) 19;
|
||||
default = 5;
|
||||
description = ''
|
||||
The level of niceness to use.
|
||||
|
|
|
|||
|
|
@ -71,13 +71,13 @@ in
|
|||
|
||||
rtc_config = {
|
||||
port_range_start = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 50000;
|
||||
description = "Start of UDP port range for WebRTC";
|
||||
};
|
||||
|
||||
port_range_end = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 51000;
|
||||
description = "End of UDP port range for WebRTC";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -85,13 +85,13 @@ in
|
|||
|
||||
rtc = {
|
||||
port_range_start = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 50000;
|
||||
description = "Start of UDP port range for WebRTC";
|
||||
};
|
||||
|
||||
port_range_end = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 51000;
|
||||
description = "End of UDP port range for WebRTC";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ let
|
|||
${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
|
||||
|
||||
certrequired=${lib.boolToString cfg.clientCertRequired}
|
||||
${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
|
||||
${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
|
||||
${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
|
||||
${lib.optionalString (cfg.sslCert != null) "sslCert=${cfg.sslCert}"}
|
||||
${lib.optionalString (cfg.sslKey != null) "sslKey=${cfg.sslKey}"}
|
||||
${lib.optionalString (cfg.sslCa != null) "sslCA=${cfg.sslCa}"}
|
||||
|
||||
${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
|
||||
|
||||
|
|
@ -238,20 +238,20 @@ in
|
|||
clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
|
||||
|
||||
sslCert = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Path to your SSL certificate.";
|
||||
};
|
||||
|
||||
sslKey = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Path to your SSL key.";
|
||||
};
|
||||
|
||||
sslCa = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "Path to your SSL CA certificate.";
|
||||
};
|
||||
|
||||
|
|
@ -418,13 +418,13 @@ in
|
|||
+ lib.optionalString cfg.logToFile ''
|
||||
rw /var/log/murmur/murmurd.log,
|
||||
''
|
||||
+ lib.optionalString (cfg.sslCert != "") ''
|
||||
+ lib.optionalString (cfg.sslCert != null) ''
|
||||
r ${cfg.sslCert},
|
||||
''
|
||||
+ lib.optionalString (cfg.sslKey != "") ''
|
||||
+ lib.optionalString (cfg.sslKey != null) ''
|
||||
r ${cfg.sslKey},
|
||||
''
|
||||
+ lib.optionalString (cfg.sslCa != "") ''
|
||||
+ lib.optionalString (cfg.sslCa != null) ''
|
||||
r ${cfg.sslCa},
|
||||
''
|
||||
+ lib.optionalString (cfg.dbus != null) ''
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ in
|
|||
|
||||
httpPort = mkOption {
|
||||
default = 3000;
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Sets the HTTP port of the embedded web server.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -708,7 +708,7 @@ in
|
|||
|
||||
# HTTP server-related options
|
||||
httpPorts = mkOption {
|
||||
type = types.listOf types.int;
|
||||
type = types.listOf types.port;
|
||||
description = "Listening HTTP ports list for this service.";
|
||||
default = [ 5280 ];
|
||||
};
|
||||
|
|
@ -723,7 +723,7 @@ in
|
|||
};
|
||||
|
||||
httpsPorts = mkOption {
|
||||
type = types.listOf types.int;
|
||||
type = types.listOf types.port;
|
||||
description = "Listening HTTPS ports list for this service.";
|
||||
default = [ 5281 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ in
|
|||
package = mkPackageOption pkgs "radvd" { };
|
||||
|
||||
debugLevel = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.between 0 5;
|
||||
default = 0;
|
||||
example = 5;
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ in
|
|||
};
|
||||
|
||||
listeningPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 0;
|
||||
example = 44444;
|
||||
description = ''
|
||||
|
|
@ -139,7 +139,7 @@ in
|
|||
};
|
||||
|
||||
downloadLimit = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 0;
|
||||
example = 1024;
|
||||
description = ''
|
||||
|
|
@ -148,7 +148,7 @@ in
|
|||
};
|
||||
|
||||
uploadLimit = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 0;
|
||||
example = 1024;
|
||||
description = ''
|
||||
|
|
@ -166,7 +166,7 @@ in
|
|||
};
|
||||
|
||||
httpListenPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 9000;
|
||||
description = ''
|
||||
HTTP port to bind on.
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ in
|
|||
};
|
||||
|
||||
proxyPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 3128;
|
||||
description = "TCP port on which squid will listen.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ in
|
|||
};
|
||||
|
||||
localAnnouncePort = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
type = types.nullOr types.port;
|
||||
default = null;
|
||||
description = ''
|
||||
The port on which to listen and send IPv4 broadcast announcements to.
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ in
|
|||
portMap = mkOption {
|
||||
description = "Ports to map by default.";
|
||||
default = { };
|
||||
type = types.attrsOf types.int;
|
||||
type = types.attrsOf types.port;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 8000;
|
||||
example = 1357;
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ in
|
|||
tcp_port = mkOption {
|
||||
description = "Elasticsearch port for the node to node communication.";
|
||||
default = 9300;
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
};
|
||||
|
||||
cluster_name = mkOption {
|
||||
|
|
|
|||
|
|
@ -154,14 +154,7 @@ in
|
|||
|
||||
logLevel = lib.mkOption {
|
||||
default = 1;
|
||||
type = lib.types.enum [
|
||||
0
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
];
|
||||
type = lib.types.ints.between 0 5;
|
||||
description = "Log level (0 = DEBUG, 5 = FATAL).";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -996,6 +996,9 @@ in
|
|||
"-/etc/resolv.conf"
|
||||
"-/etc/nsswitch.conf"
|
||||
"-/etc/hosts"
|
||||
"-/etc/passwd"
|
||||
"-/etc/group"
|
||||
"-/etc/shadow"
|
||||
"-/etc/localtime"
|
||||
"-/etc/kanidm"
|
||||
"-/etc/static/kanidm"
|
||||
|
|
|
|||
|
|
@ -108,13 +108,7 @@ in
|
|||
};
|
||||
|
||||
LogLevel = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
0
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
];
|
||||
type = lib.types.ints.between 0 4;
|
||||
description = ''
|
||||
Default log level from 0 to 4 (debug, info, important, warning,
|
||||
error).
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@ in
|
|||
};
|
||||
|
||||
fastcgi.shibAuthorizerPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 9100;
|
||||
description = "Port for shibauthorizer FastCGI process to bind to";
|
||||
};
|
||||
|
||||
fastcgi.shibResponderPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 9101;
|
||||
description = "Port for shibauthorizer FastCGI process to bind to";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ in
|
|||
};
|
||||
|
||||
compressionLevel = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr (lib.types.ints.between 0 16);
|
||||
description = "The compression level for ZSTD compression (between 0 and 16)";
|
||||
default = null;
|
||||
};
|
||||
|
||||
jobs = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.ints.positive;
|
||||
description = "Number of threads used for pushing store paths";
|
||||
default = null;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ in
|
|||
};
|
||||
|
||||
smtpPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
description = "MTA port.";
|
||||
default = 25;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -75,12 +75,12 @@ in
|
|||
description = "Address on which the Node.js server should listen";
|
||||
};
|
||||
httpPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 3000;
|
||||
description = "Port on which the Node.js server should listen";
|
||||
};
|
||||
websocketPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 3003;
|
||||
description = "Port for the websocket that needs to be separate";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 443;
|
||||
description = ''
|
||||
The port on which kasmweb should listen.
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 8081;
|
||||
description = "Port to listen on.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = if cfg.enableHTTPS then 8443 else 8080;
|
||||
defaultText = lib.literalExpression ''
|
||||
if config.${opt.enableHTTPS}
|
||||
|
|
@ -91,7 +91,7 @@ in
|
|||
};
|
||||
|
||||
proxyPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = if cfg.enableHTTPS then 8443 else null;
|
||||
defaultText = lib.literalExpression ''
|
||||
if config.${opt.enableHTTPS}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ in
|
|||
hkpPort = mkOption {
|
||||
default = sksCfg.hkpPort;
|
||||
defaultText = literalExpression "config.${sksOpt.hkpPort}";
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
description = ''
|
||||
Which port the sks-keyserver is listening on.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = 8080;
|
||||
description = "Port to listen on.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ in
|
|||
};
|
||||
|
||||
listenPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.port;
|
||||
default = 3000;
|
||||
description = "Port to listen on.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -704,14 +704,14 @@ in
|
|||
};
|
||||
|
||||
maxClients = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.positive;
|
||||
default = 150;
|
||||
example = 8;
|
||||
description = "Maximum number of httpd processes (prefork)";
|
||||
};
|
||||
|
||||
maxRequestsPerChild = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.unsigned;
|
||||
default = 0;
|
||||
example = 500;
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ in
|
|||
};
|
||||
|
||||
requestTimeout = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 5;
|
||||
description = ''
|
||||
Number of seconds to wait for the client to send a complete
|
||||
|
|
@ -83,7 +83,7 @@ in
|
|||
};
|
||||
|
||||
responseTimeout = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 0;
|
||||
description = ''
|
||||
Number of seconds to wait for the client to send a complete
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ in
|
|||
|
||||
temperature = {
|
||||
day = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.between 1000 25000;
|
||||
default = 5500;
|
||||
description = ''
|
||||
Colour temperature to use during the day, between
|
||||
|
|
@ -59,7 +59,7 @@ in
|
|||
'';
|
||||
};
|
||||
night = mkOption {
|
||||
type = types.int;
|
||||
type = types.ints.between 1000 25000;
|
||||
default = 3700;
|
||||
description = ''
|
||||
Colour temperature to use at night, between
|
||||
|
|
|
|||
|
|
@ -416,11 +416,11 @@ let
|
|||
description = "The protocol specifier for port forwarding between host and container";
|
||||
};
|
||||
hostPort = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
description = "Source port of the external interface on host";
|
||||
};
|
||||
containerPort = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
type = types.nullOr types.port;
|
||||
default = null;
|
||||
description = "Target port of container";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
config,
|
||||
wrapQtAppsHook,
|
||||
gst_plugins,
|
||||
util-linux,
|
||||
util-linuxMinimal,
|
||||
libunwind,
|
||||
libselinux,
|
||||
elfutils,
|
||||
|
|
@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
util-linux
|
||||
util-linuxMinimal
|
||||
libunwind
|
||||
libselinux
|
||||
elfutils
|
||||
|
|
@ -96,14 +96,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
# gst_plugins needed for setup-hooks
|
||||
++ gst_plugins
|
||||
++ lib.optionals (withIpod) [
|
||||
++ lib.optionals withIpod [
|
||||
libgpod
|
||||
libplist
|
||||
usbmuxd
|
||||
]
|
||||
++ lib.optionals (withMTP) [ libmtp ]
|
||||
++ lib.optionals (withCD) [ libcdio ]
|
||||
++ lib.optionals (withCloud) [ sparsehash ];
|
||||
++ lib.optionals withMTP [ libmtp ]
|
||||
++ lib.optionals withCD [ libcdio ]
|
||||
++ lib.optionals withCloud [ sparsehash ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i src/CMakeLists.txt \
|
||||
|
|
@ -119,9 +119,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DFORCE_GIT_REVISION=1.3.1"
|
||||
"-DUSE_SYSTEM_PROJECTM=ON"
|
||||
"-DSPOTIFY_BLOB=OFF"
|
||||
(lib.cmakeFeature "FORCE_GIT_REVISION" "1.3.1")
|
||||
(lib.cmakeBool "USE_SYSTEM_PROJECTM" true)
|
||||
(lib.cmakeBool "SPOTIFY_BLOB" false)
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
|
@ -136,6 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Multiplatform music player";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "clementine";
|
||||
maintainers = with lib.maintainers; [ ttuegel ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,19 +16,19 @@ let
|
|||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-1NGZTdAw2VS7txYuyKrpsm0bvLYYpsFZfkLCT5j2MIk=";
|
||||
hash = "sha256-4yljDypIsx2bFKgCe0nL7Ljnzq6+efMRMBlpl1T6mU0=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-7d5tSZOGkmtfaL/IFk7ksFRAOlv58/Jw/N+nhlyJEHE=";
|
||||
hash = "sha256-heiercuubJUhzOiRNPRvcBQfvbOtM6albpWvOkHlgsI=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-1qinxbsBU5Ot/ce5OcIH9ybhhHoRSHv98Mwr/Piwmis=";
|
||||
hash = "sha256-U3VA9GjyP00bhZid3mdODLfmFW5WmtXmikPByDjELXA=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-1LMV1e9xCoXa0UhyUkNFJJ0Nr0xJasPbfYAr6h7l6EE=";
|
||||
hash = "sha256-uCOQnQ8x5OGPl/139jAZ12PdbWczS2KOQHLFxjEQnL4=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
|
||||
|
|
@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "csdevkit";
|
||||
publisher = "ms-dotnettools";
|
||||
version = "1.41.11";
|
||||
version = "1.50.51";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
sourceRoot = "extension"; # This has more than one folder.
|
||||
|
|
|
|||
|
|
@ -18,19 +18,19 @@ let
|
|||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-FPhB2oWx5x/qr2k4sAg8w2Wx+LvW/Syfc/u8nnTCQFU=";
|
||||
hash = "sha256-0SMd7cEMSxH6fuvQl5RKc1jFvonBIgYpUMnmMnDiRmU=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-qVZ9Go+/mVIoUr8Qt/kJv8gvOWd7NLu1wk7YZ2v6Lw8=";
|
||||
hash = "sha256-Y6KpB6WreP4ZWovUL4cOZxxorp2Ekzq9jISY0Yo4c1Q=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-7G9t84clyi4T3k7FxoPIfaIs4VabBTvGilTptd3AHOw=";
|
||||
hash = "sha256-uXL/AN3dA45po1EuZHCSCLSFyzfVGs7yPX+0refwy10=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-fmWlcLVUUY6Ekx5mtsBYFrYFdXpSUg8PctDBUovETV4=";
|
||||
hash = "sha256-Tj0uEwLFMNN+T5XG+8y67ssUig+QeUS4uFe0HZp2ua8=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
|
||||
|
|
@ -52,7 +52,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "csharp";
|
||||
publisher = "ms-dotnettools";
|
||||
version = "2.89.19";
|
||||
version = "2.90.60";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -99,11 +99,11 @@
|
|||
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-RnQq6dIaFfcix8uAmC2VJ5CLpaPXZjFYVbyPDEzqFFo=",
|
||||
"hash": "sha256-Wv8B28h6idsni7peoKiQ7+5Uo5njw7zeNSRNq3ati8c=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.29.0",
|
||||
"rev": "v1.30.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-tS+LKp4n1SjCmdrJ0kbxrcUYR53NCsODD9Yiq8B8hok="
|
||||
},
|
||||
|
|
@ -1021,11 +1021,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-qMKjJP7iuW5qE+H/uP2TDl1zxowobutf9TrtJqQKzws=",
|
||||
"hash": "sha256-G6pLpThqKuCDx4QdTYvJYpba56ZWaxPML/3H1oslw34=",
|
||||
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
|
||||
"owner": "ovh",
|
||||
"repo": "terraform-provider-ovh",
|
||||
"rev": "v2.7.0",
|
||||
"rev": "v2.8.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -46,12 +46,12 @@ assert enablePsiMedia -> enablePlugins;
|
|||
mkDerivation rec {
|
||||
pname = "psi-plus";
|
||||
|
||||
version = "1.5.2081";
|
||||
version = "1.5.2115";
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = version;
|
||||
sha256 = "sha256-C5EFC6HpUEFb5P3yGAwlhpj7MhS16P6fkKD5GjC3J9I=";
|
||||
sha256 = "sha256-4is3ksl6IsYP1L0WhTT/56QUtR+EC1X6Lftre2BO6pM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "0.30.11";
|
||||
version = "0.30.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KYxu1Wj7cJB0krcbdwCjbqokA/H9WtVYQ18ov0BkYQ4=";
|
||||
hash = "sha256-+Ttriv/CG2dMttig0YjVB6BkxuCDjuLZsH92ENNom2c=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
|
|||
|
|
@ -4,18 +4,21 @@
|
|||
dash,
|
||||
scdoc,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "app2unit";
|
||||
version = "1.0.3";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vladimir-csp";
|
||||
repo = "app2unit";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-7eEVjgs+8k+/NLteSBKgn4gPaPLHC+3Uzlmz6XB0930=";
|
||||
sha256 = "sha256-M2sitlrQNSLthSaDH+R8gUcZ8i+o1ktf2SB/vvjyJEI=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atac";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julien-cpsn";
|
||||
repo = "ATAC";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NTdz7NtjvVQolSiqyCdR0P4dD0+ZQBKMEXTzwHPZgxU=";
|
||||
hash = "sha256-zMCz0WRqIS2htf9TMfq6BlupU8dj5PrziEMxisjkOEc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iLExF4lwXQ1BVBxEK+iD5HDkbjk38AbLaIirS04C4iw=";
|
||||
cargoHash = "sha256-U+8JElXGNsiPUM9bLmqXYudRmg+K+VJLAgKLGqiVddc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "aws-signing-helper";
|
||||
version = "1.6.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "rolesanywhere-credential-helper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QOuumJSKrqkhSXvprefSkRFiC9LrjzD5g560VJKHCWc=";
|
||||
hash = "sha256-FmMs8oU1x85ESTD4Ap6f+OC6AW7W3sULPv1bScDrbL4=";
|
||||
};
|
||||
vendorHash = "sha256-jKX0hmtMDPEnsey4RN7FgvQg1ZdQx/6c44OZuexuknQ=";
|
||||
vendorHash = "sha256-znca4Zcy8brsPeSMpFSyojjKrborx/tx1wLBadWGYmQ=";
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bashunit";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TypedDevs";
|
||||
repo = "bashunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sYg5zrB887rliBLdiZ6ZFcK2OVJjpRMO2fT498aOYF0=";
|
||||
hash = "sha256-TIt1EG/KQCslwZH9seF5SUgH242ZkUkWf8HWqNBIrD0=";
|
||||
forceFetchGit = true; # needed to include the tests directory for the check phase
|
||||
};
|
||||
|
||||
|
|
|
|||
78
pkgs/by-name/br/brush-splat/package.nix
Normal file
78
pkgs/by-name/br/brush-splat/package.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
libxkbcommon,
|
||||
sqlite,
|
||||
vulkan-loader,
|
||||
zstd,
|
||||
stdenv,
|
||||
wayland,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "brush-splat";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArthurBrussee";
|
||||
repo = "brush";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-IvsHYCM/M2hHozzKwovgXpcW1b7MSEGneU62y1k8U9U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7cJj5L8ggkBP9SDaYMtY9xIAHVAhi8cTD/0pncUaHbI=";
|
||||
|
||||
# Force linking to libEGL, which is always dlopen()ed, and to
|
||||
# libwayland-client & libxkbcommon, which is dlopen()ed based on the
|
||||
# winit backend.
|
||||
NIX_LDFLAGS = [
|
||||
"--no-as-needed"
|
||||
"-lvulkan"
|
||||
"-lwayland-client"
|
||||
"-lxkbcommon"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
libxkbcommon
|
||||
sqlite
|
||||
vulkan-loader
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
wayland
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "3D Reconstruction for all";
|
||||
homepage = "https://github.com/ArthurBrussee/brush";
|
||||
changelog = "https://github.com/ArthurBrussee/brush/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ matthewcroughan ];
|
||||
mainProgram = "brush_app";
|
||||
};
|
||||
})
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "charge-lnd";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accumulator";
|
||||
repo = "charge-lnd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-a/zIEA2oF1+BoZXk4YDWx69eVFSnANUE/F+ARI/VsXU=";
|
||||
hash = "sha256-rACpIHVVq4q3iOEJgJbslCzEcP3qYrc3rZQ85YJfzoQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ciel";
|
||||
version = "3.9.7";
|
||||
version = "3.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "ciel-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GLgCepIZf08m4xywU0Erh5QWCSAcvGoE7/AOrBwCEWQ=";
|
||||
hash = "sha256-swYIy+e+N4MVmNXSttLUWKmG2xj9TA9sWwCrIdo+gIA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SWI7K/fi3DkbvEZ1nS5GfVkjvdwjd2oZbJFaELge34A=";
|
||||
cargoHash = "sha256-RBtERA9CkTdW++ikHkV1X11hg49IrvVFIdTi1qQp+ok=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "confluent-cli";
|
||||
version = "4.37.0";
|
||||
version = "4.38.0";
|
||||
|
||||
# To get the latest version:
|
||||
# curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1
|
||||
|
|
@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fetchurl {
|
||||
url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-UG9vLUoZEK4WSZIXa8VKZ4D7L7WxU9mkyp5WTqFQuog=";
|
||||
aarch64-linux = "sha256-1dz4C/QiCRq1Ncu+dOCUcXqVXed4u7Eyrmxqaj11PIY=";
|
||||
x86_64-darwin = "sha256-XdurFD65BypAryPkBfrvbG5dvIcIodltSd8W68H4KRw=";
|
||||
aarch64-darwin = "sha256-PMcPR7Q5GahEYEiCEqS0Y71To7Tyy46HvvX8VS0VVS8=";
|
||||
x86_64-linux = "sha256-NetkaNbUCbNyajtwLUVW5KpFhkyngYoWxJJxDK42QCQ=";
|
||||
aarch64-linux = "sha256-xzMpG7BknzOdFoUZnnlCjsCxuFCkJMzGi+yH4+0QvtQ=";
|
||||
x86_64-darwin = "sha256-UP5+tnLuYore8t/qi2d3iLf47OMxwF51mfJzgfLnK7s=";
|
||||
aarch64-darwin = "sha256-IV0zEL4ApRZug0C0A0jQm9Vp78z/kk8MwcaXNOE3Agk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
container-structure-test,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
version = "1.19.3";
|
||||
version = "1.20.0";
|
||||
pname = "container-structure-test";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "container-structure-test";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KLLACXUn6dtVCI+gCMHU9hoAJBOAVyhfwxtzsopWS4U=";
|
||||
sha256 = "sha256-7/RTWpj/W+W4mhQL2HX/6KuMbDFsjh9GGRCGZZ9sNHQ=";
|
||||
};
|
||||
vendorHash = "sha256-pBq76HJ+nluOMOs9nqBKp1mr1LuX2NERXo48g8ezE9k=";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cyme";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuna-f1sh";
|
||||
repo = "cyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zwte2YzjEMW1wVti02tOa2IZMd2Z8amYUB9RHevx5bg=";
|
||||
hash = "sha256-1a+8e9sVij9o1G/XlSf7tTECZOHTwqO9rORcYsVjp6Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wOOcIkEgyR5Af78uMuCksalVH8VPFXptg232It/ilXE=";
|
||||
cargoHash = "sha256-HMPjsaHrd3UdazPiAyrHs9Emh0XdjQ/qkaZm6kxOyq4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dethrace";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dethrace-labs";
|
||||
repo = "dethrace";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Bt2wwF5cquXZwFpFyJ0TDmbFdTHbboQ93W/DvP9bsMo=";
|
||||
hash = "sha256-+C3NyRLmvXrkZuhLGwIIHFWjXLMpt3srLZCVrxRUlkA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ecspresso";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kayac";
|
||||
repo = "ecspresso";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-t7XToo/OFrczwF24k51Ae1gFI3/C2HIP5mAJVN8BzLk=";
|
||||
hash = "sha256-kZKfhGOxtuZM6oytt/36AW8R2XVoKuLZdaj7NvoRWGA=";
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
|
|
|
|||
|
|
@ -46,8 +46,9 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-hZwLYaYV0j3YwFi8KRr4DZV73L2yIwFJ3XqCyq6L7hE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cjson
|
||||
cmake
|
||||
fakeGit
|
||||
git
|
||||
|
|
@ -56,6 +57,7 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cjson
|
||||
curl
|
||||
freetype
|
||||
glew
|
||||
|
|
@ -72,36 +74,32 @@ stdenv.mkDerivation {
|
|||
zlib
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Required for build time to not be in 1980
|
||||
export SOURCE_DATE_EPOCH=$(date +%s)
|
||||
# This indicates the build was by a CI pipeline and prevents the resource
|
||||
# files from being flagged as 'dirty' due to potentially being custom built.
|
||||
export CI="true"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCROSS_COMPILE32=0"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBUILD_SERVER=1"
|
||||
"-DBUILD_CLIENT=1"
|
||||
"-DBUNDLED_ZLIB=0"
|
||||
"-DBUNDLED_CJSON=0"
|
||||
"-DBUNDLED_JPEG=0"
|
||||
"-DBUNDLED_LIBS=0"
|
||||
"-DBUNDLED_FREETYPE=0"
|
||||
"-DBUNDLED_OGG_VORBIS=0"
|
||||
"-DBUNDLED_OPENAL=0"
|
||||
"-DBUNDLED_PNG=0"
|
||||
"-DBUNDLED_THEORA=0"
|
||||
"-DBUNDLED_MINIZIP=0"
|
||||
"-DINSTALL_EXTRA=0"
|
||||
"-DINSTALL_OMNIBOT=0"
|
||||
"-DINSTALL_GEOIP=0"
|
||||
"-DINSTALL_WOLFADMIN=0"
|
||||
"-DFEATURE_AUTOUPDATE=0"
|
||||
"-DINSTALL_DEFAULT_BASEDIR=${placeholder "out"}/lib/etlegacy"
|
||||
"-DINSTALL_DEFAULT_BINDIR=${placeholder "out"}/bin"
|
||||
(lib.cmakeBool "CROSS_COMPILE32" false)
|
||||
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
|
||||
(lib.cmakeBool "BUILD_SERVER" true)
|
||||
(lib.cmakeBool "BUILD_CLIENT" true)
|
||||
(lib.cmakeBool "BUNDLED_ZLIB" false)
|
||||
(lib.cmakeBool "BUNDLED_CJSON" false)
|
||||
(lib.cmakeBool "BUNDLED_JPEG" false)
|
||||
(lib.cmakeBool "BUNDLED_LIBS" false)
|
||||
(lib.cmakeBool "BUNDLED_LIBS_DEFAULT" false)
|
||||
(lib.cmakeBool "BUNDLED_FREETYPE" false)
|
||||
(lib.cmakeBool "BUNDLED_OGG_VORBIS" false)
|
||||
(lib.cmakeBool "BUNDLED_OPENAL" false)
|
||||
(lib.cmakeBool "BUNDLED_PNG" false)
|
||||
(lib.cmakeBool "BUNDLED_THEORA" false)
|
||||
(lib.cmakeBool "BUNDLED_MINIZIP" false)
|
||||
(lib.cmakeBool "CLIENT_GLVND" true)
|
||||
(lib.cmakeBool "ENABLE_SSE" true)
|
||||
(lib.cmakeBool "INSTALL_EXTRA" false)
|
||||
(lib.cmakeBool "INSTALL_OMNIBOT" false)
|
||||
(lib.cmakeBool "INSTALL_GEOIP" false)
|
||||
(lib.cmakeBool "INSTALL_WOLFADMIN" false)
|
||||
(lib.cmakeBool "FEATURE_AUTOUPDATE" false)
|
||||
(lib.cmakeBool "FEATURE_RENDERER2" false)
|
||||
(lib.cmakeFeature "INSTALL_DEFAULT_BASEDIR" "${placeholder "out"}/lib/etlegacy")
|
||||
(lib.cmakeFeature "INSTALL_DEFAULT_BINDIR" "${placeholder "out"}/bin")
|
||||
];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "11.5.0";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-o2/gwXODAS4eex6q91hxbNx2RHNt5z8eaT3ZXS7D634=";
|
||||
hash = "sha256-Cq4pTp9K6vsQrdWz9kMdX1K1KR26e/qPL55xqiZ5kYM=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
|
|
@ -35,7 +35,7 @@ buildGoModule rec {
|
|||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-qoRlUCAnJHt9B1w9R4dBtkvqKhk3hum6OjzraPKAzk0=";
|
||||
vendorHash = "sha256-vjTqT/Gv8FU0HNvYqXIE9OCNRsJ8GbUNXIxXDdhDclc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
postPatch = ''
|
||||
substituteInPlace binaries/geph5-client/src/vpn/*.sh \
|
||||
--replace-fail 'PATH=' 'PATH=${binPath}:'
|
||||
|
||||
# This setting is dumped from https://github.com/geph-official/gephgui-wry/blob/a85a632448e548f69f9d1eea3d06a4bdc8be3d57/src/daemon.rs#L230
|
||||
cat ${./settings_default.yaml} | base32 -w 0 | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567' '0123456789ABCDEFGHJKMNPQRSTVWXYZ' | sed 's/=//g' > binaries/geph5-client-gui/src/settings_default.yaml.base32
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
23
pkgs/by-name/ge/geph/settings_default.yaml
Normal file
23
pkgs/by-name/ge/geph/settings_default.yaml
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
exit_constraint: auto
|
||||
|
||||
broker:
|
||||
race:
|
||||
- fronted:
|
||||
front: https://www.cdn77.com/
|
||||
host: 1826209743.rsc.cdn77.org
|
||||
- fronted:
|
||||
front: https://www.vuejs.org/
|
||||
host: svitania-naidallszei-2.netlify.app
|
||||
override_dns:
|
||||
- 75.2.60.5:443
|
||||
- fronted:
|
||||
front: https://www.vuejs.org/
|
||||
host: svitania-naidallszei-3.netlify.app
|
||||
override_dns:
|
||||
- 75.2.60.5:443
|
||||
- aws_lambda:
|
||||
function_name: geph-lambda-bouncer
|
||||
region: us-east-1
|
||||
obfs_key: 855MJGAMB58MCPJBB97NADJ36D64WM2T:C4TN2M1H68VNMRVCCH57GDV2C5VN6V3RB8QMWP235D0P4RT2ACV7GVTRCHX3EC37
|
||||
|
||||
spoof_dns: true
|
||||
|
|
@ -39,11 +39,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnunet";
|
||||
version = "0.24.3";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-WwaJew6ESJu7Q4J47HPkNiRCsuBaY+QAI+wdDMzGxXY=";
|
||||
hash = "sha256-LepmLuhgWUaFKvAtKAbKZP2t7cxxju72uG4LJoIsNv8=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -94,6 +94,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# builds.
|
||||
find . \( -iname \*test\*.c -or -name \*.conf \) | \
|
||||
xargs sed -i -e "s|/tmp|$TMPDIR|g"
|
||||
|
||||
# fix error: conflicting types for `GNUNET_TESTING_cmd_{exec,finish}`
|
||||
for name in exec finish; do
|
||||
substituteInPlace src/lib/testing/testing_api_cmd_$name.c \
|
||||
--replace-fail 'const struct GNUNET_TESTING_Command' 'struct GNUNET_TESTING_Command'
|
||||
done
|
||||
'';
|
||||
|
||||
# unfortunately, there's still a few failures with impure tests
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gosec";
|
||||
version = "2.22.8";
|
||||
version = "2.22.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "securego";
|
||||
repo = "gosec";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ar8j5oJshouHss062m/YhAWSFDGzTKcZHGxQtKff9Bg=";
|
||||
hash = "sha256-cI6cOD0fySVFex2gd1VTSgLGFz1CGunby2SvowKNXZQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zj1v98LDyaMFmjFtUV2L02j4FSBrODZFVhzYAj4rB1Q=";
|
||||
vendorHash = "sha256-Q/Wws0fefVgp05aQnIlq+Br0RdoEvas0bp2XqT7w19s=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gosec"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "htmlhint";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "htmlhint";
|
||||
repo = "HTMLHint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aFydnJiRqGzBKZGX/AvRlxjf3sw+fBwKdGmydFjD/xk=";
|
||||
hash = "sha256-jhn3FWzqwqczB7siHRxpYNLPoC9YhZtkcVyvWdIq93k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-h37yWpXWh9+cMlI36zucq2ZbYsQUaGuRQGJySKIeda0=";
|
||||
npmDepsHash = "sha256-acf6pyv3TsOA3Ulm/OMYZ2R7sMGEcsOXA9hbPXLbX3I=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "7.1.1-7";
|
||||
version = "7.1.2-1";
|
||||
in
|
||||
|
||||
(ffmpeg_7-full.override {
|
||||
|
|
@ -15,7 +15,7 @@ in
|
|||
owner = "jellyfin";
|
||||
repo = "jellyfin-ffmpeg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QzmMhLwlFO9TOCLQaTpoCgNwPpertRA3h1+JMzOEULE=";
|
||||
hash = "sha256-1nisdEtH5J5cDqUeDev0baCHopmoQ1SEojFdYdYeY0Q=";
|
||||
};
|
||||
}).overrideAttrs
|
||||
(old: {
|
||||
|
|
|
|||
76
pkgs/by-name/je/jetuml/package.nix
Normal file
76
pkgs/by-name/je/jetuml/package.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
fetchurl,
|
||||
jdk,
|
||||
makeBinaryWrapper,
|
||||
imagemagick,
|
||||
}:
|
||||
|
||||
let
|
||||
jdkWithFX = jdk.override { enableJavaFX = true; };
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "jetuml";
|
||||
version = "3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/prmr/JetUML/releases/download/v${finalAttrs.version}/JetUML-${finalAttrs.version}.jar";
|
||||
hash = "sha256-wACGbHeRQ5rXcuI1J3eTfQraWp8eWtkIAPo7BNGcFUU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "jetuml";
|
||||
desktopName = "JetUML";
|
||||
genericName = "UML Tool";
|
||||
categories = [
|
||||
"Application"
|
||||
"Development"
|
||||
"ProjectManagement"
|
||||
];
|
||||
icon = "jet";
|
||||
exec = "jetuml";
|
||||
comment = finalAttrs.meta.description;
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${jdkWithFX}/lib/openjdk/bin/jar xf $src jet.png
|
||||
magick jet.png -resize 128x128 jet128.png
|
||||
magick jet.png -resize 48x48 jet48.png
|
||||
install -Dm444 jet48.png $out/share/icons/hicolor/48x48/jet.png
|
||||
install -Dm444 jet128.png $out/share/icons/hicolor/128x128/jet.png
|
||||
|
||||
install -Dm444 $src $out/share/java/JetUML-${finalAttrs.version}.jar
|
||||
|
||||
makeWrapper ${jdkWithFX}/lib/openjdk/bin/java $out/bin/jetuml \
|
||||
--add-flags "-jar $out/share/java/JetUML-${finalAttrs.version}.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.jetuml.org/";
|
||||
description = "Desktop application for fast UML diagramming";
|
||||
mainProgram = "jetuml";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.felissedano ];
|
||||
};
|
||||
})
|
||||
|
|
@ -9,18 +9,18 @@ buildGoModule (finalAttrs: {
|
|||
# "chatgpt-cli" is taken by another package with the same upsteam name.
|
||||
# To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier.
|
||||
pname = "kardolus-chatgpt-cli";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kardolus";
|
||||
repo = "chatgpt-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XC8Uzrm8OjyEvdYArFt6rJJYrXKJeG3QgaOqgUyFNmw=";
|
||||
hash = "sha256-XZ9f+PAY0i7DfzZCxtZFw1jit7o/tjqAEc8uJpqiOAc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
# The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment,
|
||||
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.9/test/contract/contract_test.go#L35)
|
||||
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.10/test/contract/contract_test.go#L35)
|
||||
# which will not be the case in the pipeline.
|
||||
# Therefore, tests must be skipped.
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgbinder";
|
||||
version = "1.1.42";
|
||||
version = "1.1.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mer-hybris";
|
||||
repo = "libgbinder";
|
||||
rev = version;
|
||||
sha256 = "sha256-f5yfAmCpjI4T0XKBiGPQ3JWLuYg+SlrQwYeY/HIrycY=";
|
||||
sha256 = "sha256-a4lQzWOVdlXQeoJzvNaELiVXLvXsx4reigKrhsrcafM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "libgnunetchat";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.gnunet.org/libgnunetchat.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DhXPYa8ya9cEbwa4btQTrpjfoTGhzBInWXXH4gmDAQw=";
|
||||
hash = "sha256-pRO8i7tHynCqm97RLMBOiWKCl2CAYBE6RXfyIljIiQ0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pkgConfigModules = [ "gnunetchat" ];
|
||||
description = "Library for secure, decentralized chat using GNUnet network services";
|
||||
homepage = "https://git.gnunet.org/libgnunetchat.git";
|
||||
changelog = "https://git.gnunet.org/libgnunetchat.git/plain/ChangeLog?h=v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "lla";
|
||||
|
|
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
|
|||
owner = "chaqchase";
|
||||
repo = "lla";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ArkmjnMRTwnIMy2UNM+GsdZJIvWa4RRZ3n//Gm3k9s4=";
|
||||
hash = "sha256-7/VfEcqvYGC1Pw9wJh5FF3c7BXgcg9LVDvcr4zCrros=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
|
|||
installShellFiles
|
||||
];
|
||||
|
||||
cargoHash = "sha256-vw5cckGZjN6B7X7Pm/mZzWnSjRVYkgl58txv6Asqoug=";
|
||||
cargoHash = "sha256-LYRNXNhPgpNZWP5XKqfgM6t9Ts2k/e09iXWMcuEp9LA=";
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,20 +10,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mackerel-agent";
|
||||
version = "0.85.0";
|
||||
version = "0.85.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mackerelio";
|
||||
repo = "mackerel-agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wTL+zxa0uaRT8cP2P+iYW6qC8RS5g8wSpvsa01iSUXA=";
|
||||
sha256 = "sha256-ngBBpvDk5HsMNoZy45mlEBn3dgG8j1b98tShdR6QmQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ net-tools ];
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ];
|
||||
|
||||
vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4=";
|
||||
vendorHash = "sha256-Ubk/ms/3FwH1ZqZ5uTy0MubXhrKBoeaC85Y1KKH5cIw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,17 +9,18 @@
|
|||
python3Packages,
|
||||
pythonSupport ? false,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mim-solvers";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "machines-in-motion";
|
||||
repo = "mim_solvers";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jUL/kyXKODpcCURG7e7/qNarvwm4+EnzZRL2Wix5Jbs=";
|
||||
hash = "sha256-1Mqu9Hfy65HUIOVG/gJBpSMlOwDWVcH+LrR8CaWz0BE=";
|
||||
};
|
||||
|
||||
# eigenpy is not used without python support
|
||||
|
|
@ -61,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
doCheck = true;
|
||||
pythonImportsCheck = [ "mim_solvers" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Numerical solvers used in the Machines in Motion Laboratory";
|
||||
homepage = "https://github.com/machines-in-motion/mim_solvers";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "1.2.12";
|
||||
version = "1.2.14";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "mktxp";
|
||||
|
|
@ -15,7 +15,7 @@ python3Packages.buildPythonApplication {
|
|||
owner = "akpw";
|
||||
repo = "mktxp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2aSRnfhOROFJWzqvltYaN2FLXrRjICV56SOOHf4wKtg=";
|
||||
hash = "sha256-4+0aw/r71FcVrxASco3AkYzi7zbFeiEkJB7acGdb1FQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "myks";
|
||||
version = "4.11.3";
|
||||
version = "4.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NIcKYlirX110QHB5r8m3g2dZbWyImiFoFQZW0ig5shE=";
|
||||
hash = "sha256-1tJPYLo14LPwd7mtNTvr6YMGz0s+K6aN9Hung/N9lrM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Tiz9SmEKet2vp8toJrUaby1Jhsh+023bi1NC+WzOrX0=";
|
||||
vendorHash = "sha256-k/EeQdThF8pgeY9RI012kjlEZkVVcnanL6L8UBrQTUI=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nhost-cli";
|
||||
version = "1.31.1";
|
||||
version = "1.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nhost";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UfcQh8jdnNKn5AMerh+J83yuTY/cX20/8UA0NoPBJ14=";
|
||||
hash = "sha256-RzLnhnnEDUIlRq89/CmhH7+o4Mt6GiXbGXDObSIk4tY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nix-update";
|
||||
tag = version;
|
||||
hash = "sha256-+d4NexgDkpuiesuA6vOv2COD3bgWddIL1SjFxuDF1dA=";
|
||||
hash = "sha256-b/Ymvz4Un67j7UulzBJtmKrwcchpEE/si/QOn/m8m80=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrok";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-zn+w/k5Q5/73sOdmWivZKpjoXUjZDXhrCDU9gSYu8Nk=";
|
||||
hash = "sha256-+7jLmvsEFxL4HcxuXQjgvMg/YiUtsrrnvjN0CY4pTJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
cmake,
|
||||
docutils,
|
||||
fetchurl,
|
||||
lib,
|
||||
libbsd,
|
||||
|
|
@ -10,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_top";
|
||||
version = "4.1.1";
|
||||
version = "4.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pg_top.gitlab.io/source/pg_top-${version}.tar.xz";
|
||||
sha256 = "sha256-85LObBS9aAt7Ck5yiK0g2CAKxiYtnWp5XnTAUB5ui/k=";
|
||||
sha256 = "sha256-4El3GmfP5UDJOsDxyU5z/s3JKw0jlMb8EB/hvtywwVs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -23,7 +24,10 @@ stdenv.mkDerivation rec {
|
|||
ncurses
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
docutils
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "'top' like tool for PostgreSQL";
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGo124Module {
|
||||
pname = "pinecone";
|
||||
version = "0.11.0-unstable-2023-08-10";
|
||||
version = "0.11.0-unstable-2025-03-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "pinecone";
|
||||
rev = "ea4c33717fd74ef7d6f49490625a0fa10e3f5bbc";
|
||||
hash = "sha256-q4EFWXSkQJ2n+xAWuBxdP7nrtv3eFql9LoavWo10dfs=";
|
||||
rev = "b35aec69f59eb9bb8bd5a8c6be30fc276d3cce96";
|
||||
hash = "sha256-0jqvWdFjN4Kzhkv4Oe1obsKGW0i/MGEMX3ZhcxpsdxA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+P10K7G0UwkbCGEi6sYTQSqO7LzIf/xmaHIr7v110Ao=";
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "polenum";
|
||||
version = "1.6.1-unstable-2024-07-30";
|
||||
version = "1.7";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wh1t3Fox";
|
||||
repo = "polenum";
|
||||
rev = "6f95ce0f9936d8c20820e199a4bb1ea68d2f061f";
|
||||
hash = "sha256-aCX7dByfkUSFHjhRAjrFhbbeIgYNGixnB5pHE/lftng=";
|
||||
tag = version;
|
||||
hash = "sha256-/xjGwolpbkh/ig0N9gpSTQMIJ/2ayThRBzx3tF1kfjM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2025-08-20
|
||||
# Last updated: 2025-09-22
|
||||
{ fetchurl }:
|
||||
let
|
||||
any-darwin = {
|
||||
version = "6.9.79-2025-08-20";
|
||||
version = "6.9.80-2025-09-04";
|
||||
src = fetchurl {
|
||||
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.79_250820_01.dmg";
|
||||
hash = "sha256-m8COj+kn9ify4D4FUpNXL31uO4j4DKqCQhZnoo5umTE=";
|
||||
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.80_250904_01.dmg";
|
||||
hash = "sha256-VUjgWQIxabjXkXJhxQiQJlYDkbLDNLaVQeRaZ4WGOIs=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
@ -14,17 +14,17 @@ in
|
|||
aarch64-darwin = any-darwin;
|
||||
x86_64-darwin = any-darwin;
|
||||
aarch64-linux = {
|
||||
version = "3.2.19-2025-08-20";
|
||||
version = "3.2.19-2025-09-04";
|
||||
src = fetchurl {
|
||||
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250820_arm64_01.deb";
|
||||
hash = "sha256-rHgN0T9lcoAucwR3B2U8so/dAUfB92dQYc0TncTHPaM=";
|
||||
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_arm64_01.deb";
|
||||
hash = "sha256-OqBRxDfTz9w4cFeDSKeysPlqxaJtrp96PZieXnsjGhA=";
|
||||
};
|
||||
};
|
||||
x86_64-linux = {
|
||||
version = "3.2.19-2025-08-20";
|
||||
version = "3.2.19-2025-09-04";
|
||||
src = fetchurl {
|
||||
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250820_amd64_01.deb";
|
||||
hash = "sha256-4Y0GSWwFkqYX5ezE2Jk/tZIwsBHg88ZxJghzB+kXTds=";
|
||||
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_amd64_01.deb";
|
||||
hash = "sha256-5M3kykJCmFZZ0VTG/K+nYRt7SIUzvc3O6yPW8ebx45A=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,17 +4,18 @@
|
|||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
jq,
|
||||
ripgrep,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "qwen-code";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QwenLM";
|
||||
repo = "qwen-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5qKSWbc0NPpgvt36T/gRSgm1+o2Pbdw3tgfcGba6YSs=";
|
||||
hash = "sha256-qsa4bAk0QUUZCtoEREBd+8s0AwwVr1os5TO7Luo/UrY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -23,13 +24,21 @@ buildNpmPackage (finalAttrs: {
|
|||
./add-missing-resolved-integrity-fields.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-XvJO3ylm/ER5neSubci2w9OCTmqobmmXLbKmdQAqArY=";
|
||||
npmDepsHash = "sha256-uLKxUD0e9YSEQz4dxsGXYojcYS6noqsWhtmsc20He0k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
];
|
||||
|
||||
buildInputs = [ ripgrep ];
|
||||
|
||||
postPatch = ''
|
||||
# Remove @lvce-editor/ripgrep dependency (no network on buildPhase
|
||||
substituteInPlace package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""
|
||||
substituteInPlace packages/core/package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""
|
||||
substituteInPlace packages/core/src/tools/ripGrep.ts \
|
||||
--replace-fail "import { rgPath } from '@lvce-editor/ripgrep';" "const rgPath = 'rg';"
|
||||
|
||||
# patches below remove node-pty dependency which causes build fail on Darwin
|
||||
# should be conditional on platform but since package-lock.json is patched it changes its hash
|
||||
# though seems like this dependency is not really required by the package
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue