Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
1f5644d6b9
|
|
@ -80,7 +80,7 @@ Right: `"A library for decoding PNG images"`
|
|||
|
||||
### `longDescription` {#var-meta-longDescription}
|
||||
|
||||
An arbitrarily long description of the package.
|
||||
An arbitrarily long description of the package in [CommonMark](https://commonmark.org) Markdown.
|
||||
|
||||
### `branch` {#var-meta-branch}
|
||||
|
||||
|
|
|
|||
|
|
@ -4428,6 +4428,12 @@
|
|||
githubId = 74379;
|
||||
name = "Florian Pester";
|
||||
};
|
||||
fmoda3 = {
|
||||
email = "fmoda3@mac.com";
|
||||
github = "fmoda3";
|
||||
githubId = 1746471;
|
||||
name = "Frank Moda III";
|
||||
};
|
||||
fmthoma = {
|
||||
email = "f.m.thoma@googlemail.com";
|
||||
github = "fmthoma";
|
||||
|
|
@ -5781,6 +5787,16 @@
|
|||
github = "jacg";
|
||||
githubId = 2570854;
|
||||
};
|
||||
jakehamilton = {
|
||||
name = "Jake Hamilton";
|
||||
email = "jake.hamilton@hey.com";
|
||||
matrix = "@jakehamilton:matrix.org";
|
||||
github = "jakehamilton";
|
||||
githubId = 7005773;
|
||||
keys = [{
|
||||
fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21";
|
||||
}];
|
||||
};
|
||||
jasoncarr = {
|
||||
email = "jcarr250@gmail.com";
|
||||
github = "jasoncarr0";
|
||||
|
|
@ -15099,4 +15115,13 @@
|
|||
github = "yisuidenghua";
|
||||
githubId = 102890144;
|
||||
};
|
||||
macalinao = {
|
||||
email = "me@ianm.com";
|
||||
name = "Ian Macalinao";
|
||||
github = "macalinao";
|
||||
githubId = 401263;
|
||||
keys = [{
|
||||
fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8";
|
||||
}];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -258,6 +258,14 @@
|
|||
<link xlink:href="options.html#opt-services.patroni.enable">services.patroni</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://writefreely.org">WriteFreely</link>,
|
||||
a simple blogging platform with ActivityPub support. Available
|
||||
as
|
||||
<link xlink:href="options.html#opt-services.writefreely.enable">services.writefreely</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-incompatibilities">
|
||||
|
|
|
|||
|
|
@ -92,6 +92,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul.
|
||||
Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- [WriteFreely](https://writefreely.org), a simple blogging platform with ActivityPub support. Available as [services.writefreely](options.html#opt-services.writefreely.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Backward Incompatibilities {#sec-release-22.11-incompatibilities}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
x86_64-linux = "/nix/store/3af6g226v4hsv6x7xzh23d6wqyq0nzjp-nix-2.10.3";
|
||||
i686-linux = "/nix/store/43xxh2jip6rpdhylc5z9a5fxx54dw206-nix-2.10.3";
|
||||
aarch64-linux = "/nix/store/6qw3r57nra08ars8j8zyj3fl8lz4cvnd-nix-2.10.3";
|
||||
x86_64-darwin = "/nix/store/3b7qrm0qjw57fmznrsvm0ai568i89hc2-nix-2.10.3";
|
||||
aarch64-darwin = "/nix/store/gp7k17iy1n7hgf97qwnxw28c6v9nhb1i-nix-2.10.3";
|
||||
x86_64-linux = "/nix/store/nmq5zcd93qb1yskx42rs910ff0247nn2-nix-2.11.0";
|
||||
i686-linux = "/nix/store/ja6im1sw9a8lzczi10lc0iddffl9kzmn-nix-2.11.0";
|
||||
aarch64-linux = "/nix/store/myr6fcqa9y4y2fb83zz73dck52vcn81z-nix-2.11.0";
|
||||
x86_64-darwin = "/nix/store/2pfjz9b22k9997gh7cb0hjk1qa4lxrvy-nix-2.11.0";
|
||||
aarch64-darwin = "/nix/store/lr32i0bdarx1iqsch4sy24jj1jkfw9vf-nix-2.11.0";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@
|
|||
./programs/plotinus.nix
|
||||
./programs/proxychains.nix
|
||||
./programs/qt5ct.nix
|
||||
./programs/rust-motd.nix
|
||||
./programs/screen.nix
|
||||
./programs/sedutil.nix
|
||||
./programs/seahorse.nix
|
||||
|
|
@ -1119,6 +1120,7 @@
|
|||
./services/web-apps/wiki-js.nix
|
||||
./services/web-apps/whitebophir.nix
|
||||
./services/web-apps/wordpress.nix
|
||||
./services/web-apps/writefreely.nix
|
||||
./services/web-apps/youtrack.nix
|
||||
./services/web-apps/zabbix.nix
|
||||
./services/web-servers/agate.nix
|
||||
|
|
|
|||
92
nixos/modules/programs/rust-motd.nix
Normal file
92
nixos/modules/programs/rust-motd.nix
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.rust-motd;
|
||||
format = pkgs.formats.toml { };
|
||||
in {
|
||||
options.programs.rust-motd = {
|
||||
enable = mkEnableOption "rust-motd";
|
||||
enableMotdInSSHD = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = mdDoc ''
|
||||
Whether to let `openssh` print the
|
||||
result when entering a new `ssh`-session.
|
||||
By default either nothing or a static file defined via
|
||||
[](#opt-users.motd) is printed. Because of that,
|
||||
the latter option is incompatible with this module.
|
||||
'';
|
||||
};
|
||||
refreshInterval = mkOption {
|
||||
default = "*:0/5";
|
||||
type = types.str;
|
||||
description = mdDoc ''
|
||||
Interval in which the {manpage}`motd(5)` file is refreshed.
|
||||
For possible formats, please refer to {manpage}`systemd.time(7)`.
|
||||
'';
|
||||
};
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = format.type;
|
||||
};
|
||||
description = mdDoc ''
|
||||
Settings on what to generate. Please read the
|
||||
[upstream documentation](https://github.com/rust-motd/rust-motd/blob/main/README.md#configuration)
|
||||
for further information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{ assertion = config.users.motd == null;
|
||||
message = ''
|
||||
`programs.rust-motd` is incompatible with `users.motd`!
|
||||
'';
|
||||
}
|
||||
];
|
||||
systemd.services.rust-motd = {
|
||||
path = with pkgs; [ bash ];
|
||||
documentation = [ "https://github.com/rust-motd/rust-motd/blob/v${pkgs.rust-motd.version}/README.md" ];
|
||||
description = "motd generator";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.writeShellScript "update-motd" ''
|
||||
${pkgs.rust-motd}/bin/rust-motd ${format.generate "motd.conf" cfg.settings} > motd
|
||||
''}";
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectSystem = "full";
|
||||
StateDirectory = "rust-motd";
|
||||
RestrictAddressFamilies = "none";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RemoveIPC = true;
|
||||
WorkingDirectory = "/var/lib/rust-motd";
|
||||
};
|
||||
};
|
||||
systemd.timers.rust-motd = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig.OnCalendar = cfg.refreshInterval;
|
||||
};
|
||||
security.pam.services.sshd.text = mkIf cfg.enableMotdInSSHD (mkDefault (mkAfter ''
|
||||
session optional ${pkgs.pam}/lib/security/pam_motd.so motd=/var/lib/rust-motd/motd
|
||||
''));
|
||||
services.openssh.extraConfig = mkIf (cfg.settings ? last_login && cfg.settings.last_login != {}) ''
|
||||
PrintLastLog no
|
||||
'';
|
||||
};
|
||||
meta.maintainers = with maintainers; [ ma27 ];
|
||||
}
|
||||
|
|
@ -264,6 +264,19 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
secretFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/run/keys/keepalived.env";
|
||||
description = ''
|
||||
Environment variables from this file will be interpolated into the
|
||||
final config file using envsubst with this syntax: <literal>$ENVIRONMENT</literal>
|
||||
or <literal>''${VARIABLE}</literal>.
|
||||
The file should contain lines formatted as <literal>SECRET_VAR=SECRET_VALUE</literal>.
|
||||
This is useful to avoid putting secrets into the nix store.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -282,7 +295,9 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
systemd.services.keepalived = {
|
||||
systemd.services.keepalived = let
|
||||
finalConfigFile = if cfg.secretFile == null then keepalivedConf else "/run/keepalived/keepalived.conf";
|
||||
in {
|
||||
description = "Keepalive Daemon (LVS and VRRP)";
|
||||
after = [ "network.target" "network-online.target" "syslog.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
|
|
@ -290,8 +305,15 @@ in
|
|||
Type = "forking";
|
||||
PIDFile = pidFile;
|
||||
KillMode = "process";
|
||||
RuntimeDirectory = "keepalived";
|
||||
EnvironmentFile = lib.optional (cfg.secretFile != null) cfg.secretFile;
|
||||
ExecStartPre = lib.optional (cfg.secretFile != null)
|
||||
(pkgs.writeShellScript "keepalived-pre-start" ''
|
||||
umask 077
|
||||
${pkgs.envsubst}/bin/envsubst -i "${keepalivedConf}" > ${finalConfigFile}
|
||||
'');
|
||||
ExecStart = "${pkgs.keepalived}/sbin/keepalived"
|
||||
+ " -f ${keepalivedConf}"
|
||||
+ " -f ${finalConfigFile}"
|
||||
+ " -p ${pidFile}"
|
||||
+ optionalString cfg.snmp.enable " --snmp";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
|
|
|
|||
485
nixos/modules/services/web-apps/writefreely.nix
Normal file
485
nixos/modules/services/web-apps/writefreely.nix
Normal file
|
|
@ -0,0 +1,485 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (builtins) toString;
|
||||
inherit (lib) types mkIf mkOption mkDefault;
|
||||
inherit (lib) optional optionals optionalAttrs optionalString;
|
||||
|
||||
inherit (pkgs) sqlite;
|
||||
|
||||
format = pkgs.formats.ini {
|
||||
mkKeyValue = key: value:
|
||||
let
|
||||
value' = if builtins.isNull value then
|
||||
""
|
||||
else if builtins.isBool value then
|
||||
if value == true then "true" else "false"
|
||||
else
|
||||
toString value;
|
||||
in "${key} = ${value'}";
|
||||
};
|
||||
|
||||
cfg = config.services.writefreely;
|
||||
|
||||
isSqlite = cfg.database.type == "sqlite3";
|
||||
isMysql = cfg.database.type == "mysql";
|
||||
isMysqlLocal = isMysql && cfg.database.createLocally == true;
|
||||
|
||||
hostProtocol = if cfg.acme.enable then "https" else "http";
|
||||
|
||||
settings = cfg.settings // {
|
||||
app = cfg.settings.app or { } // {
|
||||
host = cfg.settings.app.host or "${hostProtocol}://${cfg.host}";
|
||||
};
|
||||
|
||||
database = if cfg.database.type == "sqlite3" then {
|
||||
type = "sqlite3";
|
||||
filename = cfg.settings.database.filename or "writefreely.db";
|
||||
database = cfg.database.name;
|
||||
} else {
|
||||
type = "mysql";
|
||||
username = cfg.database.user;
|
||||
password = "#dbpass#";
|
||||
database = cfg.database.name;
|
||||
host = cfg.database.host;
|
||||
port = cfg.database.port;
|
||||
tls = cfg.database.tls;
|
||||
};
|
||||
|
||||
server = cfg.settings.server or { } // {
|
||||
bind = cfg.settings.server.bind or "localhost";
|
||||
gopher_port = cfg.settings.server.gopher_port or 0;
|
||||
autocert = !cfg.nginx.enable && cfg.acme.enable;
|
||||
templates_parent_dir =
|
||||
cfg.settings.server.templates_parent_dir or cfg.package.src;
|
||||
static_parent_dir = cfg.settings.server.static_parent_dir or assets;
|
||||
pages_parent_dir =
|
||||
cfg.settings.server.pages_parent_dir or cfg.package.src;
|
||||
keys_parent_dir = cfg.settings.server.keys_parent_dir or cfg.stateDir;
|
||||
};
|
||||
};
|
||||
|
||||
configFile = format.generate "config.ini" settings;
|
||||
|
||||
assets = pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "writefreely-assets";
|
||||
|
||||
inherit (cfg.package) version src;
|
||||
|
||||
nativeBuildInputs = with pkgs.nodePackages; [ less ];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
cp -r static $out/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
less_dir=$src/less
|
||||
css_dir=$out/static/css
|
||||
|
||||
lessc $less_dir/app.less $css_dir/write.css
|
||||
lessc $less_dir/fonts.less $css_dir/fonts.css
|
||||
lessc $less_dir/icons.less $css_dir/icons.css
|
||||
lessc $less_dir/prose.less $css_dir/prose.css
|
||||
'';
|
||||
};
|
||||
|
||||
withConfigFile = text: ''
|
||||
db_pass=${
|
||||
optionalString (cfg.database.passwordFile != null)
|
||||
"$(head -n1 ${cfg.database.passwordFile})"
|
||||
}
|
||||
|
||||
cp -f ${configFile} '${cfg.stateDir}/config.ini'
|
||||
sed -e "s,#dbpass#,$db_pass,g" -i '${cfg.stateDir}/config.ini'
|
||||
chmod 440 '${cfg.stateDir}/config.ini'
|
||||
|
||||
${text}
|
||||
'';
|
||||
|
||||
withMysql = text:
|
||||
withConfigFile ''
|
||||
query () {
|
||||
local result=$(${config.services.mysql.package}/bin/mysql \
|
||||
--user=${cfg.database.user} \
|
||||
--password=$db_pass \
|
||||
--database=${cfg.database.name} \
|
||||
--silent \
|
||||
--raw \
|
||||
--skip-column-names \
|
||||
--execute "$1" \
|
||||
)
|
||||
|
||||
echo $result
|
||||
}
|
||||
|
||||
${text}
|
||||
'';
|
||||
|
||||
withSqlite = text:
|
||||
withConfigFile ''
|
||||
query () {
|
||||
local result=$(${sqlite}/bin/sqlite3 \
|
||||
'${cfg.stateDir}/${settings.database.filename}'
|
||||
"$1" \
|
||||
)
|
||||
|
||||
echo $result
|
||||
}
|
||||
|
||||
${text}
|
||||
'';
|
||||
in {
|
||||
options.services.writefreely = {
|
||||
enable =
|
||||
lib.mkEnableOption "Writefreely, build a digital writing community";
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.writefreely;
|
||||
defaultText = lib.literalExpression "pkgs.writefreely";
|
||||
description = "Writefreely package to use.";
|
||||
};
|
||||
|
||||
stateDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/writefreely";
|
||||
description = "The state directory where keys and data are stored.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "writefreely";
|
||||
description = "User under which Writefreely is ran.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "writefreely";
|
||||
description = "Group under which Writefreely is ran.";
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "The public host name to serve.";
|
||||
example = "example.com";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
description = ''
|
||||
Writefreely configuration (<filename>config.ini</filename>). Refer to
|
||||
<link xlink:href="https://writefreely.org/docs/latest/admin/config" />
|
||||
for details.
|
||||
'';
|
||||
|
||||
type = types.submodule {
|
||||
freeformType = format.type;
|
||||
|
||||
options = {
|
||||
app = {
|
||||
theme = mkOption {
|
||||
type = types.str;
|
||||
default = "write";
|
||||
description = "The theme to apply.";
|
||||
};
|
||||
};
|
||||
|
||||
server = {
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = if cfg.nginx.enable then 18080 else 80;
|
||||
defaultText = "80";
|
||||
description = "The port WriteFreely should listen on.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
database = {
|
||||
type = mkOption {
|
||||
type = types.enum [ "sqlite3" "mysql" ];
|
||||
default = "sqlite3";
|
||||
description = "The database provider to use.";
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "writefreely";
|
||||
description = "The name of the database to store data in.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = if cfg.database.type == "mysql" then "writefreely" else null;
|
||||
defaultText = "writefreely";
|
||||
description = "The database user to connect as.";
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = "The file to load the database password from.";
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
description = "The database host to connect to.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 3306;
|
||||
description = "The port used when connecting to the database host.";
|
||||
};
|
||||
|
||||
tls = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description =
|
||||
"Whether or not TLS should be used for the database connection.";
|
||||
};
|
||||
|
||||
migrate = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description =
|
||||
"Whether or not to automatically run migrations on startup.";
|
||||
};
|
||||
|
||||
createLocally = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
When <option>services.writefreely.database.type</option> is set to
|
||||
<code>"mysql"</code>, this option will enable the MySQL service locally.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
admin = {
|
||||
name = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
description = "The name of the first admin user.";
|
||||
default = null;
|
||||
};
|
||||
|
||||
initialPasswordFile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path to a file containing the initial password for the admin user.
|
||||
If not provided, the default password will be set to <code>nixos</code>.
|
||||
'';
|
||||
default = pkgs.writeText "default-admin-pass" "nixos";
|
||||
defaultText = "/nix/store/xxx-default-admin-pass";
|
||||
};
|
||||
};
|
||||
|
||||
nginx = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description =
|
||||
"Whether or not to enable and configure nginx as a proxy for WriteFreely.";
|
||||
};
|
||||
|
||||
forceSSL = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether or not to force the use of SSL.";
|
||||
};
|
||||
};
|
||||
|
||||
acme = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description =
|
||||
"Whether or not to automatically fetch and configure SSL certs.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.host != "";
|
||||
message = "services.writefreely.host must be set";
|
||||
}
|
||||
{
|
||||
assertion = isMysqlLocal -> cfg.database.passwordFile != null;
|
||||
message =
|
||||
"services.writefreely.database.passwordFile must be set if services.writefreely.database.createLocally is set to true";
|
||||
}
|
||||
{
|
||||
assertion = isSqlite -> !cfg.database.createLocally;
|
||||
message =
|
||||
"services.writefreely.database.createLocally has no use when services.writefreely.database.type is set to sqlite3";
|
||||
}
|
||||
];
|
||||
|
||||
users = {
|
||||
users = optionalAttrs (cfg.user == "writefreely") {
|
||||
writefreely = {
|
||||
group = cfg.group;
|
||||
home = cfg.stateDir;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
groups =
|
||||
optionalAttrs (cfg.group == "writefreely") { writefreely = { }; };
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
[ "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" ];
|
||||
|
||||
systemd.services.writefreely = {
|
||||
after = [ "network.target" ]
|
||||
++ optional isSqlite "writefreely-sqlite-init.service"
|
||||
++ optional isMysql "writefreely-mysql-init.service"
|
||||
++ optional isMysqlLocal "mysql.service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
Restart = "always";
|
||||
RestartSec = 20;
|
||||
ExecStart =
|
||||
"${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' serve";
|
||||
AmbientCapabilities =
|
||||
optionalString (settings.server.port < 1024) "cap_net_bind_service";
|
||||
};
|
||||
|
||||
preStart = ''
|
||||
if ! test -d "${cfg.stateDir}/keys"; then
|
||||
mkdir -p ${cfg.stateDir}/keys
|
||||
|
||||
# Key files end up with the wrong permissions by default.
|
||||
# We need to correct them so that Writefreely can read them.
|
||||
chmod -R 750 "${cfg.stateDir}/keys"
|
||||
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' keys generate
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.writefreely-sqlite-init = mkIf isSqlite {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
ReadOnlyPaths = optional (cfg.admin.initialPasswordFile != null)
|
||||
cfg.admin.initialPasswordFile;
|
||||
};
|
||||
|
||||
script = let
|
||||
migrateDatabase = optionalString cfg.database.migrate ''
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db migrate
|
||||
'';
|
||||
|
||||
createAdmin = optionalString (cfg.admin.name != null) ''
|
||||
if [[ $(query "SELECT COUNT(*) FROM users") == 0 ]]; then
|
||||
admin_pass=$(head -n1 ${cfg.admin.initialPasswordFile})
|
||||
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' --create-admin ${cfg.admin.name}:$admin_pass
|
||||
fi
|
||||
'';
|
||||
in withSqlite ''
|
||||
if ! test -f '${settings.database.filename}'; then
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db init
|
||||
fi
|
||||
|
||||
${migrateDatabase}
|
||||
|
||||
${createAdmin}
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.writefreely-mysql-init = mkIf isMysql {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = optional isMysqlLocal "mysql.service";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
ReadOnlyPaths = optional isMysqlLocal cfg.database.passwordFile
|
||||
++ optional (cfg.admin.initialPasswordFile != null)
|
||||
cfg.admin.initialPasswordFile;
|
||||
};
|
||||
|
||||
script = let
|
||||
updateUser = optionalString isMysqlLocal ''
|
||||
# WriteFreely currently *requires* a password for authentication, so we
|
||||
# need to update the user in MySQL accordingly. By default MySQL users
|
||||
# authenticate with auth_socket or unix_socket.
|
||||
# See: https://github.com/writefreely/writefreely/issues/568
|
||||
${config.services.mysql.package}/bin/mysql --skip-column-names --execute "ALTER USER '${cfg.database.user}'@'localhost' IDENTIFIED VIA unix_socket OR mysql_native_password USING PASSWORD('$db_pass'); FLUSH PRIVILEGES;"
|
||||
'';
|
||||
|
||||
migrateDatabase = optionalString cfg.database.migrate ''
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db migrate
|
||||
'';
|
||||
|
||||
createAdmin = optionalString (cfg.admin.name != null) ''
|
||||
if [[ $(query 'SELECT COUNT(*) FROM users') == 0 ]]; then
|
||||
admin_pass=$(head -n1 ${cfg.admin.initialPasswordFile})
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' --create-admin ${cfg.admin.name}:$admin_pass
|
||||
fi
|
||||
'';
|
||||
in withMysql ''
|
||||
${updateUser}
|
||||
|
||||
if [[ $(query "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${cfg.database.name}'") == 0 ]]; then
|
||||
${cfg.package}/bin/writefreely -c '${cfg.stateDir}/config.ini' db init
|
||||
fi
|
||||
|
||||
${migrateDatabase}
|
||||
|
||||
${createAdmin}
|
||||
'';
|
||||
};
|
||||
|
||||
services.mysql = mkIf isMysqlLocal {
|
||||
enable = true;
|
||||
package = mkDefault pkgs.mariadb;
|
||||
ensureDatabases = [ cfg.database.name ];
|
||||
ensureUsers = [{
|
||||
name = cfg.database.user;
|
||||
ensurePermissions = {
|
||||
"${cfg.database.name}.*" = "ALL PRIVILEGES";
|
||||
# WriteFreely requires the use of passwords, so we need permissions
|
||||
# to `ALTER` the user to add password support and also to reload
|
||||
# permissions so they can be used.
|
||||
"*.*" = "CREATE USER, RELOAD";
|
||||
};
|
||||
}];
|
||||
};
|
||||
|
||||
services.nginx = lib.mkIf cfg.nginx.enable {
|
||||
enable = true;
|
||||
recommendedProxySettings = true;
|
||||
|
||||
virtualHosts."${cfg.host}" = {
|
||||
enableACME = cfg.acme.enable;
|
||||
forceSSL = cfg.nginx.forceSSL;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString settings.server.port}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ let
|
|||
|
||||
cfg = config.services.xserver.windowManager.awesome;
|
||||
awesome = cfg.package;
|
||||
getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}";
|
||||
getLuaPath = lib: dir: "${lib}/${dir}/lua/${awesome.lua.luaversion}";
|
||||
makeSearchPath = lib.concatMapStrings (path:
|
||||
" --search " + (getLuaPath path "share") +
|
||||
" --search " + (getLuaPath path "lib")
|
||||
|
|
|
|||
|
|
@ -621,6 +621,7 @@ in {
|
|||
wmderland = handleTest ./wmderland.nix {};
|
||||
wpa_supplicant = handleTest ./wpa_supplicant.nix {};
|
||||
wordpress = handleTest ./wordpress.nix {};
|
||||
writefreely = handleTest ./web-apps/writefreely.nix {};
|
||||
xandikos = handleTest ./xandikos.nix {};
|
||||
xautolock = handleTest ./xautolock.nix {};
|
||||
xfce = handleTest ./xfce.nix {};
|
||||
|
|
|
|||
44
nixos/tests/web-apps/writefreely.nix
Normal file
44
nixos/tests/web-apps/writefreely.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ system ? builtins.currentSystem, config ? { }
|
||||
, pkgs ? import ../../.. { inherit system config; } }:
|
||||
|
||||
with import ../../lib/testing-python.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
writefreelyTest = { name, type }:
|
||||
makeTest {
|
||||
name = "writefreely-${name}";
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
services.writefreely = {
|
||||
enable = true;
|
||||
host = "localhost:3000";
|
||||
admin.name = "nixos";
|
||||
|
||||
database = {
|
||||
inherit type;
|
||||
createLocally = type == "mysql";
|
||||
passwordFile = pkgs.writeText "db-pass" "pass";
|
||||
};
|
||||
|
||||
settings.server.port = 3000;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("writefreely.service")
|
||||
machine.wait_for_open_port(3000)
|
||||
machine.succeed("curl --fail http://localhost:3000")
|
||||
'';
|
||||
};
|
||||
in {
|
||||
sqlite = writefreelyTest {
|
||||
name = "sqlite";
|
||||
type = "sqlite3";
|
||||
};
|
||||
mysql = writefreelyTest {
|
||||
name = "mysql";
|
||||
type = "mysql";
|
||||
};
|
||||
}
|
||||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flacon";
|
||||
version = "9.1.0";
|
||||
version = "9.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flacon";
|
||||
repo = "flacon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gchFd3yL0ni0PJ4+mWwR8XCKPpyQOajtO+/A7fnwoeE=";
|
||||
sha256 = "sha256-qnjWpsgCRAi09o9O7CBc0R9MN1EpXVmCoxB2npc9qpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "indicator-sound-switcher";
|
||||
version = "2.3.7";
|
||||
version = "2.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yktoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-agzU3Z3E6NvCnlsz9L719LqMTm8EmYg3TY/2lWTYgKs=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-qJ1lg9A1aCM+/v/JbQAVpYGX25qA5ULqsM8k7uH1uvQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, meson
|
||||
|
|
@ -21,20 +22,26 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "netease-cloud-music-gtk";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gmg137";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-dlJZvmfw9+cavAysxVzCekgPdygg5zbU3ZR5BOjPk08=";
|
||||
hash = "sha256-0pmuzdRQBdUS4ORh3zJQWb/hbhk7SY3P4QMwoy4Mgp8=";
|
||||
};
|
||||
|
||||
patches = [ ./cargo-lock.patch ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "add-cargo-lock-for-2.0.2.patch";
|
||||
url = "https://github.com/gmg137/netease-cloud-music-gtk/commit/21b5d40d49e661fe7bd35ed10bb8b883ef7fcd9f.patch";
|
||||
hash = "sha256-pSgc+yJQMNyLPYUMc1Kp/Kr+++2tH8srIM5PgVeoZ+E=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src patches;
|
||||
hash = "sha256-mJyjWEBsLhHwJCeZyRdby/K/jse0F9UBwfQxkNtZito=";
|
||||
hash = "sha256-7Z5i5Xqtk4ZbBXSVYg1e05ENa2swC88Ctd2paE60Yyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils ripgrep git cargo
|
||||
|
||||
# Ref: https://github.com/NixOS/nixpkgs/blob/nixos-21.05/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh
|
||||
|
||||
set -eu -vx
|
||||
|
||||
here=$PWD
|
||||
version=$(rg '^ version = "' default.nix | cut -d '"' -f 2)
|
||||
checkout=$(mktemp -d)
|
||||
|
||||
git clone -b "$version" --depth=1 https://github.com/gmg137/netease-cloud-music-gtk "$checkout"
|
||||
cd "$checkout"
|
||||
|
||||
cargo generate-lockfile
|
||||
git add -f Cargo.lock
|
||||
git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
|
||||
|
||||
cd "$here"
|
||||
rm -rf "$checkout"
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
, darwin
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, automake
|
||||
, autogen
|
||||
, automake
|
||||
, gettext
|
||||
, libtool
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, unzip
|
||||
, which
|
||||
, gmp
|
||||
|
|
@ -17,25 +17,34 @@
|
|||
, zlib
|
||||
}:
|
||||
let
|
||||
py3 = python3.withPackages (p: [ p.Mako p.mrkd ]);
|
||||
py3 = python3.withPackages (p: [ p.Mako ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||
sha256 = "09qqfnj809dpwar9ijm3ic5cv4019hsnvh2h6sfpdqp1smf9igxs";
|
||||
sha256 = "1ff400339db3d314b459e1a3e973f1213783e814faa21f2e1b18917693cabfd9";
|
||||
};
|
||||
|
||||
manpages = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}-manpages.tar.xz";
|
||||
sha256 = "sha256-7EohXp0/gIJwlMsTHwlcLNBzZb8LwF9n0eXkQhOnY7g=";
|
||||
};
|
||||
|
||||
# when building on darwin we need dawin.cctools to provide the correct libtool
|
||||
# as libwally-core detects the host as darwin and tries to add the -static
|
||||
# option to libtool, also we have to add the modified gsed package.
|
||||
nativeBuildInputs = [ autogen autoconf automake gettext pkg-config py3 unzip which ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ] ++ [ libtool ];
|
||||
nativeBuildInputs = [ autoconf autogen automake gettext libtool protobuf py3 unzip which ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ];
|
||||
|
||||
buildInputs = [ gmp libsodium sqlite zlib ];
|
||||
|
||||
postUnpack = ''
|
||||
tar -xf $manpages -C $sourceRoot
|
||||
'';
|
||||
|
||||
# this causes some python trouble on a darwin host so we skip this step.
|
||||
# also we have to tell libwally-core to use sed instead of gsed.
|
||||
postPatch = if !stdenv.isDarwin then ''
|
||||
|
|
|
|||
|
|
@ -6,23 +6,24 @@
|
|||
, withGui ? true, libevent
|
||||
, qtbase, qttools
|
||||
, zeromq
|
||||
, fmt
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "litecoin" + optionalString (!withGui) "d";
|
||||
version = "0.18.1";
|
||||
version = "0.21.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "litecoin-project";
|
||||
repo = "litecoin";
|
||||
rev = "v${version}";
|
||||
sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c";
|
||||
sha256 = "sha256-WJFdac5hGrHy9o3HzjS91zH+4EtJY7kUJAQK+aZaEyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib zeromq
|
||||
buildInputs = [ openssl db48 boost zlib zeromq fmt
|
||||
miniupnpc glib protobuf util-linux libevent ]
|
||||
++ optionals stdenv.isDarwin [ AppKit ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
|
@ -34,6 +35,11 @@ mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
./src/test/test_litecoin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm";
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@ let
|
|||
(name: spec:
|
||||
fetchFromGitHub {
|
||||
repo = name;
|
||||
inherit (spec) owner rev sha256;
|
||||
inherit (spec) owner rev hash;
|
||||
}
|
||||
)
|
||||
(lib.importJSON ./deps.json);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.168.0";
|
||||
version = "1.169.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-/06eZ79Zeq6jtcfq+lOcumBgP59bqCX/Km7k21FroSc=";
|
||||
hash = "sha256-EQAoKft/L4sbdY8hOvyu+Cy+3I8Lt4g1KTxTlSYALac=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,56 +2,56 @@
|
|||
"EncConv": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.06.19",
|
||||
"sha256": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg="
|
||||
"hash": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg="
|
||||
},
|
||||
"ATBinHex-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.06.14",
|
||||
"sha256": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA="
|
||||
"hash": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA="
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.07.17",
|
||||
"sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU="
|
||||
"rev": "2022.08.28",
|
||||
"hash": "sha256-jkVHwPQGPtLeSRy502thPIrDWzkkwvlnyGcTzjgFgIc="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.07.27",
|
||||
"sha256": "sha256-SGozuk0pvp0+PwAFbGG+QMUhQ2A6mXKr31u10WIveh0="
|
||||
"rev": "2022.08.28",
|
||||
"hash": "sha256-U/UD3vPnIdQUe/1g/mKgs5yGirsIB/uHTjD0MOouAyI="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.05.04",
|
||||
"sha256": "sha256-6O4RijSejPogokLSBuC6pKrOpihMi/ykS06YyV64Sak="
|
||||
"rev": "2022.08.28",
|
||||
"hash": "sha256-/MWC4BoU/4kflvbly0phh+cfIR8rNwgWFtrXnmxk0Ks="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.07.20",
|
||||
"sha256": "sha256-pCIt21m34BuDbWLn+CQwqsMQHVWHtctME63Bjx1B9hE="
|
||||
"rev": "2022.08.22",
|
||||
"hash": "sha256-o87V32HhFpCeSxhgkfKiL69oCcmpiReVmiNBPyv1kc4="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.07.20",
|
||||
"sha256": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU="
|
||||
"hash": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.10.27",
|
||||
"sha256": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA="
|
||||
"hash": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA="
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.01.17",
|
||||
"sha256": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw="
|
||||
"hash": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw="
|
||||
},
|
||||
"CudaText-lexers": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.07.09",
|
||||
"sha256": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4="
|
||||
"hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4="
|
||||
},
|
||||
"bgrabitmap": {
|
||||
"owner": "bgrabitmap",
|
||||
"rev": "v11.5",
|
||||
"sha256": "sha256-Pevh+yhtN3oSSvbQfnO7SM6UHBVe0sSpbK8ss98XqcU="
|
||||
"rev": "v11.5.2",
|
||||
"hash": "sha256-aGNKkLDbGTeFgFEhuX7R2BXhnllsanJmk4k+1muiSD8="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
|
|||
sriHash=$(nix hash to-sri --type sha256 $hash)
|
||||
|
||||
sed -i "s#version = \".*\"#version = \"$version\"#" default.nix
|
||||
sed -i "s#sha256 = \".*\"#sha256 = \"$sriHash\"#" default.nix
|
||||
sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix
|
||||
|
||||
while IFS=$'\t' read repo owner rev; do
|
||||
latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name')
|
||||
|
|
@ -28,6 +28,6 @@ while IFS=$'\t' read repo owner rev; do
|
|||
url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz"
|
||||
hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
|
||||
sriHash=$(nix hash to-sri --type sha256 $hash)
|
||||
jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".sha256 = \"${sriHash}\"" deps.json | sponge deps.json
|
||||
jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".hash = \"${sriHash}\"" deps.json | sponge deps.json
|
||||
fi
|
||||
done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json)
|
||||
|
|
|
|||
|
|
@ -6,33 +6,22 @@
|
|||
}:
|
||||
|
||||
let
|
||||
pname = "sublimetext4";
|
||||
pnameBase = "sublimetext4";
|
||||
packageAttribute = "sublime4${lib.optionalString dev "-dev"}";
|
||||
binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" "crash_reporter" ];
|
||||
primaryBinary = "sublime_text";
|
||||
primaryBinaryAliases = [ "subl" "sublime" "sublime4" ];
|
||||
downloadUrl = "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz";
|
||||
downloadUrl = arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz";
|
||||
versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
|
||||
versionFile = builtins.toString ./packages.nix;
|
||||
archSha256 = {
|
||||
"aarch64-linux" = aarch64sha256;
|
||||
"x86_64-linux" = x64sha256;
|
||||
}.${stdenv.hostPlatform.system};
|
||||
arch = {
|
||||
"aarch64-linux" = "arm64";
|
||||
"x86_64-linux" = "x64";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ];
|
||||
in let
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
pname = "${pname}-bin";
|
||||
binaryPackage = stdenv.mkDerivation rec {
|
||||
pname = "${pnameBase}-bin";
|
||||
version = buildVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = downloadUrl;
|
||||
sha256 = archSha256;
|
||||
};
|
||||
src = passthru.sources.${stdenv.hostPlatform.system};
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
|
@ -95,9 +84,22 @@ in let
|
|||
--set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = downloadUrl "arm64";
|
||||
sha256 = aarch64sha256;
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = downloadUrl "x64";
|
||||
sha256 = x64sha256;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation (rec {
|
||||
inherit pname;
|
||||
pname = pnameBase;
|
||||
version = buildVersion;
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -119,24 +121,30 @@ in stdenv.mkDerivation (rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeShellScript "${pname}-update-script" ''
|
||||
set -o errexit
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts curl ]}
|
||||
passthru = {
|
||||
updateScript =
|
||||
let
|
||||
script = writeShellScript "${packageAttribute}-update-script" ''
|
||||
set -o errexit
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts curl ]}
|
||||
|
||||
latestVersion=$(curl -s ${versionUrl})
|
||||
versionFile=$1
|
||||
latestVersion=$(curl -s "${versionUrl}")
|
||||
|
||||
if [[ "${buildVersion}" = "$latestVersion" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
if [[ "${buildVersion}" = "$latestVersion" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for platform in ${lib.concatStringsSep " " meta.platforms}; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
|
||||
update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
|
||||
done
|
||||
'';
|
||||
for platform in ${lib.escapeShellArgs meta.platforms}; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version "${packageAttribute}.${primaryBinary}" 0 "${lib.fakeSha256}" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
|
||||
update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
in [ script versionFile ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sophisticated text editor for code, markup and prose";
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ in
|
|||
} {};
|
||||
|
||||
sublime4-dev = common {
|
||||
buildVersion = "4125";
|
||||
buildVersion = "4134";
|
||||
dev = true;
|
||||
x64sha256 = "sha256-+WvLkA7sltJadfm704rOECU4LNoVsv8rDmoAlO/M6Jo=";
|
||||
aarch64sha256 = "11rbdy9rsn5b39qykbws4dqss89snrik7c2vdiw9cj0kibglsc3f";
|
||||
x64sha256 = "rd3EG8e13FsPKihSM9qjUMRsEA6joMwVqhj1NZlwIaE=";
|
||||
aarch64sha256 = "gdfEDd2E1sew08sVmcmw21zyil8JuJJMpG2T/9Pi81E=";
|
||||
} {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2507,8 +2507,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "errorlens";
|
||||
publisher = "usernamehw";
|
||||
version = "3.5.1";
|
||||
sha256 = "17xbbr5hjrs67yazicb9qillbkp3wnaccjpnl1jlp07s0n7q4f8f";
|
||||
version = "3.6.0";
|
||||
sha256 = "sha256-oNzB81mPZjEwrqbeFMvTlXERXrYBpF03EH9ZXz/daOs=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ripes";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mortbopet";
|
||||
repo = "Ripes";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Aal2A4xypzaY7Oa+boIrXk7ITNKnh5OZIP7DkJjcGu4=";
|
||||
sha256 = "sha256-HdvLi3OKJmr+U/dxCGmq6JR91dWpUL3uoPumH2/B46k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ with python3.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ablog";
|
||||
version = "0.10.24";
|
||||
version = "0.10.29";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bLpINvEH7B/duSRrfzvq25se0mvbbcxaEcAs8xMw6Kc=";
|
||||
sha256 = "sha256-q2zoXCmnzzjXSBGFKzondOQRz7CjZp0wCiXxbgpXHIA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,32 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses
|
||||
, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }:
|
||||
, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper
|
||||
, opencl-headers, ocl-icd
|
||||
, vulkan-headers, vulkan-loader, glfw
|
||||
, libXdmcp, pcre, util-linux
|
||||
, libselinux, libsepol
|
||||
, libthai, libdatrie, libxkbcommon, libepoxy
|
||||
, dbus, at-spi2-core
|
||||
, libXtst
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpu-x";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA=";
|
||||
sha256 = "sha256-PNfEiin4Hble/H8cOvSK+A7wmoeOlyITRUTwGTd3B6s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
|
||||
buildInputs = [
|
||||
gtk3 ncurses libcpuid pciutils procps
|
||||
vulkan-headers vulkan-loader glfw
|
||||
opencl-headers ocl-icd
|
||||
libXdmcp pcre util-linux
|
||||
libselinux libsepol
|
||||
libthai libdatrie libxkbcommon libepoxy
|
||||
dbus at-spi2-core
|
||||
libXtst
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cpu-x \
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free software that gathers information on CPU, motherboard and more";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,14 +13,16 @@
|
|||
, tllist
|
||||
, fcft
|
||||
, enableCairo ? true
|
||||
, withPNGBackend ? "libpng"
|
||||
, withSVGBackend ? "librsvg"
|
||||
# Optional dependencies
|
||||
, svgSupport ? true
|
||||
, pngSupport ? true
|
||||
# Optional dependencies
|
||||
, cairo
|
||||
, librsvg
|
||||
, libpng
|
||||
}:
|
||||
|
||||
assert svgSupport -> enableCairo;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuzzel";
|
||||
version = "1.7.0";
|
||||
|
|
@ -49,19 +51,17 @@ stdenv.mkDerivation rec {
|
|||
tllist
|
||||
fcft
|
||||
] ++ lib.optional enableCairo cairo
|
||||
++ lib.optional (withPNGBackend == "libpng") libpng
|
||||
++ lib.optional (withSVGBackend == "librsvg") librsvg;
|
||||
++ lib.optional pngSupport libpng
|
||||
++ lib.optional svgSupport librsvg;
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-cairo=${if enableCairo then "enabled" else "disabled"}"
|
||||
"-Dpng-backend=${withPNGBackend}"
|
||||
"-Dsvg-backend=${withSVGBackend}"
|
||||
"-Dpng-backend=${if pngSupport then "libpng" else "none"}"
|
||||
"-Dsvg-backend=${if svgSupport then "librsvg" else "none"}"
|
||||
];
|
||||
|
||||
CFLAGS = "-Wno-error=comment"; # https://gitlab.gnome.org/GNOME/librsvg/-/issues/856
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wayland-native application launcher, similar to rofi’s drun mode";
|
||||
homepage = "https://codeberg.org/dnkl/fuzzel";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.101.0";
|
||||
version = "0.102.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Fodcefp8xdSV2tt6ZYaKdcLqVe2upEngQr6M+wV5wnw=";
|
||||
sha256 = "sha256-OepxYjzTJisBNoZP3IrYMj01Op7jsA2tWHrVDpwP9qE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tZQIKxY96G6ReegqjapJ2rLd7n92+axJ7F8UglF61eM=";
|
||||
vendorSha256 = "sha256-y9bZ9EoB/n300oXO+PT4d8vSVMJC3HYyMRNf6eNhVik=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mob";
|
||||
version = "3.1.3";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FOZrwOf3IFnwtqAk0RNwvlTUidqWbo1aopSu6SmmV4k=";
|
||||
sha256 = "sha256-FnAocL4Lbg/WxvLJuNR8FDBXvxqD2RMkkRvaCKvka8A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
vendorSha256 = null;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.7.2";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kQow8jBHxMTgtTaOvq8uT5YjWxml+GoYaoUH3hMQN8g=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-L5oVuoEU8DEhRttFeas5cCA0XPo5sCm1D+JUAWzZdYA=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.23.5";
|
||||
version = "0.23.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/f68TlNuaEyPDSBpMmOjZkLF6Is2+oYfbWQqQOnsR4M=";
|
||||
sha256 = "sha256-QHaFx6NCKZKG9/pM/h9kqoCJwl74zT2rnDGh50x8OwE=";
|
||||
};
|
||||
|
||||
# Because there's a test that requires terminal access
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "sha256-sgwT0CLFdmzh7dezVE5tcmGCXqxnGLT00IDIQJl6pHw=";
|
||||
cargoSha256 = "sha256-ccR5w563NBLDl7O61lkGpmrLgzfO/F3CnOJiLL6tog8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal user interface for taskwarrior ";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qrPBQuHwfwFI4PQXDikfo8hm64Sdg4czeeKWyD5HqNk=";
|
||||
sha256 = "sha256-2Q+5EVeF8kXO4RogQIQHafV0AKIEKBFGqt27Vkanwss=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw=";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ let
|
|||
writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
|
||||
in
|
||||
buildGoModule rec {
|
||||
version = "2.4.1";
|
||||
version = "2.6.0";
|
||||
pname = "crc";
|
||||
gitCommit = "6b954d40ec3280ca63e825805503d4414a3ff55b";
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
owner = "code-ready";
|
||||
repo = "crc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wjwTf+d19F1NLYmUORMU0PGJeQZd+IrlScm5DiFvAk0=";
|
||||
sha256 = "sha256-4EaonL+7/zPEbuM12jQFx8wLR62iLYZ3LkHAibdGQZc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.32.0";
|
||||
sha256 = "1gxfnf47i26kzgsaxbl2pf02hn5dwb290qs894hz196jc2021a7n";
|
||||
manifestsSha256 = "19jdmdipbshqv06xzkx5p4ym0x2jgrvnvsq38dg6b4y0iwzd9nmm";
|
||||
version = "0.33.0";
|
||||
sha256 = "1rrx2sq9wap7xzvqa6dw54kmmlnj4d45y8ziaxkyibz7hsqvzyqk";
|
||||
manifestsSha256 = "0zzv5mkcnxcrd6yq330bm4b1bvlp93qv80n4yb4y7g16d0a2xp9a";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
|
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pVK+VFfAk0jFp6u5mVB2p8CamPkD3/KRhYNy3zHUVCE=";
|
||||
vendorSha256 = "sha256-jKluPTBg7wVbbApKul/68qC1xoMyp86/ok2UZLAoRUY=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-evict-pod";
|
||||
version = "0.0.10";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rajatjindal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z4fJzU317p7K+klcDQAukXAfZOpHd3PlH5fKO0PgKHA=";
|
||||
sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8VTrywlzrzoBEi/xOqkwhGW/R2B2oGqgh01Gv9FcW80=";
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "multus-cni";
|
||||
version = "3.8";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8snetworkplumbingwg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
|
||||
sha256 = "sha256-U5Ji+f7ckynBVMb4xsmoRZzYJx8obMO+bO9TU6GqcW0=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.38.7";
|
||||
version = "0.38.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MPetGR/VAVSLuDHyYeP1s9+4RRZzKanf9xyxas3heYY=";
|
||||
sha256 = "sha256-iTKENFFST7nTsMe7KULGc/WnKrHSXRTWPm2DT5LJC00=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg=";
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-graft";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mzz2017";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bihQo75HwottWXIGGaTG4mN+wg0iWKun61dvCYlAmeQ=";
|
||||
sha256 = "sha256-lsxZBhXgLJIy39kaOj5cCQUgZEDhlylklOdD4qHXks0=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
|
||||
vendorSha256 = "sha256-26tk6pv3yCVwczuymD7r54C7BKcaVlOseI8TXj8IyOM=";
|
||||
vendorSha256 = "sha256-DLlPwLDWAQw7YPib2G2bFk3BrDL9+uFENhVEf3smnIA=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
|
||||
PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
PKG_CONFIG_PIDGIN_DATADIR = "${placeholder "out"}/share";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hoehermann/libpurple-signald";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.54.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.56.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-dGxbsSNvBT0KFukSNXyii69hMN246IYFbb0CzrDh7IU=";
|
||||
sha256 = "sha256-8z6FSeEEOrkNYWh9cS7c6GDAufBuiVmHmo7Ie6mueyI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace $out/share/applications/Zoom.desktop \
|
||||
--replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
|
||||
|
||||
for i in zopen zoom ZoomLauncher; do
|
||||
for i in aomhost zopen zoom ZoomLauncher; do
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mullvad-vpn";
|
||||
version = "2022.2";
|
||||
version = "2022.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
|
||||
sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o=";
|
||||
sha256 = "sha256-OwTtWzlZjHNFSN5/UjFJbcrPCv9+ucWYEL2idYjeozU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mullvad";
|
||||
version = "2022.2";
|
||||
version = "2022.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mullvad";
|
||||
repo = "mullvadvpn-app";
|
||||
rev = version;
|
||||
hash = "sha256-ZtQKzbFrkacrfPIkMz/UOfIwQBXQUoVVlFla//jmMwY=";
|
||||
hash = "sha256-s0Cmeh10lQUB5BK4i1qxkDy/ylx/3c6V66dxH+kcnLs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J6h3KY1RDCnAc/tQHNGEyOlVQoQNhRqjWbmimPitydQ=";
|
||||
cargoHash = "sha256-HPURL+CFUVLWRq8nzLiZxDhckgH76b6JBUObLGtoEEw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nicotine-plus";
|
||||
version = "3.2.2";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicotine-plus";
|
||||
repo = "nicotine-plus";
|
||||
rev = version;
|
||||
sha256 = "sha256-aD5LQ0l6bet/iQKiu1mta4fUeijfip9IdzbGnTkCNdQ=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-swFNFw2a5PXwBkh0FBrCy5u3m5gErq29ZmWhMP7MpmQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ in rec {
|
|||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/merchant.git";
|
||||
rev = "60dcacf25e51cc2bff359ea1fc86cdd3d9e6083";
|
||||
rev = "960dcacf25e51cc2bff359ea1fc86cdd3d9e6083";
|
||||
sha256 = "sha256-Wn11z6YjnylZl3z2JjBlrtZ1KHfQUHLIYWo5F+mAmNo=";
|
||||
};
|
||||
postUnpack = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc5";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
rev = "cvc5-${version}";
|
||||
sha256 = "sha256-D3rexkDc78w/HObT/WYPBo8mTBx1MAkxPXJvddg97ic=";
|
||||
sha256 = "sha256-RDslPz9b0R9NXaXoixSCenHEh+F3wg/8p4Ksrzh41PI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "streamlit";
|
||||
version = "1.11.1";
|
||||
version = "1.12.2";
|
||||
format = "wheel"; # source currently requires pipenv
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-+GGuL3UngPDgLOGx9QXUdRJsTswhTg7d6zuvhpp0Mo0=";
|
||||
hash = "sha256-xW0Hdf6zkRb/kKiwHuFb4nIS7lCruIlDYHIF0m0dmSM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}:
|
||||
let
|
||||
majMin = lib.versions.majorMinor version;
|
||||
version = "7.6.13";
|
||||
version = "7.6.21";
|
||||
|
||||
fahclient = stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
|
@ -18,7 +18,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb";
|
||||
sha256 = "1j2cnsyassvifp6ymwd9kxwqw09hks24834gf7nljfncyy9g4g0i";
|
||||
sha256 = "2827f05f1c311ee6c7eca294e4ffb856c81957e8f5bfc3113a0ed27bb463b094";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.8.5";
|
||||
version = "1.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r+w3r1owvAb8KTha5DcolMJ/jKue+7lAHKxLWe+YllE=";
|
||||
sha256 = "sha256-3NlGS6DTTE0FCsvNPBNaxxbYcKKwE3gd1jsfdxlTl38=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,33 +1,28 @@
|
|||
{ buildVersion, sha256, dev ? false }:
|
||||
{ buildVersion, x64sha256, dev ? false }:
|
||||
|
||||
{ fetchurl, lib, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
|
||||
, pkexecPath ? "/run/wrappers/bin/pkexec"
|
||||
, writeScript, common-updater-scripts, curl, gnugrep, coreutils
|
||||
, writeShellScript, common-updater-scripts, curl, gnugrep, coreutils
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "sublime-merge";
|
||||
pnameBase = "sublime-merge";
|
||||
packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}";
|
||||
binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ];
|
||||
primaryBinary = "sublime_merge";
|
||||
primaryBinaryAliases = [ "smerge" ];
|
||||
downloadUrl = "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
|
||||
downloadUrl = arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
|
||||
versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
|
||||
versionFile = builtins.toString ./default.nix;
|
||||
archSha256 = sha256;
|
||||
arch = "x64";
|
||||
|
||||
libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl ];
|
||||
redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ];
|
||||
in let
|
||||
binaryPackage = stdenv.mkDerivation {
|
||||
pname = "${pname}-bin";
|
||||
binaryPackage = stdenv.mkDerivation rec {
|
||||
pname = "${pnameBase}-bin";
|
||||
version = buildVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = downloadUrl;
|
||||
sha256 = archSha256;
|
||||
};
|
||||
src = passthru.sources.${stdenv.hostPlatform.system};
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
|
@ -78,9 +73,18 @@ in let
|
|||
makeWrapper $out/.${primaryBinary}-wrapped $out/ssh-askpass-sublime \
|
||||
--argv0 "/ssh-askpass-sublime"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = downloadUrl "x64";
|
||||
sha256 = x64sha256;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation (rec {
|
||||
inherit pname;
|
||||
pname = pnameBase;
|
||||
version = buildVersion;
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -102,20 +106,30 @@ in stdenv.mkDerivation (rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "${pname}-update-script" ''
|
||||
#!${stdenv.shell}
|
||||
set -o errexit
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
|
||||
passthru = {
|
||||
updateScript =
|
||||
let
|
||||
script = writeShellScript "${pnameBase}-update-script" ''
|
||||
set -o errexit
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
|
||||
|
||||
latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
|
||||
versionFile=$1
|
||||
latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)')
|
||||
|
||||
for platform in ${lib.concatStringsSep " " meta.platforms}; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform
|
||||
update-source-version ${packageAttribute}.${primaryBinary} $latestVersion --file=${versionFile} --version-key=buildVersion --system=$platform
|
||||
done
|
||||
'';
|
||||
if [[ "${buildVersion}" = "$latestVersion" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for platform in ${lib.escapeShellArgs meta.platforms}; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version "${packageAttribute}.${primaryBinary}" 0 "${lib.fakeSha256}" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
|
||||
update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
in [ script versionFile ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git client from the makers of Sublime Text";
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ let
|
|||
in {
|
||||
sublime-merge = common {
|
||||
buildVersion = "2074";
|
||||
sha256 = "REo59Lpi0fmAOp0XJa4Iln3VKxR5kRiMpz2zfqz1MQs=";
|
||||
x64sha256 = "REo59Lpi0fmAOp0XJa4Iln3VKxR5kRiMpz2zfqz1MQs=";
|
||||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "2073";
|
||||
sha256 = "AQ0ESdi45LHndRNJnkYS+o9L+dlRJkw3nzBfJo8FYPc=";
|
||||
buildVersion = "2076";
|
||||
x64sha256 = "k43D+TqS1DImpJKzYuf3LqmsxF3XF9Fwqn2txL13xAA=";
|
||||
dev = true;
|
||||
} {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.25.0";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7TYrmoC1opZklWO8Z1MK5XlwM635qsPBw3M3WQFhT4c=";
|
||||
sha256 = "sha256-IIgFnDPgeQrsleIzzFr4Q0Kz8bCzs0gFluFw+9Dub7I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, libsForQt5 }:
|
||||
{ callPackage, libsForQt5, pkgsi686Linux }:
|
||||
|
||||
{
|
||||
obs-gstreamer = callPackage ./obs-gstreamer.nix {};
|
||||
|
|
@ -10,6 +10,8 @@
|
|||
looking-glass-obs = callPackage ./looking-glass-obs.nix {};
|
||||
obs-nvfbc = callPackage ./obs-nvfbc.nix {};
|
||||
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix {};
|
||||
obs-vkcapture = callPackage ./obs-vkcapture.nix {};
|
||||
obs-vkcapture = callPackage ./obs-vkcapture.nix {
|
||||
obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture;
|
||||
};
|
||||
obs-backgroundremoval = callPackage ./obs-backgroundremoval.nix {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, libGL
|
||||
, obs-vkcapture32
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -22,8 +23,29 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-yaN0am24p9gC+s64Rop+jQ3952UOtZund/KttnVxP48=";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isi686 [
|
||||
# We don't want to build the plugin for 32bit. The library integrates with
|
||||
# the 64bit plugin but it's necessary to be loaded into 32bit games.
|
||||
"-DBUILD_PLUGIN=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ libGL libX11 obs-studio vulkan-headers vulkan-loader wayland ];
|
||||
buildInputs = [
|
||||
libGL
|
||||
libX11
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
wayland
|
||||
]
|
||||
++ lib.optionals (!stdenv.isi686) [
|
||||
obs-studio
|
||||
];
|
||||
|
||||
# Support 32bit Vulkan applications by linking in the 32bit Vulkan layer
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
|
||||
ln -s ${obs-vkcapture32}/share/vulkan/implicit_layer.d/obs_vkcapture_32.json \
|
||||
"$out/share/vulkan/implicit_layer.d/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OBS Linux Vulkan/OpenGL game capture";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tartube";
|
||||
version = "2.3.367";
|
||||
version = "2.4.093";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axcore";
|
||||
repo = "tartube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZoNe3Ibv0adM6Is5cWMqfUrr0U3R951IJFsdEm1bztc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-l8jB+3vY9jOlCaLDHAvDm1Ko7viHbnRBIMEXLb/k2z0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ustreamer";
|
||||
version = "5.17";
|
||||
version = "5.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pikvm";
|
||||
repo = "ustreamer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l0O7iuqXJTGcODPk0BzWXr8GbJJOcAeAHyo147WMnjk=";
|
||||
sha256 = "sha256-ZJebLsmoaIxfM8Eenv/r351Kr8XM+wyZUc2TI+oGDxU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libbsd libevent libjpeg ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/5HYEcJzdGAiaMAh82vlDjzwEc7bf9gAYOAz7fkysR0=";
|
||||
sha256 = "sha256-d7fXbzbrqhP6zLVZo3gO+FyvZg7Z3AGlNSNLy0PD6EE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "gamescope";
|
||||
version = "3.11.39";
|
||||
version = "3.11.43";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
|||
owner = "Plagman";
|
||||
repo = "gamescope";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MpJczFZk0syt/CMwAhA7H+01G8E4syFsJGnzD/RneQQ=";
|
||||
hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM=";
|
||||
};
|
||||
|
||||
patches = [ ./use-pkgconfig.patch ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "15.6.3";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
|||
|
|
@ -1,95 +1,95 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "001k987gf2drwh57iplicylnk4ssgzrhrfjv3b27xpwanjjdi0j9";
|
||||
iosevka-aile = "1yg2g5sq7qc4aw85vaj3f6yc1lrqnx1dfghcb5p5icflp23giv48";
|
||||
iosevka-curly = "0haxn2sxmnydrrmmbp0rf4ylzc05z10p73bmhvm53grysawr0lph";
|
||||
iosevka-curly-slab = "1z7ji33wf91zayqk6bkjq6ayny5r3sgi1sr94ikn47vb8rax75af";
|
||||
iosevka-etoile = "0xcvp5v4fz459fhihij9mm6q95plrz6ffgrr6c9ir4nk0d44gh9p";
|
||||
iosevka-slab = "0923yshy81lcssz8p52kjwa0njiyr95kk193n8fnfwycgak5w4g7";
|
||||
iosevka-ss01 = "0g90589l5wsa2r7yl7ii04g2lninpw36yrw6djpvh3821d7zfwli";
|
||||
iosevka-ss02 = "1pvxnrhcz01ga4yklsc7s8qbcz3il1ibqaszcmkkaxazlqqk600a";
|
||||
iosevka-ss03 = "16j0bbyq5yyph07z1vz0lgy1c0ac4hywz394favz00i2gc9gczql";
|
||||
iosevka-ss04 = "0000b4d9iwydyyh91v1jkbwszglq8z1wz9a3gaklisga0zfalm32";
|
||||
iosevka-ss05 = "0fdcjsfk3ih18cd4ax2vxsxsa3gf6rx7v1ynm3l1ww642zfn7kj6";
|
||||
iosevka-ss06 = "0rgnz8d9mlkinkq4bkbgmkvmnnym6amwsbri0pj60dm2dgsp9ipn";
|
||||
iosevka-ss07 = "0bfrkh8bc0h2gkyq79vmppjcvil549y2qqaz7vb8gm2gmbglspaz";
|
||||
iosevka-ss08 = "17wbg6zzrx6inzx1n7c3gc6h2fa6fch0lnmic8ky4dvzhaqzcpyn";
|
||||
iosevka-ss09 = "03fq1mcm0jywjawlkii634vgm2d6173j35ppg1qlgpg5gysjnsvg";
|
||||
iosevka-ss10 = "15189r3cg1y1fjcb7qpk03lqfm3f76gzxicwm1kb5220rvjhsqhj";
|
||||
iosevka-ss11 = "00yqca40dbnwbz58nyfpqmg6j7azckjwwid1fqabm5dvd5lc2616";
|
||||
iosevka-ss12 = "0ikv5rfnvyq5fnppcsfddrz5yjjm6p97hfp7xzx50i4gpykdays7";
|
||||
iosevka-ss13 = "0n9nlq4qmgwbxh1qzzhrjf6kb955hk6lkagq7gk1vig49xj2v2w9";
|
||||
iosevka-ss14 = "11vva8mdanb5sdx6nv7jr2vqzx7jwapz4hy6dc4xdxvsp90wvqrc";
|
||||
iosevka-ss15 = "0v4v6fh4nzd1v15csxj5dc9s7wwxrgx1crb2c1q42xa1fj5s6q11";
|
||||
iosevka-ss16 = "0h2vgy0fk8gc2b9nnb8hf79njdkyigsjhnzp0p1mi8k08ca8zy95";
|
||||
iosevka-ss17 = "1v1sl9j5ckcvx3p6g4dagxf4cx5n44k6awpg4mz4fhzvfi5y1a3b";
|
||||
iosevka-ss18 = "0qjal5mg8bmwa0fd9m59k2m9qjsmfwz0n6f6q6zvb00bi7mw6qhn";
|
||||
sgr-iosevka = "1cvf6512iqngy772z78ayzyyd574ymffpldlrdpyvbcgw9kcrh84";
|
||||
sgr-iosevka-aile = "166hncxlaq5z32ic88lkgxkj6pbhjz1fdhb5bhzrp1l1mgl29s53";
|
||||
sgr-iosevka-curly = "0m37ccridvjik1jhvy0pblbps7m44wkwd1v2s34xv6wr901dmr5x";
|
||||
sgr-iosevka-curly-slab = "100cvlpxlv62if341s52w8441axscyijgjz9m1g46yr3lngazff9";
|
||||
sgr-iosevka-etoile = "1nwcaqw6rnmp89fhshh74dr45avp59x3fg0h3ipkk17n9slw6b1l";
|
||||
sgr-iosevka-fixed = "1m12k9f4a2rn4jx31qw11s4nffw9bgr4v9k12hdnxr7r1ybgg974";
|
||||
sgr-iosevka-fixed-curly = "1db12r5amcvxvqn8sqwd120vixnbzk7rb75nibnan1k5zx9vyl2r";
|
||||
sgr-iosevka-fixed-curly-slab = "15rly7vg69avxzkiyy2k8jhb29ppjyw7rk49j5zhsyapw6n0f6sy";
|
||||
sgr-iosevka-fixed-slab = "0c4sihad0vgy8hhgcbwlwayn3y8krigr6w2f9qlz70adzy8g1z5n";
|
||||
sgr-iosevka-fixed-ss01 = "0zw90a22143ixnpb3gx76fgilvbn986lca4bpmd7r318hq48byw3";
|
||||
sgr-iosevka-fixed-ss02 = "12hkwg294a11k882s0fr13w2j7cqlri5p0mn5bys926159j71ani";
|
||||
sgr-iosevka-fixed-ss03 = "0mz69vxisd12mqx3aw486p96xjhqhgy1nn8p4b17b51zaj7mn593";
|
||||
sgr-iosevka-fixed-ss04 = "12rmh62y1s5am7lsw01p14vlchw34spy0rdma7f9yhyjfy0403rs";
|
||||
sgr-iosevka-fixed-ss05 = "0mp27hibvz6va2ssapbqk2jhhz1yzr0ax0gprzwrdg89bpnglf34";
|
||||
sgr-iosevka-fixed-ss06 = "0z3m9s4366rdk0k4m7vjp5g076jv6kbb7nzf2msdrfz1sxwjl8w3";
|
||||
sgr-iosevka-fixed-ss07 = "19b7i5gqzbsf8am81a9yzfn7zbdr5k34vgsp11cj5rrs82li9qrs";
|
||||
sgr-iosevka-fixed-ss08 = "0hwr5df93w1ghb2wkszv5npgbdxak0zvdv45nrmpsxhc9hfzy3mx";
|
||||
sgr-iosevka-fixed-ss09 = "0i7fahdwlna1nzjsc2iwxj9da0glp8j6ipqxaj3r03chb7p6d5qd";
|
||||
sgr-iosevka-fixed-ss10 = "0kq9sfidq14114b3564mp490yi7kwsyk5fx0bc8c06nfn50y565k";
|
||||
sgr-iosevka-fixed-ss11 = "19ra48lbasm03ypd9dkfqv816ykn7mvvwcc0x97vlakxqnqb526m";
|
||||
sgr-iosevka-fixed-ss12 = "0s4jdj1v5dbfapiqm985w31l7b5ibkz0z2rqzj39rcin42nbbkbi";
|
||||
sgr-iosevka-fixed-ss13 = "1437igg9ff9by2bkk1qll1dhssccdi3bzja7s18m5dnjij0g62vp";
|
||||
sgr-iosevka-fixed-ss14 = "0n89r0xvcvaxaf67lmsqzxqlxpx9q7ci3zppijvpkhks4p09p70j";
|
||||
sgr-iosevka-fixed-ss15 = "1dg7s62kmy024q46hvf29h58gj0mv6hfb9zvkbcxss9vx9xrhw8y";
|
||||
sgr-iosevka-fixed-ss16 = "0pfg9m421996cgzvi3y9jxpjl8cxa69mlrddyk98hfq64d9flf3l";
|
||||
sgr-iosevka-fixed-ss17 = "17vd2lnxvq2w138p1pkkhs3scl5g96q684ln20gb8hy4330s4fps";
|
||||
sgr-iosevka-fixed-ss18 = "00cj148drpnzr9kgb1ginbb294cj1pw35knl866zxl6ds34b4n71";
|
||||
sgr-iosevka-slab = "03p0zr75l6q5w1zccv1pk1qmi51rvf680qwvgjgrfzvavqpdzbj9";
|
||||
sgr-iosevka-ss01 = "1ncy21zjqsa559pvqbr4alcblc7bpq05i1gfcr2l18aiv8xk4ska";
|
||||
sgr-iosevka-ss02 = "1ki1fkwkdzj4f75ysiza2r58x3p4v4i21p7krgphgzz1i9j7z0bc";
|
||||
sgr-iosevka-ss03 = "039pf9xlwy9lp03yvc8j2qb0w35kx7h4zncvprbrrpgw0rv688gq";
|
||||
sgr-iosevka-ss04 = "1fmqxd4v4lshja2sfbcnb6x038dy3fi3lx6qn93vi9b6rd699xvw";
|
||||
sgr-iosevka-ss05 = "0lfk2wijvkv6nzji4fy8zllmgqjszw0aw3g48zl2568348vm8c0z";
|
||||
sgr-iosevka-ss06 = "1j9q0v74wkl512z7lgmjqgckprly6zkq1b23ca2cynw5aklsl1c9";
|
||||
sgr-iosevka-ss07 = "08v716j55d9m4p349bg4bscn8222fv5prrmlmyjfmj7l2r47sr7m";
|
||||
sgr-iosevka-ss08 = "1nnixhi6x26p6l19c54p1hm8pjkdqxjgsxqym82h5dyzsfcraws6";
|
||||
sgr-iosevka-ss09 = "1hnb9l1symazn4rz5fjbfpsz3ly0j29vyzkg020i8ibb9h32rg9s";
|
||||
sgr-iosevka-ss10 = "109w970ma7fj81bi5nq04nvf6d8ph25i7anaxq6wx507sd5n4bwa";
|
||||
sgr-iosevka-ss11 = "04j2y0p2j0zxc2nmmk8m16ham93jm0faymc825zaxj6lmavcygzv";
|
||||
sgr-iosevka-ss12 = "1l3rv9p8k0i1zz9gm0gffz3qfzak13ay48b3vx8mmxgd4w6b8q8r";
|
||||
sgr-iosevka-ss13 = "19m9hfc236ncp7b7cchm9b315px4cynmhby7pzww9czdjvii8ph3";
|
||||
sgr-iosevka-ss14 = "1im0dhlb113kgwq6cba9r14i6m1l60sziddj37bxf4b4qsqcrjkn";
|
||||
sgr-iosevka-ss15 = "0jv3gkm9yw7gzrs67m5vnxr7dg99ysnkl09wv1y855r5gx93w0gg";
|
||||
sgr-iosevka-ss16 = "1qmwxgw837gqnzf0klq0malfpkg4my3czz50n7rv806x7sn0zsg5";
|
||||
sgr-iosevka-ss17 = "161cjfnwm7wcq3vywrn381mps2cd51506b437rpspj8a9xg6dq9w";
|
||||
sgr-iosevka-ss18 = "0f4bij7q5mxbwsakqyw879dlwlw6irzk57ryjklqrg2p4zvjll5s";
|
||||
sgr-iosevka-term = "1m861kjnk6z7723cjz3gxzfjzqah15r55f6s5plsqipb77pbhh5a";
|
||||
sgr-iosevka-term-curly = "07l3zqww2hfw9bipv7ckr59gg38krk925bjxyp51s1fcxn38p3j3";
|
||||
sgr-iosevka-term-curly-slab = "1zqyyk33fcz5r73hd5ifg4nbm79jbvzqr2z58jsd8jmamgxbl6fc";
|
||||
sgr-iosevka-term-slab = "0cd9ca9iivicwj7vyj3y4vvpix9xn1hl65hb2bvwqh8bqmhxdqg7";
|
||||
sgr-iosevka-term-ss01 = "01nx6pckjlhm5lzrfwxzvvgq8hjhqha7y0p3vn1f42qcplsgvcf4";
|
||||
sgr-iosevka-term-ss02 = "0qcgx90v0s8472ql99q9165pc27r0xmrkb0fkc0ad0pg2jrdxibh";
|
||||
sgr-iosevka-term-ss03 = "1mcw5mbnazx1sma4i4zqsag110zll4m3by59i8gpf7wxlql5lw6j";
|
||||
sgr-iosevka-term-ss04 = "17ywb2mgkm7qzjicdkp811q7k36xy6zba33ccp4v9x1i17w13kf7";
|
||||
sgr-iosevka-term-ss05 = "0nfnjlyx0avh0vmxxhb8pimy6s1lmzky8vys6hzmivr5q8m3b7g4";
|
||||
sgr-iosevka-term-ss06 = "1aq0khld8qpdhgqnasrwrf0kwijjw7b8gkliirpw4jnksyx0kllz";
|
||||
sgr-iosevka-term-ss07 = "0vbz95341hmfni82bysrvsw6n30fcbm9j6ac7as824vkxa5lswp8";
|
||||
sgr-iosevka-term-ss08 = "0sq4ln16p3g8bbn01a32wi585lbahg4snmfaypbwnxr4gci7jfy3";
|
||||
sgr-iosevka-term-ss09 = "1ys24c2gwrizdkrglcns9x5sqgi4z810c8ssqzp6p8n9ldw8q36g";
|
||||
sgr-iosevka-term-ss10 = "16v8klsa8xbwlkx60di96c48f7gxnislikrdl7rz222b3pwl6p2j";
|
||||
sgr-iosevka-term-ss11 = "1bayyybq3xnrx4sd0pfh18zzwfal5va2j4ykv4vd680pkr7wm3rv";
|
||||
sgr-iosevka-term-ss12 = "02280qik2msr9r32pz49sk421fy11vjmay4ic5zfm2rjhvvckvpm";
|
||||
sgr-iosevka-term-ss13 = "0h6pi0qbfh35bzpfcgvm14hbvc13ja5pakrwz6nbg4llrghhwg4y";
|
||||
sgr-iosevka-term-ss14 = "1yxdbx3y7j21p76mnwwzxknvssw25ymwckcxyjk86c2dq9yjk8id";
|
||||
sgr-iosevka-term-ss15 = "1bkcrx9jmq4wbl548hvdqh4ks4s3m446x5990n49s7n0q9qqv4fr";
|
||||
sgr-iosevka-term-ss16 = "0p5486bd155whlg9frm8dzrx2p2gs2cz9qjgviva5ldci3w9qhj5";
|
||||
sgr-iosevka-term-ss17 = "1wx8gsg8ginqzx91pmddh55nviv070czyyphcl1micwfgwicjs1d";
|
||||
sgr-iosevka-term-ss18 = "1wr60w8rnlczdvpq26av27qg8r4abn5jssjrdk7ccl5l84hirrn7";
|
||||
iosevka = "1akz0vnizqqamk300fknrqay5n72296s43mgf8s2pp6b9vc4m0m1";
|
||||
iosevka-aile = "1frkwcgkzs81dl4sdlv6rv8n226anp3qy8b0zng5ybcrnjsnxapy";
|
||||
iosevka-curly = "0d1h66hayn1aldczd340j75wz1xxbrqvqszx0n798q9difnvbwn6";
|
||||
iosevka-curly-slab = "0bpd7xhhba904pqnc6f4dq575dyap0wh3sm996ad253g264jk3gk";
|
||||
iosevka-etoile = "1qqvwaaw91mnabxhwrgdbsna4zn1pp2mpk51k5ffplcwcwhqkh1h";
|
||||
iosevka-slab = "1wil56m16yy9mx1yx6c5m12bxm82gwdni9cb52374d7dn5ahj6mf";
|
||||
iosevka-ss01 = "1k1xxvsddqpblmc5ymlv7cga39y8zmhpl0kj5akinv3787p73h8s";
|
||||
iosevka-ss02 = "145r4jizn4nwrnar8knrsm52g10sfv4x18hqlqn6nfjp4jw1fjia";
|
||||
iosevka-ss03 = "1mjad7nyj2wdq7g718c1ilrrvzm200prjmkf8m4f2w0rsamv80y4";
|
||||
iosevka-ss04 = "1zcl3g7h9zb9gall3q8pfdsv86xq43s5az50icp29d8n23nkqy29";
|
||||
iosevka-ss05 = "0gq1x9lvpibl0irl53aq1v5rjpprvyrlarp611jkh038fdqb9kp6";
|
||||
iosevka-ss06 = "0rqp5r4h08ypyqz93xpjmj79k1x0dh89vj9qg1sgzn2b3yql6h55";
|
||||
iosevka-ss07 = "1r4d4cp8lw3h61wfn1wdp4l8gxa1gjmhv0qafqh5f2m89sa03mdc";
|
||||
iosevka-ss08 = "16rxpmfird3gbr50p2aqhvlg3gn4m0g8khyb1jhs4bq9xa9a9sx6";
|
||||
iosevka-ss09 = "1q0ghxshs4x3srmkp1dz35bbz4pgkkqh63zjx1bakfs14mpw6k69";
|
||||
iosevka-ss10 = "0q9068raiqf4bhps9b3cyp6vy6dccy2nd4dsnabs3ls0hf5ld5pw";
|
||||
iosevka-ss11 = "05vsq8yjrvdj49sgxza8db9zn4csr9w9l9zlb6y11jw9z50ji3r6";
|
||||
iosevka-ss12 = "0y5wpaax562c4fs68x34mdp023fmj5ma0hfawyqig12g05wkqw5w";
|
||||
iosevka-ss13 = "0fz62080ni0sqhi7k51pr5yhapdjpi68hibljqz2rylrb9nhvl29";
|
||||
iosevka-ss14 = "0myhih7xg1b2pr29gl1qvfj15c3fpxr6h97hm4inxlhzqlsd35xv";
|
||||
iosevka-ss15 = "0dk7712xrrp2s0f0cdp99vc6jafpsppkjk8xbyf7vjk2pylq9kva";
|
||||
iosevka-ss16 = "1nn8qpin1rkybkq570mpl6fvl1sy8cgvrvkg7z5blbrwvn5qd5vs";
|
||||
iosevka-ss17 = "17c2ij3zldhjbxcs7c979xy82bmcy76c4m84xwkpbqnq0iggqhh6";
|
||||
iosevka-ss18 = "009sk8ic52h2vrh52xibj8grl68aav62wky05kzrhfrg1m5v6arb";
|
||||
sgr-iosevka = "1y454cn4zchhb25jx62sw7nyy07b8dsi9h9xbnbclwxfdw3hlk8j";
|
||||
sgr-iosevka-aile = "096q8dj462kp8ngsxb3rjyv7gl3ds8anh8mb03rycm59h7im9jki";
|
||||
sgr-iosevka-curly = "0vz2izq0chi2hl8zszmyag3d2vs44js18x3ff8mr4xhgpj3gamyh";
|
||||
sgr-iosevka-curly-slab = "0aangqga94b80ahsfc74b41g3nkhf73wsxfzy1lsdrmajvi4k24s";
|
||||
sgr-iosevka-etoile = "1n1p4rdbx2zfrhrh4m30dldkg5is6d0j68f8dfp8y2rb6bwrx1nx";
|
||||
sgr-iosevka-fixed = "0776j3fpklbjckm4rq8rh4v8gabdvxmki2rd99br2qcmsg5gx9ch";
|
||||
sgr-iosevka-fixed-curly = "02hpxdfd1mhm4yflx4kj2b57kw0wcqghsswlwyk9m0ll710f6a2q";
|
||||
sgr-iosevka-fixed-curly-slab = "04klqh85mm0zanpjimdfbwaf1kjih9d0bdr6vxzc9fsim47zzfyd";
|
||||
sgr-iosevka-fixed-slab = "0iir8czjf7rsxi19rbj2mgg375a1f82vzq1s6ir7i4his90ihqy0";
|
||||
sgr-iosevka-fixed-ss01 = "0s2k2js7b40j124p6mi1pad3hjfmby4yiv5l8szb3ksikgb6i9xg";
|
||||
sgr-iosevka-fixed-ss02 = "1ng32i29vkbzvadx792alrx20f35jxnpzjbh198z7k07gsxm63cx";
|
||||
sgr-iosevka-fixed-ss03 = "061z9yqfxpr0nhwsd4vhh842jpw0dbfgymbiqxf7gsmjxw7dwb9x";
|
||||
sgr-iosevka-fixed-ss04 = "0m4yd8wlpx43nf0757w249rrh1fb53k132g6wpah9xdfzndhgdf5";
|
||||
sgr-iosevka-fixed-ss05 = "1188sqah28x3nmscr462107y6xqdxs5z9s40a50bii51ii3wr4q3";
|
||||
sgr-iosevka-fixed-ss06 = "1qdz4asqmbvhs3v2izwbs69jkjsm7q1rz0y6jd95rp4ilz4zc9zl";
|
||||
sgr-iosevka-fixed-ss07 = "1q33yp9ahmry7fb3m0vxiyx7c7z69xk6gdhlp0syacwbxif0adxh";
|
||||
sgr-iosevka-fixed-ss08 = "0p43r707hiy27ndq45b85fchrz6vwcj3qymycxckfcdmds0c8dn6";
|
||||
sgr-iosevka-fixed-ss09 = "0f30kyqr8g2jgzlc87b0p242qina3zgbs7a2cy35adzdvnasg8ln";
|
||||
sgr-iosevka-fixed-ss10 = "0zdrsz918617xl1ninv4nyfc8zd5x91yjjf09gd7vrvxrq0pc7gh";
|
||||
sgr-iosevka-fixed-ss11 = "05nqp90932gq72lhcr4csba9xvi2c06jhvhai786jqmnmy2q63r1";
|
||||
sgr-iosevka-fixed-ss12 = "1vqriqa8g85f7y4qpr1ngcfyrd9p511fk2a83ny50d9ggqqmm3vg";
|
||||
sgr-iosevka-fixed-ss13 = "0m8sh1k3wqqm1618xn5p9p50mkcl1pzm7dmnbbwadmp812kj3l06";
|
||||
sgr-iosevka-fixed-ss14 = "0k2invfidpk088xa9m09gl09lgmrdz5nszbbi8cm3a4ngsrvnxzi";
|
||||
sgr-iosevka-fixed-ss15 = "0n5mqz7msjfbmdy25fbmg2va7jqaf81ymn6s340qblwv437b1v6f";
|
||||
sgr-iosevka-fixed-ss16 = "1ivd8hv52zd7ai1f0mnm7111622j4xg1sz3l9qpi6bbh6f8wiz8y";
|
||||
sgr-iosevka-fixed-ss17 = "1w460i7fxdzf1mdkc4sykdykb718xvjk5im68d0341zz9byfa9dk";
|
||||
sgr-iosevka-fixed-ss18 = "1gc5qfjswyp8farvrg4v8miyw5db668w8zyb21jkcxy4vfahh1fz";
|
||||
sgr-iosevka-slab = "059xva7waxzazcs23lil00ll7mc0pahjdpj8pks7851h3n1bxf3b";
|
||||
sgr-iosevka-ss01 = "1jfsz50krhjvhs9z0prl97b2dbsxfjny2ym8hyrcmhhqr7lwxxkv";
|
||||
sgr-iosevka-ss02 = "0y2b0mwmpvv3by6nnhz30bzdwqbmi6w7b800pnnfyh6s017613vv";
|
||||
sgr-iosevka-ss03 = "0ags2s26j4haqk3v7lf24yzymk2mqay5j9cak7dq2bmbm2mrp7sx";
|
||||
sgr-iosevka-ss04 = "1fhlfskdzxlmsv76m05s1abvg0hwkd39bbg2803f79b5a171h3y8";
|
||||
sgr-iosevka-ss05 = "1gpc5l6xk7cfaz0j0x4pan2yr87bhd7w8pwihki985rx387mwmqy";
|
||||
sgr-iosevka-ss06 = "079xxr09gxpvxp2m2zydv7dvkw5wpiqjzq5yvqx5j65j86dvihqq";
|
||||
sgr-iosevka-ss07 = "1bzpc32vsgrn45cxfdwwv1lijp387y7bbb9jc6fl8clnsklz5wdl";
|
||||
sgr-iosevka-ss08 = "1mdfxz51dr40x8mk73ifr75p7h0ac2w0gp4a67qlrwpz687nqz49";
|
||||
sgr-iosevka-ss09 = "0ghdx7gnficq39i71rwbi499paml0zb4xj4cjw0c194li1k3d1ph";
|
||||
sgr-iosevka-ss10 = "0ah10yf2w0px0y8pdra7rz57z16hv24q7mgn641shi809mcyiz9a";
|
||||
sgr-iosevka-ss11 = "08qnqiyigdbxm4wsr9gdifkyzvngncvfl8rw0is2a7clz9zpsyq2";
|
||||
sgr-iosevka-ss12 = "1yzr58il8aggqrn6l1ra0hg0xdsvrb7095qrdy1g5641df7ig91i";
|
||||
sgr-iosevka-ss13 = "1kz3gas5pxhhpwbnwrdy7qvw32vhzipzpncsdr1baakm4fngnxgz";
|
||||
sgr-iosevka-ss14 = "0860v52lnxjp0l21ak6p2n3vz5p8nfp23a7nrxrxxss3dx7cdr0x";
|
||||
sgr-iosevka-ss15 = "1w9ic5v6vjpw5fcrkv37xc4v4an2741i6q0461rf4xhv8vmbvj5k";
|
||||
sgr-iosevka-ss16 = "0qwmszs6gkpy0kdrilchpa6wm0gqvcfcii7rlhz6i931qdq3hx2j";
|
||||
sgr-iosevka-ss17 = "01d083l8ha9v2220kgzhjrvvk2822i46lvk2xvbb53mv6ml5pfyh";
|
||||
sgr-iosevka-ss18 = "0id0xs40n6hh08mqf32f6bxana3mh1h4yrdss55sln34rq5v0sin";
|
||||
sgr-iosevka-term = "0c32l3n97rlas2avyaqz9jzz7f1v52cp1jijzmal7zhdml6ahrkm";
|
||||
sgr-iosevka-term-curly = "1nr336ypclz2cs1al4xirw9w27yf3hh4myj5ky3m323mp5b5pzdn";
|
||||
sgr-iosevka-term-curly-slab = "1ylcpw9rcpmihf2zyxl7qkmq12bm7y823ks4q3ssj3z7ziddpj2d";
|
||||
sgr-iosevka-term-slab = "0ivwgfj1fhcf8a1d4bj0ym7w7q66rbgj65yfpzx4rzkgjimigpwl";
|
||||
sgr-iosevka-term-ss01 = "1rakana5w6qrzzbhschyawpfpxlhkrqbspzqrjzxbj87cxclrppc";
|
||||
sgr-iosevka-term-ss02 = "1azkwyk484gqnwi76bg11nswh17dbq3s4pn79rhxlankfmqa4bli";
|
||||
sgr-iosevka-term-ss03 = "1h426sam4d9zf8bwj28m4z33767fg0irbnrkiz4fnnbjjc1d6fwv";
|
||||
sgr-iosevka-term-ss04 = "0gr0906h6swh57j650hpq7xmfggkhv4rrbc60xhsbvwihpc8rya7";
|
||||
sgr-iosevka-term-ss05 = "009xb23xljp02gn7qb1x53grnsqw2dapkm1i0l6x8grz2bcm7bs9";
|
||||
sgr-iosevka-term-ss06 = "198k7wspvhzkgzwcykf5y1v67fhf6gd8wmnbnvslr0mxwvmq2bpn";
|
||||
sgr-iosevka-term-ss07 = "16x0yc5y0z3c7hwm95rlb4203glhmzvkmgqb1f8glzaxh40rv0sl";
|
||||
sgr-iosevka-term-ss08 = "02ngwyfadda47qmsjnxf9g052xbdj1fndxrq0bv043hvdxdcg6w2";
|
||||
sgr-iosevka-term-ss09 = "091l3078svrf3qynx8bvr6jgzwcbbj0zhm97f3lzrs39rzr94jih";
|
||||
sgr-iosevka-term-ss10 = "0vfbdly9lfgf2adk53qj662xivx0vhp08ssgqbv5laiflgchqbrc";
|
||||
sgr-iosevka-term-ss11 = "1mjhpi31ac0vjdarpp7xmpqblp6kgfdvag6didqk59s584zl7n3p";
|
||||
sgr-iosevka-term-ss12 = "11n6w0z0vwc1731x8j9cavhywmzw51ydlkwcr62c97kc6wafm7c1";
|
||||
sgr-iosevka-term-ss13 = "104najcndlcba59qn7kkyljd245l4skkhhj8aa4f53770grpp0m0";
|
||||
sgr-iosevka-term-ss14 = "0zvawavi0lkc1jws5ni0f24ddqqflp43zhajcx1gfspivnqh7qsa";
|
||||
sgr-iosevka-term-ss15 = "0ribbrcim0a75pxrwjj86rjvlzakn8l63n19mvpvp9ih431qigrz";
|
||||
sgr-iosevka-term-ss16 = "1bk3gr36dhjsm35q3q0gxbrlzqwfjm7i9yp19s350wxaadksj3n8";
|
||||
sgr-iosevka-term-ss17 = "0ly6g2ikps1nk68pkajlqmfiw6w439nxxgwr2j5f41r9zh2xhkpw";
|
||||
sgr-iosevka-term-ss18 = "12a0bpqv1nfj9znlq3v1345lr1wnb5qf0z411gqvgy66cs8r0dyn";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ace";
|
||||
version = "7.0.6";
|
||||
version = "7.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
|
||||
sha256 = "sha256-SgzX2khR92n9388z9mPrpK+tgk7+/59Z8TTEZA7oAhY=";
|
||||
sha256 = "sha256-bZQKtNIdTzCbwE3T/fF7e/1CETG4S42Hq8S9RDxCZdw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-cal";
|
||||
version = "0.5.17";
|
||||
version = "0.5.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-peaoTv2TLqtHScfnCPMNbE6fhUTKfRe1ZzuBsr/rpz0=";
|
||||
sha256 = "sha256-sT5ahf8MuIhqDV6RrRU+RgsLdwVUDEFWRZJpzQJOPGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-compression";
|
||||
version = "0.2.14";
|
||||
version = "0.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-compression";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd";
|
||||
sha256 = "sha256-VWQsPEanti6EyAfDbdUfFwe3sh/AhElytTQn2ZpLVgg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-sdkutils";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-sdkutils";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G+ykP39EmI8BCeulTsZ/OSFKRzXVbEK0+mtJ3tugl5M=";
|
||||
sha256 = "sha256-mbleTBNZegfYeaRgEup36+mAwYs/2FReA3gW2tp4ctk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-checksums";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k3hIGk92HncRAktpuvNcZnaBZiLj63/wQBz2WScUjhQ=";
|
||||
sha256 = "sha256-pSUSJTbwKYF2GsJG8DhLxxsv1ssp+/1c2gMY4dXbdFQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3.7";
|
||||
version = "3.3.8";
|
||||
pname = "glfw";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glfw";
|
||||
repo = "GLFW";
|
||||
rev = version;
|
||||
sha256 = "sha256-aWwt6FRq/ofQmZAeavDa8inrJfrPxb8iyo1XYdQsrKc=";
|
||||
sha256 = "sha256-4+H0IXjAwbL5mAWfsIVhW0BSJhcWjkQx4j2TrzZ3aIo=";
|
||||
};
|
||||
|
||||
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inih";
|
||||
version = "53";
|
||||
version = "56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhoyt";
|
||||
repo = pname;
|
||||
rev = "r${version}";
|
||||
sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6";
|
||||
sha256 = "sha256-7k3i3pElihastUDrdf9DyRZMe2UNFckfLUFGb4rbWLo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,20 @@ stdenv.mkDerivation rec {
|
|||
pname = "itk";
|
||||
version = "5.2.1";
|
||||
|
||||
itkGenericLabelInterpolatorSrc = fetchFromGitHub {
|
||||
owner = "InsightSoftwareConsortium";
|
||||
repo = "ITKGenericLabelInterpolator";
|
||||
rev = "2f3768110ffe160c00c533a1450a49a16f4452d9";
|
||||
hash = "sha256-Cm3jg14MMnbr/sP+gqR2Rh25xJjoRvpmY/jP/DKH978=";
|
||||
};
|
||||
|
||||
itkAdaptiveDenoisingSrc = fetchFromGitHub {
|
||||
owner = "ntustison";
|
||||
repo = "ITKAdaptiveDenoising";
|
||||
rev = "24825c8d246e941334f47968553f0ae388851f0c";
|
||||
hash = "sha256-deJbza36c0Ohf9oKpO2T4po37pkyI+2wCSeGL4r17Go=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "InsightSoftwareConsortium";
|
||||
repo = "ITK";
|
||||
|
|
@ -16,16 +30,22 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \
|
||||
--replace "-march=corei7" "" \
|
||||
--replace "-mtune=native" ""
|
||||
ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator
|
||||
ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_EXAMPLES=OFF"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DITK_FORBID_DOWNLOADS=ON"
|
||||
"-DModule_ITKMINC=ON"
|
||||
"-DModule_ITKIOMINC=ON"
|
||||
"-DModule_ITKIOTransformMINC=ON"
|
||||
"-DModule_ITKVtkGlue=ON"
|
||||
"-DModule_ITKReview=ON"
|
||||
"-DModule_MGHIO=ON"
|
||||
"-DModule_AdaptiveDenoising=ON"
|
||||
"-DModule_GenericLabelInterpolator=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake xz makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.2.5";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-ffeSrWcvxvMY4mmA/+VoMitoCVUUP91t1lIOcuzNrJY=";
|
||||
sha256 = "sha256-Fyx8qGojlWMlDCnuG+Ks2L2/Kf94GC+/0YiV3JjZgS8=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libofx";
|
||||
version = "0.10.3";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibOFX";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2ZSbXdlpX5MDV9y1d9ZqNSh/834MUeCZJHjJcg7ap0A=";
|
||||
sha256 = "sha256-KinJhCscuOCvTkll6sE+404ISqwGX38GnArFKm6hi3U=";
|
||||
};
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "7.4.5";
|
||||
version = "7.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m1ZHyHYFDGTYpP4uAg4T75sLKoLwhEDJstWg7EXHNc8=";
|
||||
sha256 = "sha256-/6xwvnLnSihnEWhnLIZ9zvUuR20ToOhub5AmXhSQLb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.3.12";
|
||||
version = "1.3.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1n1bak4s67cfizh8j5wpf05kfdcjvwqaca4rq9qys25z52bbpn9f";
|
||||
sha256 = "sha256-U/mrtDlpBJm2nAjb8bgn36vzuN7civQ1mKguNogr0nE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
"@forge/cli" = "forge";
|
||||
"@gitbeaker/cli" = "gitbeaker";
|
||||
"@google/clasp" = "clasp";
|
||||
"@hyperspace/cli" = "hyp";
|
||||
"@medable/mdctl-cli" = "mdctl";
|
||||
"@mermaid-js/mermaid-cli" = "mmdc";
|
||||
"@nerdwallet/shepherd" = "shepherd";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, "@commitlint/config-conventional"
|
||||
, "@forge/cli"
|
||||
, "@google/clasp"
|
||||
, "@hyperspace/cli"
|
||||
, "@medable/mdctl-cli"
|
||||
, "@nerdwallet/shepherd"
|
||||
, "@nestjs/cli"
|
||||
|
|
|
|||
3917
pkgs/development/node-packages/node-packages.nix
generated
3917
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -38,13 +38,6 @@ final: prev: {
|
|||
];
|
||||
};
|
||||
|
||||
"@hyperspace/cli" = prev."@hyperspace/cli".override {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
buildInputs = [ final.node-gyp-build ];
|
||||
postInstall = ''wrapProgram "$out/bin/hyp" --prefix PATH : ${ lib.makeBinPath [ nodejs ] }'';
|
||||
};
|
||||
hyperspace-cli = final."@hyperspace/cli";
|
||||
|
||||
"@medable/mdctl-cli" = prev."@medable/mdctl-cli".override {
|
||||
nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "atdgen-codec-runtime";
|
||||
version = "2.9.1";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ahrefs/atd/releases/download/${version}/atdts-${version}.tbz";
|
||||
sha256 = "sha256-OdwaUR0Ix0Oz8NDm36nIyvIRzF+r/pKgiej1fhcOmuQ=";
|
||||
sha256 = "sha256-d9J0CaTp2sQbnKLp6mCDbGwYAIsioVer7ftaLSSFCZg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ buildDunePackage, atdgen-codec-runtime, biniou, camlp-streams, yojson }:
|
||||
{ buildDunePackage, atdgen-codec-runtime, biniou, yojson }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "atdgen-runtime";
|
||||
|
|
@ -6,7 +6,7 @@ buildDunePackage rec {
|
|||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [ biniou camlp-streams yojson ];
|
||||
propagatedBuildInputs = [ biniou yojson ];
|
||||
|
||||
meta = atdgen-codec-runtime.meta // {
|
||||
description = "Runtime library for code generated by atdgen";
|
||||
|
|
|
|||
13
pkgs/development/ocaml-modules/elpi/atd_2_10.patch
Normal file
13
pkgs/development/ocaml-modules/elpi/atd_2_10.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/elpi_trace_elaborator.ml b/src/elpi_trace_elaborator.ml
|
||||
index ca13114d..093e7593 100644
|
||||
--- a/src/elpi_trace_elaborator.ml
|
||||
+++ b/src/elpi_trace_elaborator.ml
|
||||
@@ -664,6 +664,6 @@ let main =
|
||||
|
||||
let cards = Trace.cards steps ~stack_frames ~aggregated_goal_success ~goal_text ~goal_attempts in
|
||||
|
||||
- let ob = Bi_outbuf.create_channel_writer stdout in
|
||||
+ let ob = Buffer.create 17 in
|
||||
write_trace ob cards;
|
||||
- Bi_outbuf.flush_channel_writer ob
|
||||
+ Buffer.output_buffer stdout ob
|
||||
|
|
@ -31,6 +31,9 @@ buildDunePackage rec {
|
|||
pname = "elpi";
|
||||
inherit (fetched) version src;
|
||||
|
||||
patches = lib.optional (versionAtLeast version "1.16" || version == "dev")
|
||||
./atd_2_10.patch;
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
buildInputs = [ perl ncurses ]
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ buildDunePackage rec {
|
|||
buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ];
|
||||
|
||||
checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08"
|
||||
&& lib.versionOlder yojson.version "2.0";
|
||||
|
||||
preCheck = ''
|
||||
# some run.t files check the content of patchShebangs-ed scripts, so patch
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{ lib, fetchurl, buildDunePackage, cppo, easy-format, biniou }:
|
||||
{ lib, fetchurl, buildDunePackage, cppo, seq }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "yojson";
|
||||
version = "1.7.0";
|
||||
useDune2 = true;
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
|
||||
sha256 = "1iich6323npvvs8r50lkr4pxxqm9mf6w67cnid7jg1j1g5gwcvv5";
|
||||
sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
propagatedBuildInputs = [ easy-format biniou ];
|
||||
propagatedBuildInputs = [ seq ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An optimized parsing and printing library for the JSON format";
|
||||
|
|
|
|||
21
pkgs/development/php-packages/inotify/default.nix
Normal file
21
pkgs/development/php-packages/inotify/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ buildPecl
|
||||
, lib
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPecl {
|
||||
pname = "inotify";
|
||||
|
||||
version = "3.0.0";
|
||||
sha256 = "sha256-xxt4ZEwBFVecx5T1jnhEFEF1HXgEC52dGiI9Ppwtcj0=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin; # no inotify support
|
||||
description = "Inotify bindings for PHP";
|
||||
license = licenses.php301;
|
||||
homepage = "https://github.com/arnaud-lb/php-inotify";
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings-ble";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "vincegio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E/+ObY/kO52J0nbyHGsBlqY5OYlnwf3ujAHEd1pEKvo=";
|
||||
hash = "sha256-ihNy5Rme20fCO1tG7aqdVFhSF3DI9hAlge54+/nNGLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pL9b3ocjx81tU+U6C1kOe28HM23dsuE7hkoOUV4YBAQ=";
|
||||
hash = "sha256-G3EZ23bpvt0HBjHtxJnpXgOzv+3/Rl8yWrVR5s3iZQA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
let
|
||||
pname = "coqui-trainer";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage {
|
|||
owner = "coqui-ai";
|
||||
repo = "Trainer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tRm/TElGjVTgCrI80wCt4F1hO82CsDPz2ynJzQKmbIs=";
|
||||
hash = "sha256-WvJDGV7gmf/QQN3SswTq/ABy9ppPFi5xYnMeL/M7GxY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pZax5qkQ73SVhIKVR+q6xAm6hp+v7jSu6b9HBk5Rr8w=";
|
||||
hash = "sha256-7RFRaGtgNULcPr9YYZsiVV3jSjyAamo8B2fwyqFKpis=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-cli";
|
||||
version = "0.17.1";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ZfFcPfL/uqREwF8zK7KKuIn6wMnaGFOx6W/e/sPGnAw=";
|
||||
sha256 = "sha256-LwDz5w6FmAnwWViF7Hb8c7pgrQzM1pVk999dlbbJAGY=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,13 @@
|
|||
, astroid
|
||||
, pytestCheckHook
|
||||
, docstring-parser
|
||||
, isort
|
||||
, marshmallow
|
||||
, pytest-cov
|
||||
, sphinx
|
||||
, hypothesis
|
||||
, vaa
|
||||
, deal-solver
|
||||
, pygments
|
||||
, typeguard
|
||||
, coverage
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -7,27 +7,32 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-debian";
|
||||
version = "0.1.44";
|
||||
version = "0.1.47";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ZVkv47ZPbGyT2U4tJZnbXgwigx07z/B8t7ltOECxMz4=";
|
||||
hash = "sha256-UeICgjd3o9cWqEO4pUD7oroL7Z9QeofAwPnu/N7DNCw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ chardet ];
|
||||
propagatedBuildInputs = [
|
||||
chardet
|
||||
];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "debian" ];
|
||||
pythonImportsCheck = [
|
||||
"debian"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Debian package related modules";
|
||||
homepage = "https://salsa.debian.org/python-debian-team/python-debian";
|
||||
changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "doc8";
|
||||
version = "0.11.2";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-w1ojH4jxXCBGWRVO09SZ+k1ALX5j1By6e1TPXmRhI6s=";
|
||||
sha256 = "sha256-HpmaFP5BXqltidUFPHkNAQYfGbZzdwa4F9FXnCoHzBY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -52,6 +52,6 @@ buildPythonPackage rec {
|
|||
description = "Style checker for Sphinx (or other) RST documentation";
|
||||
homepage = "https://github.com/pycqa/doc8";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flufl.lock";
|
||||
version = "7.0";
|
||||
version = "7.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-FBX30Z2N2WpYJC4O+5DOPLGHf7VFB0rYwcrky3GR/gE=";
|
||||
sha256 = "sha256-Qxt/6PZhKZIA/2elOLrJNxchgcHtOm76bSiTS0i4oSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pdm-pep517 ];
|
||||
|
|
|
|||
|
|
@ -15,11 +15,12 @@
|
|||
, astor
|
||||
, numpy
|
||||
, asyncstdlib
|
||||
, deal
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "icontract";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -27,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "Parquery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QyuegyjVyRLQS0DjBJXpTDNeBM7LigGJ5cztVOO7e3Y=";
|
||||
hash = "sha256-NUgMt/o9EpSQyOiAhYBVJtQKJn0Pd2lI45bKlo2z7mk=";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
|
|
@ -55,12 +56,10 @@ buildPythonPackage rec {
|
|||
astor
|
||||
numpy
|
||||
asyncstdlib
|
||||
deal
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# needs an old version of deal to comply with the tests
|
||||
# see https://github.com/Parquery/icontract/issues/244
|
||||
"tests_with_others/test_deal.py"
|
||||
# mypy decorator checks don't pass. For some reaseon mypy
|
||||
# doesn't check the python file provided in the test.
|
||||
"tests/test_mypy_decorators.py"
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kS42WokR7ZIqIPi8LbX4tmtjn37tckea2ELbuqzTm2o=";
|
||||
sha256 = "sha256-JkxLDuSaEfPb/Z+Bz2uZ3i0LcQgvYlKUNxXATGdCkzE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-git";
|
||||
version = "0.37.1";
|
||||
version = "0.39.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyterlab_git";
|
||||
inherit version;
|
||||
sha256 = "sha256-vOM2y8XrjmKtVtI6h4/DUrHzSLJuZXIm0C7//gMh+5o=";
|
||||
sha256 = "sha256-2BMSbZ5ICISavg1JON7fiKd4e4vAyWW+geSgxbMowis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, six, flask, pygments, dulwich, httpauth, humanize, pytest, requests, python-ctags3, mock }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, flask, pygments, dulwich, httpauth, humanize, pytest, requests, python-ctags3, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "klaus";
|
||||
version = "1.5.2";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonashaag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "12b96jgiv9y7zmkqqj3dh0fbbm3ps8gbqk925qrhh56zqjl66kx2";
|
||||
sha256 = "sha256-GyWlIFmP78t+cyPWjjB/EgA/L+2QqHPnmfJ64W5gsf8=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six flask pygments dulwich httpauth humanize
|
||||
flask pygments dulwich httpauth humanize
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailsuite";
|
||||
version = "1.9.5";
|
||||
version = "1.9.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bvS+sH10LkQkH/nAGuk/rvPjPhaR/rArIf9W9CWjFMY=";
|
||||
hash = "sha256-d96r712suiL4dSzT5vG/rD+4PInlvpuoAo3cedqVe+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
27
pkgs/development/python-modules/markdownify/default.nix
Normal file
27
pkgs/development/python-modules/markdownify/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, beautifulsoup4
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "markdownify";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-crOkiv/M8v7rJd/Tvsq67PU76vTgi+aNzthEcniDKBM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ beautifulsoup4 six ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "HTML to Markdown converter";
|
||||
homepage = "https://github.com/matthewwithanm/python-markdownify";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.McSinyx ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue