b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-05-03 00:11:58 +00:00 committed by GitHub
parent 68496b3a14 72453271bb
commit 5f8c317aae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
160 changed files with 4900 additions and 2224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -181,6 +181,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The option `i18n.inputMethod.fcitx5.enableRimeData` has been removed. Default RIME data is now included in `fcitx5-rime` by default, and can be customized using `fcitx5-rime.override { rimeDataPkgs = [ pkgs.rime-data, package2, ... ]; }`
- The udev hwdb.bin file is now built with systemd-hwdb rather than the [deprecated "udevadm hwdb"](https://github.com/systemd/systemd/pull/25714). This may impact mappings where the same key is defined in multiple matching entries. The updated behavior will select the latest definition in case of conflict. In general, this should be a positive change, as the hwdb source files are designed with this ordering in mind. As an example, the mapping of the HP Dev One keyboard scan code for "mute mic" is corrected by this update. This change may impact users who have worked-around previously incorrect mappings.
- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead.
- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0).
@ -322,7 +324,9 @@ In addition to numerous new and upgraded packages, this release has the followin
replacement. It stores backups as volume dump files and thus better integrates
into contemporary backup solutions.
- `services.maddy` now allows to configure users and their credentials using `services.maddy.ensureCredentials`.
- `services.maddy` got several updates:
- Configuration of users and their credentials using `services.maddy.ensureCredentials`.
- Configuration of TLS key and certificate files using `services.maddy.tls`.
- The `dnsmasq` service now takes configuration via the
`services.dnsmasq.settings` attribute set. The option

1
nixos/modules/module-list.nix
View file

@ -444,6 +444,7 @@
./services/desktops/pipewire/wireplumber.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/system-config-printer.nix
./services/desktops/system76-scheduler.nix
./services/desktops/telepathy.nix
./services/desktops/tumbler.nix
./services/desktops/zeitgeist.nix

3
nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix
View file

@ -35,6 +35,9 @@ in
ExecStartPre = testCommand;
Restart = "on-failure";
RestartSec = 120;
LimitSTACK = 256 * 1024 * 1024;
OOMPolicy = "continue";
};
};

296
nixos/modules/services/desktops/system76-scheduler.nix Normal file
View file

@ -0,0 +1,296 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.system76-scheduler;
inherit (builtins) concatStringsSep map toString attrNames;
inherit (lib) boolToString types mkOption literalExpression mdDoc optional mkIf mkMerge;
inherit (types) nullOr listOf bool int ints float str enum;
withDefaults = optionSpecs: defaults:
lib.genAttrs (attrNames optionSpecs) (name:
mkOption (optionSpecs.${name} // {
default = optionSpecs.${name}.default or defaults.${name} or null;
}));
latencyProfile = withDefaults {
latency = {
type = int;
description = mdDoc "`sched_latency_ns`.";
};
nr-latency = {
type = int;
description = mdDoc "`sched_nr_latency`.";
};
wakeup-granularity = {
type = float;
description = mdDoc "`sched_wakeup_granularity_ns`.";
};
bandwidth-size = {
type = int;
description = mdDoc "`sched_cfs_bandwidth_slice_us`.";
};
preempt = {
type = enum [ "none" "voluntary" "full" ];
description = mdDoc "Preemption mode.";
};
};
schedulerProfile = withDefaults {
nice = {
type = nullOr (ints.between (-20) 19);
description = mdDoc "Niceness.";
};
class = {
type = nullOr (enum [ "idle" "batch" "other" "rr" "fifo" ]);
example = literalExpression "\"batch\"";
description = mdDoc "CPU scheduler class.";
};
prio = {
type = nullOr (ints.between 1 99);
example = literalExpression "49";
description = mdDoc "CPU scheduler priority.";
};
ioClass = {
type = nullOr (enum [ "idle" "best-effort" "realtime" ]);
example = literalExpression "\"best-effort\"";
description = mdDoc "IO scheduler class.";
};
ioPrio = {
type = nullOr (ints.between 0 7);
example = literalExpression "4";
description = mdDoc "IO scheduler priority.";
};
matchers = {
type = nullOr (listOf str);
default = [];
example = literalExpression ''
[
"include cgroup=\"/user.slice/*.service\" parent=\"systemd\""
"emacs"
]
'';
description = mdDoc "Process matchers.";
};
};
cfsProfileToString = name: let
p = cfg.settings.cfsProfiles.${name};
in
"${name} latency=${toString p.latency} nr-latency=${toString p.nr-latency} wakeup-granularity=${toString p.wakeup-granularity} bandwidth-size=${toString p.bandwidth-size} preempt=\"${p.preempt}\"";
prioToString = class: prio: if prio == null then "\"${class}\"" else "(${class})${toString prio}";
schedulerProfileToString = name: a: indent:
concatStringsSep " "
(["${indent}${name}"]
++ (optional (a.nice != null) "nice=${toString a.nice}")
++ (optional (a.class != null) "sched=${prioToString a.class a.prio}")
++ (optional (a.ioClass != null) "io=${prioToString a.ioClass a.ioPrio}")
++ (optional ((builtins.length a.matchers) != 0) ("{\n${concatStringsSep "\n" (map (m: " ${indent}${m}") a.matchers)}\n${indent}}")));
in {
options = {
services.system76-scheduler = {
enable = lib.mkEnableOption (lib.mdDoc "system76-scheduler");
package = mkOption {
type = types.package;
default = config.boot.kernelPackages.system76-scheduler;
defaultText = literalExpression "config.boot.kernelPackages.system76-scheduler";
description = mdDoc "Which System76-Scheduler package to use.";
};
useStockConfig = mkOption {
type = bool;
default = true;
description = mdDoc ''
Use the (reasonable and featureful) stock configuration.
When this option is `true`, `services.system76-scheduler.settings`
are ignored.
'';
};
settings = {
cfsProfiles = {
enable = mkOption {
type = bool;
default = true;
description = mdDoc "Tweak CFS latency parameters when going on/off battery";
};
default = latencyProfile {
latency = 6;
nr-latency = 8;
wakeup-granularity = 1.0;
bandwidth-size = 5;
preempt = "voluntary";
};
responsive = latencyProfile {
latency = 4;
nr-latency = 10;
wakeup-granularity = 0.5;
bandwidth-size = 3;
preempt = "full";
};
};
processScheduler = {
enable = mkOption {
type = bool;
default = true;
description = mdDoc "Tweak scheduling of individual processes in real time.";
};
useExecsnoop = mkOption {
type = bool;
default = true;
description = mdDoc "Use execsnoop (otherwise poll the precess list periodically).";
};
refreshInterval = mkOption {
type = int;
default = 60;
description = mdDoc "Process list poll interval, in seconds";
};
foregroundBoost = {
enable = mkOption {
type = bool;
default = true;
description = mdDoc ''
Boost foreground process priorities.
(And de-boost background ones). Note that this option needs cooperation
from the desktop environment to work. On Gnome the client side is
implemented by the "System76 Scheduler" shell extension.
'';
};
foreground = schedulerProfile {
nice = 0;
ioClass = "best-effort";
ioPrio = 0;
};
background = schedulerProfile {
nice = 6;
ioClass = "idle";
};
};
pipewireBoost = {
enable = mkOption {
type = bool;
default = true;
description = mdDoc "Boost Pipewire client priorities.";
};
profile = schedulerProfile {
nice = -6;
ioClass = "best-effort";
ioPrio = 0;
};
};
};
};
assignments = mkOption {
type = types.attrsOf (types.submodule {
options = schedulerProfile { };
});
default = {};
example = literalExpression ''
{
nix-builds = {
nice = 15;
class = "batch";
ioClass = "idle";
matchers = [
"nix-daemon"
];
};
}
'';
description = mdDoc "Process profile assignments.";
};
exceptions = mkOption {
type = types.listOf str;
default = [];
example = literalExpression ''
[
"include descends=\"schedtool\""
"schedtool"
]
'';
description = mdDoc "Processes that are left alone.";
};
};
};
config = {
environment.systemPackages = [ cfg.package ];
services.dbus.packages = [ cfg.package ];
systemd.services.system76-scheduler = {
description = "Manage process priorities and CFS scheduler latencies for improved responsiveness on the desktop";
wantedBy = [ "multi-user.target" ];
path = [
# execsnoop needs those to extract kernel headers:
pkgs.kmod
pkgs.gnutar
pkgs.xz
];
serviceConfig = {
Type = "dbus";
BusName= "com.system76.Scheduler";
ExecStart = "${cfg.package}/bin/system76-scheduler daemon";
ExecReload = "${cfg.package}/bin/system76-scheduler daemon reload";
};
};
environment.etc = mkMerge [
(mkIf cfg.useStockConfig {
# No custom settings: just use stock configuration with a fix for Pipewire
"system76-scheduler/config.kdl".source = "${cfg.package}/data/config.kdl";
"system76-scheduler/process-scheduler/00-dist.kdl".source = "${cfg.package}/data/pop_os.kdl";
"system76-scheduler/process-scheduler/01-fix-pipewire-paths.kdl".source = ../../../../pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl;
})
(let
settings = cfg.settings;
cfsp = settings.cfsProfiles;
ps = settings.processScheduler;
in mkIf (!cfg.useStockConfig) {
"system76-scheduler/config.kdl".text = ''
version "2.0"
autogroup-enabled false
cfs-profiles enable=${boolToString cfsp.enable} {
${cfsProfileToString "default"}
${cfsProfileToString "responsive"}
}
process-scheduler enable=${boolToString ps.enable} {
execsnoop ${boolToString ps.useExecsnoop}
refresh-rate ${toString ps.refreshInterval}
assignments {
${if ps.foregroundBoost.enable then (schedulerProfileToString "foreground" ps.foregroundBoost.foreground " ") else ""}
${if ps.foregroundBoost.enable then (schedulerProfileToString "background" ps.foregroundBoost.background " ") else ""}
${if ps.pipewireBoost.enable then (schedulerProfileToString "pipewire" ps.pipewireBoost.profile " ") else ""}
}
}
'';
})
{
"system76-scheduler/process-scheduler/02-config.kdl".text =
"exceptions {\n${concatStringsSep "\n" (map (e: " ${e}") cfg.exceptions)}\n}\n"
+ "assignments {\n"
+ (concatStringsSep "\n" (map (name: schedulerProfileToString name cfg.assignments.${name} " ")
(attrNames cfg.assignments)))
+ "\n}\n";
}
];
};
meta = {
maintainers = [ lib.maintainers.cmm ];
};
}

2
nixos/modules/services/hardware/udev.nix
View file

@ -160,7 +160,7 @@ let
echo "Generating hwdb database..."
# hwdb --update doesn't return error code even on errors!
res="$(${pkgs.buildPackages.udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
res="$(${pkgs.buildPackages.systemd}/bin/systemd-hwdb --root=$(pwd) update 2>&1)"
echo "$res"
[ -z "$(echo "$res" | egrep '^Error')" ]
mv etc/udev/hwdb.bin $out

83
nixos/modules/services/mail/maddy.nix
View file

@ -13,8 +13,6 @@ let
# configuration here https://github.com/foxcpp/maddy/blob/master/maddy.conf
# Do not use this in production!
tls off
auth.pass_table local_authdb {
table sql_table {
driver sqlite3
@ -35,6 +33,7 @@ let
}
optional_step file /etc/maddy/aliases
}
msgpipeline local_routing {
destination postmaster $(local_domains) {
modify {
@ -215,6 +214,63 @@ in {
'';
};
tls = {
loader = mkOption {
type = with types; nullOr (enum [ "file" "off" ]);
default = "off";
description = lib.mdDoc ''
TLS certificates are obtained by modules called "certificate
loaders". Currently only the file loader is supported which reads
certificates from files specifying the options `keyPaths` and
`certPaths`.
'';
};
certificates = mkOption {
type = with types; listOf (submodule {
options = {
keyPath = mkOption {
type = types.path;
example = "/etc/ssl/mx1.example.org.key";
description = lib.mdDoc ''
Path to the private key used for TLS.
'';
};
certPath = mkOption {
type = types.path;
example = "/etc/ssl/mx1.example.org.crt";
description = lib.mdDoc ''
Path to the certificate used for TLS.
'';
};
};
});
default = [];
example = lib.literalExpression ''
[{
keyPath = "/etc/ssl/mx1.example.org.key";
certPath = "/etc/ssl/mx1.example.org.crt";
}]
'';
description = lib.mdDoc ''
A list of attribute sets containing paths to TLS certificates and
keys. Maddy will use SNI if multiple pairs are selected.
'';
};
extraConfig = mkOption {
type = with types; nullOr lines;
description = lib.mdDoc ''
Arguments for the specific certificate loader. Note that Maddy uses
secure defaults for the TLS configuration so there is no need to
change anything in most cases.
See [upstream manual](https://maddy.email/reference/tls/) for
available options.
'';
default = "";
};
};
openFirewall = mkOption {
type = types.bool;
default = false;
@ -224,7 +280,7 @@ in {
};
ensureAccounts = mkOption {
type = types.listOf types.str;
type = with types; listOf str;
default = [];
description = lib.mdDoc ''
List of IMAP accounts which get automatically created. Note that for
@ -270,6 +326,16 @@ in {
config = mkIf cfg.enable {
assertions = [{
assertion = cfg.tls.loader == "file" -> cfg.tls.certificates != [];
message = ''
If maddy is configured to use TLS, tls.certificates with attribute sets
of certPath and keyPath must be provided.
Read more about obtaining TLS certificates here:
https://maddy.email/tutorials/setting-up/#tls-certificates
'';
}];
systemd = {
packages = [ pkgs.maddy ];
@ -318,6 +384,17 @@ in {
$(primary_domain) = ${cfg.primaryDomain}
$(local_domains) = ${toString cfg.localDomains}
hostname ${cfg.hostname}
${if (cfg.tls.loader == "file") then ''
tls file ${concatStringsSep " " (
map (x: x.certPath + " " + x.keyPath
) cfg.tls.certificates)} ${optionalString (cfg.tls.extraConfig != "") ''
{ ${cfg.tls.extraConfig} }
''}
'' else if (cfg.tls.loader == "off") then ''
tls off
'' else ""}
${cfg.config}
'';
};

121
nixos/modules/services/web-apps/mediawiki.nix
View file

@ -8,7 +8,8 @@ let
cfg = config.services.mediawiki;
fpm = config.services.phpfpm.pools.mediawiki;
user = "mediawiki";
group = config.services.httpd.group;
group = if cfg.webserver == "apache" then "apache" else "mediawiki";
cacheDir = "/var/cache/mediawiki";
stateDir = "/var/lib/mediawiki";
@ -73,7 +74,7 @@ let
$wgScriptPath = "";
## The protocol and server name to use in fully-qualified URLs
$wgServer = "${if cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL then "https" else "http"}://${cfg.virtualHost.hostName}";
$wgServer = "${cfg.url}";
## The URL path to static resources (images, scripts, etc.)
$wgResourceBasePath = $wgScriptPath;
@ -87,8 +88,7 @@ let
$wgEnableEmail = true;
$wgEnableUserEmail = true; # UPO
$wgEmergencyContact = "${if cfg.virtualHost.adminAddr != null then cfg.virtualHost.adminAddr else config.services.httpd.adminAddr}";
$wgPasswordSender = $wgEmergencyContact;
$wgPasswordSender = "${cfg.passwordSender}";
$wgEnotifUserTalk = false; # UPO
$wgEnotifWatchlist = false; # UPO
@ -190,6 +190,16 @@ in
description = lib.mdDoc "Which MediaWiki package to use.";
};
finalPackage = mkOption {
type = types.package;
readOnly = true;
default = pkg;
defaultText = literalExpression "pkg";
description = lib.mdDoc ''
The final package used by the module. This is the package that will have extensions and skins installed.
'';
};
name = mkOption {
type = types.str;
default = "MediaWiki";
@ -197,6 +207,22 @@ in
description = lib.mdDoc "Name of the wiki.";
};
url = mkOption {
type = types.str;
default = if cfg.webserver == "apache" then
"${if cfg.httpd.virtualHost.addSSL || cfg.httpd.virtualHost.forceSSL || cfg.httpd.virtualHost.onlySSL then "https" else "http"}://${cfg.httpd.virtualHost.hostName}"
else
"http://localhost";
defaultText = literalExpression ''
if cfg.webserver == "apache" then
"''${if cfg.httpd.virtualHost.addSSL || cfg.httpd.virtualHost.forceSSL || cfg.httpd.virtualHost.onlySSL then "https" else "http"}://''${cfg.httpd.virtualHost.hostName}"
else
"http://localhost";
'';
example = "https://wiki.example.org";
description = lib.mdDoc "URL of the wiki.";
};
uploadsDir = mkOption {
type = types.nullOr types.path;
default = "${stateDir}/uploads";
@ -212,6 +238,24 @@ in
example = "/run/keys/mediawiki-password";
};
passwordSender = mkOption {
type = types.str;
default =
if cfg.webserver == "apache" then
if cfg.httpd.virtualHost.adminAddr != null then
cfg.httpd.virtualHost.adminAddr
else
config.services.httpd.adminAddr else "root@localhost";
defaultText = literalExpression ''
if cfg.webserver == "apache" then
if cfg.httpd.virtualHost.adminAddr != null then
cfg.httpd.virtualHost.adminAddr
else
config.services.httpd.adminAddr else "root@localhost"
'';
description = lib.mdDoc "Contact address for password reset.";
};
skins = mkOption {
default = {};
type = types.attrsOf types.path;
@ -241,6 +285,12 @@ in
'';
};
webserver = mkOption {
type = types.enum [ "apache" "none" ];
default = "apache";
description = lib.mdDoc "Webserver to use.";
};
database = {
type = mkOption {
type = types.enum [ "mysql" "postgres" "sqlite" "mssql" "oracle" ];
@ -318,7 +368,7 @@ in
};
};
virtualHost = mkOption {
httpd.virtualHost = mkOption {
type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix);
example = literalExpression ''
{
@ -366,6 +416,10 @@ in
};
};
imports = [
(lib.mkRenamedOptionModule [ "services" "mediawiki" "virtualHost" ] [ "services" "mediawiki" "httpd" "virtualHost" ])
];
# implementation
config = mkIf cfg.enable {
@ -412,36 +466,42 @@ in
services.phpfpm.pools.mediawiki = {
inherit user group;
phpEnv.MEDIAWIKI_CONFIG = "${mediawikiConfig}";
settings = {
settings = (if (cfg.webserver == "apache") then {
"listen.owner" = config.services.httpd.user;
"listen.group" = config.services.httpd.group;
} // cfg.poolConfig;
} else {
"listen.owner" = user;
"listen.group" = group;
}) // cfg.poolConfig;
};
services.httpd = {
services.httpd = lib.mkIf (cfg.webserver == "apache") {
enable = true;
extraModules = [ "proxy_fcgi" ];
virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
documentRoot = mkForce "${pkg}/share/mediawiki";
extraConfig = ''
<Directory "${pkg}/share/mediawiki">
<FilesMatch "\.php$">
<If "-f %{REQUEST_FILENAME}">
SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
</If>
</FilesMatch>
virtualHosts.${cfg.httpd.virtualHost.hostName} = mkMerge [
cfg.httpd.virtualHost
{
documentRoot = mkForce "${pkg}/share/mediawiki";
extraConfig = ''
<Directory "${pkg}/share/mediawiki">
<FilesMatch "\.php$">
<If "-f %{REQUEST_FILENAME}">
SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
</If>
</FilesMatch>
Require all granted
DirectoryIndex index.php
AllowOverride All
</Directory>
'' + optionalString (cfg.uploadsDir != null) ''
Alias "/images" "${cfg.uploadsDir}"
<Directory "${cfg.uploadsDir}">
Require all granted
</Directory>
'';
} ];
Require all granted
DirectoryIndex index.php
AllowOverride All
</Directory>
'' + optionalString (cfg.uploadsDir != null) ''
Alias "/images" "${cfg.uploadsDir}"
<Directory "${cfg.uploadsDir}">
Require all granted
</Directory>
'';
}
];
};
systemd.tmpfiles.rules = [
@ -489,13 +549,14 @@ in
};
};
systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service"
++ optional (cfg.database.createLocally && cfg.database.type == "postgres") "postgresql.service";
systemd.services.httpd.after = optional (cfg.webserver == "apache" && cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service"
++ optional (cfg.webserver == "apache" && cfg.database.createLocally && cfg.database.type == "postgres") "postgresql.service";
users.users.${user} = {
group = group;
isSystemUser = true;
};
users.groups.${group} = {};
environment.systemPackages = [ mediawikiScripts ];
};

2
nixos/tests/all-tests.nix
View file

@ -393,7 +393,7 @@ in {
lxd-image-server = handleTest ./lxd-image-server.nix {};
#logstash = handleTest ./logstash.nix {};
lorri = handleTest ./lorri/default.nix {};
maddy = handleTest ./maddy.nix {};
maddy = discoverTests (import ./maddy { inherit handleTest; });
maestral = handleTest ./maestral.nix {};
magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};
magnetico = handleTest ./magnetico.nix {};

6
nixos/tests/maddy/default.nix Normal file
View file

@ -0,0 +1,6 @@
{ handleTest }:
{
unencrypted = handleTest ./unencrypted.nix { };
tls = handleTest ./tls.nix { };
}

94
nixos/tests/maddy/tls.nix Normal file
View file

@ -0,0 +1,94 @@
import ../make-test-python.nix ({ pkgs, ... }:
let
certs = import ../common/acme/server/snakeoil-certs.nix;
domain = certs.domain;
in {
name = "maddy-tls";
meta = with pkgs.lib.maintainers; { maintainers = [ onny ]; };
nodes = {
server = { options, ... }: {
services.maddy = {
enable = true;
hostname = domain;
primaryDomain = domain;
openFirewall = true;
ensureAccounts = [ "postmaster@${domain}" ];
ensureCredentials = {
# Do not use this in production. This will make passwords world-readable
# in the Nix store
"postmaster@${domain}".passwordFile = "${pkgs.writeText "postmaster" "test"}";
};
tls = {
loader = "file";
certificates = [{
certPath = "${certs.${domain}.cert}";
keyPath = "${certs.${domain}.key}";
}];
};
# Enable TLS listeners. Configuring this via the module is not yet
# implemented.
config = builtins.replaceStrings [
"imap tcp://0.0.0.0:143"
"submission tcp://0.0.0.0:587"
] [
"imap tls://0.0.0.0:993 tcp://0.0.0.0:143"
"submission tls://0.0.0.0:465 tcp://0.0.0.0:587"
] options.services.maddy.config.default;
};
# Not covered by openFirewall yet
networking.firewall.allowedTCPPorts = [ 993 465 ];
};
client = { nodes, ... }: {
security.pki.certificateFiles = [
certs.ca.cert
];
networking.extraHosts = ''
${nodes.server.networking.primaryIPAddress} ${domain}
'';
environment.systemPackages = [
(pkgs.writers.writePython3Bin "send-testmail" { } ''
import smtplib
import ssl
from email.mime.text import MIMEText
context = ssl.create_default_context()
msg = MIMEText("Hello World")
msg['Subject'] = 'Test'
msg['From'] = "postmaster@${domain}"
msg['To'] = "postmaster@${domain}"
with smtplib.SMTP_SSL(host='${domain}', port=465, context=context) as smtp:
smtp.login('postmaster@${domain}', 'test')
smtp.sendmail(
'postmaster@${domain}', 'postmaster@${domain}', msg.as_string()
)
'')
(pkgs.writers.writePython3Bin "test-imap" { } ''
import imaplib
with imaplib.IMAP4_SSL('${domain}') as imap:
imap.login('postmaster@${domain}', 'test')
imap.select()
status, refs = imap.search(None, 'ALL')
assert status == 'OK'
assert len(refs) == 1
status, msg = imap.fetch(refs[0], 'BODY[TEXT]')
assert status == 'OK'
assert msg[0][1].strip() == b"Hello World"
'')
];
};
};
testScript = ''
start_all()
server.wait_for_unit("maddy.service")
server.wait_for_open_port(143)
server.wait_for_open_port(993)
server.wait_for_open_port(587)
server.wait_for_open_port(465)
client.succeed("send-testmail")
client.succeed("test-imap")
'';
})

4
nixos/tests/maddy.nix → nixos/tests/maddy/unencrypted.nix
View file

@ -1,5 +1,5 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "maddy";
import ../make-test-python.nix ({ pkgs, ... }: {
name = "maddy-unencrypted";
meta = with pkgs.lib.maintainers; { maintainers = [ onny ]; };
nodes = {

24
nixos/tests/mediawiki.nix
View file

@ -7,8 +7,8 @@
let
shared = {
services.mediawiki.enable = true;
services.mediawiki.virtualHost.hostName = "localhost";
services.mediawiki.virtualHost.adminAddr = "root@example.com";
services.mediawiki.httpd.virtualHost.hostName = "localhost";
services.mediawiki.httpd.virtualHost.adminAddr = "root@example.com";
services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
services.mediawiki.extensions = {
Matomo = pkgs.fetchzip {
@ -54,4 +54,24 @@ in
assert "MediaWiki has been installed" in page
'';
};
nohttpd = testLib.makeTest {
name = "mediawiki-nohttpd";
nodes.machine = {
services.mediawiki.webserver = "none";
};
testScript = { nodes, ... }: ''
start_all()
machine.wait_for_unit("phpfpm-mediawiki.service")
env = (
"SCRIPT_NAME=/index.php",
"SCRIPT_FILENAME=${nodes.machine.services.mediawiki.finalPackage}/share/mediawiki/index.php",
"REMOTE_ADDR=127.0.0.1",
'QUERY_STRING=title=Main_Page',
"REQUEST_METHOD=GET",
);
page = machine.succeed(f"{' '.join(env)} ${pkgs.fcgi}/bin/cgi-fcgi -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
assert "MediaWiki has been installed" in page, f"no 'MediaWiki has been installed' in:\n{page}"
'';
};
}

4
pkgs/applications/audio/grandorgue/default.nix
View file

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "grandorgue";
version = "3.10.1-1";
version = "3.11.0";
src = fetchFromGitHub {
owner = "GrandOrgue";
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-QuOHeEgDOXvNFMfMoq0GOnmHKyMG1S8y1lgO9heMk3I=";
sha256 = "sha256-l1KqER/vkNwgKLXIFUzHnYLw2ivGNP7hRiKhIOzn7pw=";
};
postPatch = ''

23
pkgs/applications/audio/mopidy/ytmusic.nix
View file

@ -3,20 +3,33 @@
, mopidy
}:
python3.pkgs.buildPythonApplication rec {
let
python = python3.override {
packageOverrides = self: super: {
ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec {
version = "0.25.1";
src = self.fetchPypi {
inherit (old) pname;
inherit version;
hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ=";
};
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "mopidy-ytmusic";
version = "0.3.8";
src = python3.pkgs.fetchPypi {
src = python.pkgs.fetchPypi {
inherit version;
pname = "mopidy_ytmusic";
sha256 = "6b4d8ff9c477dbdd30d0259a009494ebe104cad3f8b37241ae503e5bce4ec2e8";
};
propagatedBuildInputs = [
(mopidy.override { pythonPackages = python3.pkgs; })
python3.pkgs.ytmusicapi
python3.pkgs.pytube
(mopidy.override { pythonPackages = python.pkgs; })
python.pkgs.ytmusicapi
python.pkgs.pytube
];
pythonImportsCheck = [ "mopidy_ytmusic" ];

15
pkgs/applications/editors/neovim/default.nix
View file

@ -4,6 +4,8 @@
, unibilium, gperf
, libvterm-neovim
, tree-sitter
, fetchurl
, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }
, CoreServices
, glibcLocales ? null, procps ? null
@ -119,7 +121,18 @@ in
)
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
'';
'' + ''
mkdir -p $out/lib/nvim/parser
'' + lib.concatStrings (lib.mapAttrsToList
(language: src: ''
ln -s \
${tree-sitter.buildGrammar {
inherit language src;
version = "neovim-${version}";
}}/parser \
$out/lib/nvim/parser/${language}.so
'')
treesitter-parsers);
shellHook=''
export VIMRUNTIME=$PWD/runtime

24
pkgs/applications/editors/neovim/treesitter-parsers.nix Normal file
View file

@ -0,0 +1,24 @@
{ fetchurl }:
{
c = fetchurl {
url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz";
hash = "sha256:af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2";
};
lua = fetchurl {
url = "https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.14.tar.gz";
hash = "sha256:930d0370dc15b66389869355c8e14305b9ba7aafd36edbfdb468c8023395016d";
};
vim = fetchurl {
url = "https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz";
hash = "sha256:403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2";
};
vimdoc = fetchurl {
url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.0.tar.gz";
hash = "sha256:1ff8f4afd3a9599dd4c3ce87c155660b078c1229704d1a254433e33794b8f274";
};
query = fetchurl {
url = "https://github.com/nvim-treesitter/tree-sitter-query/archive/v0.1.0.tar.gz";
hash = "sha256:e2b806f80e8bf1c4f4e5a96248393fe6622fc1fc6189d6896d269658f67f914c";
};
}

46
pkgs/applications/editors/neovim/update-treesitter-parsers.py Executable file
View file

@ -0,0 +1,46 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p python3
import re
import subprocess
from pathlib import Path
parsers = {}
dir = Path(__file__).parent
regex = re.compile(r"^set\(TREESITTER_([A-Z_]+)_(URL|SHA256)\s+([^ \)]+)\s*\)\s*$")
src = subprocess.check_output(
[
"nix-build",
dir.parent.parent.parent.parent,
"-A",
"neovim-unwrapped.src",
"--no-out-link",
],
text=True,
).strip()
for line in open(f"{src}/cmake.deps/CMakeLists.txt"):
m = regex.fullmatch(line)
if m is None:
continue
lang = m[1].lower()
ty = m[2]
val = m[3]
if not lang in parsers:
parsers[lang] = {}
parsers[lang][ty] = val
with open(dir / "treesitter-parsers.nix", "w") as f:
f.write("{ fetchurl }:\n\n{\n")
for lang, src in parsers.items():
f.write(
f""" {lang} = fetchurl {{
url = "{src["URL"]}";
hash = "sha256:{src["SHA256"]}";
}};
"""
)
f.write("}\n")

924
pkgs/applications/editors/vim/plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

189
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -148,12 +148,12 @@
};
capnp = buildGrammar {
language = "capnp";
version = "0.0.0+rev=fc6e2ad";
version = "0.0.0+rev=7d5fa4e";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-capnp";
rev = "fc6e2addf103861b9b3dffb82c543eb6b71061aa";
hash = "sha256-FKzh0c/mTURLss8mv/c/p3dNXQxE/r5P063GEM8un70=";
rev = "7d5fa4e94d3643ec15750106113be0d40f9fc1bb";
hash = "sha256-K83xouIGsv9EDLp4MSH9i6JE/GlAT72i3eJa58vR2gs=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
};
@ -303,12 +303,12 @@
};
devicetree = buildGrammar {
language = "devicetree";
version = "0.0.0+rev=6428cee";
version = "0.0.0+rev=d2cc332";
src = fetchFromGitHub {
owner = "joelspadin";
repo = "tree-sitter-devicetree";
rev = "6428cee0e9d76fac3291796ced56ac14ecd036ee";
hash = "sha256-QU5lCnTe00Mj5IfrBBnGwvU5S3Gz9VL2FRTNy0FPnIo=";
rev = "d2cc332aeb814ea40e1e34ed6b9446324b32612a";
hash = "sha256-iDiG6pNfALxy7nKyjuHfI9HW5/KElW/6zYguPaiMrzY=";
};
meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
};
@ -436,12 +436,12 @@
};
erlang = buildGrammar {
language = "erlang";
version = "0.0.0+rev=abf5794";
version = "0.0.0+rev=7d083ca";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "abf5794511a912059b8234ea7e70d60b55df8805";
hash = "sha256-38Q2HB5Hj7qdNwMyyXt1eNTqYHefkfC9teJM6PRE22A=";
rev = "7d083ca431265a6a677c10e8ca68a908ab0c2bc8";
hash = "sha256-W08JXLPIjUBfHSaTEGbIKPStQr4jOVE1f9osjrWG82Q=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@ -579,12 +579,12 @@
};
gitcommit = buildGrammar {
language = "gitcommit";
version = "0.0.0+rev=04dcb2c";
version = "0.0.0+rev=735f02b";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "04dcb2cb9a4cf638252b8bd4a829f9acadf2cc4c";
hash = "sha256-plu1qzMfvMfSqapQ4q+ZYNULDM8mBwlNeOzHoSSC3Hc=";
rev = "735f02b12d9cdd9a8b90ac4b2dff8cdab6dd1e7b";
hash = "sha256-uWePpMTJNiR7uh9LpmSiIQUHNiVDF8i32nckPKBFH3g=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@ -612,12 +612,12 @@
};
glimmer = buildGrammar {
language = "glimmer";
version = "0.0.0+rev=21805f4";
version = "0.0.0+rev=d3031a8";
src = fetchFromGitHub {
owner = "alexlafroscia";
repo = "tree-sitter-glimmer";
rev = "21805f429c5b7536be9f5f61dcabb5d3a4173bec";
hash = "sha256-EMcPjnf0SPa8Jk0GkkLTsOEGqRVdjbUt/DklRmXOGUA=";
rev = "d3031a8294bf331600d5046b1d14e690a0d8ba0c";
hash = "sha256-YvftQHEwYxRyRIYHrnAjIqgx6O0FlFrnF9TwUE+RiqI=";
};
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
};
@ -722,12 +722,12 @@
};
haskell = buildGrammar {
language = "haskell";
version = "0.0.0+rev=98fc7f5";
version = "0.0.0+rev=3241b68";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-haskell";
rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087";
hash = "sha256-BDvzmFIGABtkWEUbi74o3vPLsiwNWsQDNura867vYpU=";
rev = "3241b683cc1eaa466afb83b9a5592ab39caaa2fa";
hash = "sha256-kGUBAXskVPRQHMwffYLRGO6uD9PNFWZeXkXsmp0yfKA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
};
@ -788,34 +788,34 @@
};
html = buildGrammar {
language = "html";
version = "0.0.0+rev=594f23e";
version = "0.0.0+rev=86c253e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "594f23eb6da580cf269a59d966db68f2cde7d0c8";
hash = "sha256-DgYcJjMCQ0C96l1J4if6FdArj5atxy3LsJr+SnZqiQo=";
rev = "86c253e675e7fdd1c0482efe0706f24bafbc3a7d";
hash = "sha256-mOJ1JUlsnFPH5jQcWdhWJkoZ0qOK1CTvmi/gEPzzeYk=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
htmldjango = buildGrammar {
language = "htmldjango";
version = "0.0.0+rev=b2dba02";
version = "0.0.0+rev=11e73eb";
src = fetchFromGitHub {
owner = "interdependence";
repo = "tree-sitter-htmldjango";
rev = "b2dba02eddab66be669022320273d0dfe1ff923d";
hash = "sha256-FEsvr9i0Lys8CzDlm2lhdJEAQNnmqRSFjn4I+CcZYM8=";
rev = "11e73ebd8e73356badaad826a0534437b208b6e7";
hash = "sha256-xOWR5Lp9Ggkqmm5rutKrnMNXFASdyn6vPtxcY2mu2zs=";
};
meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango";
};
http = buildGrammar {
language = "http";
version = "0.0.0+rev=2c6c445";
version = "0.0.0+rev=f41d3e9";
src = fetchFromGitHub {
owner = "rest-nvim";
repo = "tree-sitter-http";
rev = "2c6c44574031263326cb1e51658bbc0c084326e7";
hash = "sha256-R81n6vb7JzZlnK17SkiwYeJeMs0xYTXx/qFdTvT8V5c=";
rev = "f41d3e97ad148f0b2c2d913e3834ccd5816fdc02";
hash = "sha256-yHsvrMPLL3zrmP/t8Bzfl9lR+SEkRy7RypmqM9sHZCk=";
};
meta.homepage = "https://github.com/rest-nvim/tree-sitter-http";
};
@ -830,14 +830,25 @@
};
meta.homepage = "https://github.com/justinmk/tree-sitter-ini";
};
janet_simple = buildGrammar {
language = "janet_simple";
version = "0.0.0+rev=bd9cbaf";
src = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-janet-simple";
rev = "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6";
hash = "sha256-2FucTi1wATBcomyNx2oCqMJVmAqLWHJiPQ2+L0VtwUM=";
};
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
};
java = buildGrammar {
language = "java";
version = "0.0.0+rev=3c24aa9";
version = "0.0.0+rev=c194ee5";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
rev = "3c24aa9365985830421a3a7b6791b415961ea770";
hash = "sha256-06spTQhAIJvixfZ858vPKKv6FJ1AC4JElQzkugxfTuo=";
rev = "c194ee5e6ede5f26cf4799feead4a8f165dcf14d";
hash = "sha256-PNR1XajfELQuwYvCHm8778TzeUlxb9D+HrVF26lQk2E=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
@ -876,12 +887,12 @@
};
json = buildGrammar {
language = "json";
version = "0.0.0+rev=7307675";
version = "0.0.0+rev=40a81c0";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-json";
rev = "73076754005a460947cafe8e03a8cf5fa4fa2938";
hash = "sha256-wbE7CQ6l1wlhJdAoDVAj1QzyvlYnevbrlVCO0TMU7to=";
rev = "40a81c01a40ac48744e0c8ccabbaba1920441199";
hash = "sha256-fZNftzNavJQPQE4S1VLhRyGQRoJgbWA5xTPa8ZI5UX4=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
};
@ -931,23 +942,23 @@
};
kdl = buildGrammar {
language = "kdl";
version = "0.0.0+rev=e36f054";
version = "0.0.0+rev=d118f93";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-kdl";
rev = "e36f054a60c4d9e5ae29567d439fdb8790b53b30";
hash = "sha256-ZZLe7WBDIX1x1lmuHE1lmZ93YWXTW3iwPgXXbxXR/n4=";
rev = "d118f9376ef4f0461975289302fe74a28f073876";
hash = "sha256-FxY7wqksjSJiOffb7FBcsDQ0oMr94CeGreBV8MMtFr4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=c84d16e";
version = "0.0.0+rev=100d79f";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "c84d16e7f75032cdd8c4ad986a76ca9e1fe4e639";
hash = "sha256-SvzWWsXlcT5aIpswhKA8xo7iRIDaDZkeUuPGyvfc2fk=";
rev = "100d79fd96b56a1b99099a8d2f3c114b8687acfb";
hash = "sha256-+TLeB6S5MwbbxPZSvDasxAfTPV3YyjtR0pUTlFkdphc=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
@ -975,12 +986,12 @@
};
ledger = buildGrammar {
language = "ledger";
version = "0.0.0+rev=f787ae6";
version = "0.0.0+rev=1cc4445";
src = fetchFromGitHub {
owner = "cbarrete";
repo = "tree-sitter-ledger";
rev = "f787ae635ca79589faa25477b94291a87e2d3e23";
hash = "sha256-9Sc22IYWhUUzCslna3mzePd7bRbtWDwiWKvAzLYubOQ=";
rev = "1cc4445908966046c1dd211d9ddaac4c3198bd1d";
hash = "sha256-GHxpVWvO9BWabBiYAyMeTt1+kQZmon3LeP9So2/voYw=";
};
meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
};
@ -1019,15 +1030,26 @@
};
luap = buildGrammar {
language = "luap";
version = "0.0.0+rev=bfb38d2";
version = "0.0.0+rev=393915d";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-luap";
rev = "bfb38d254f380362e26b5c559a4086ba6e92ba77";
hash = "sha256-HpKqesIa+x3EQGnWV07jv2uEW9A9TEN4bPNuecXEaFI=";
rev = "393915db4b16a792da9c60f52d11d93247d870b9";
hash = "sha256-FLRPzU1JI8PoI8vZAKXG6DtHcnSksXCwTHAS0fb4WsY=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-luap";
};
luau = buildGrammar {
language = "luau";
version = "0.0.0+rev=4f8fc20";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-luau";
rev = "4f8fc207b3a25b07cba1d3b4066f2872dcfe201f";
hash = "sha256-vDkexlebgg/biif3MJ1c+OD8hy+4uvghIWZlqE9cQXg=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-luau";
};
m68k = buildGrammar {
language = "m68k";
version = "0.0.0+rev=d097b12";
@ -1311,12 +1333,12 @@
};
pony = buildGrammar {
language = "pony";
version = "0.0.0+rev=af8a2d4";
version = "0.0.0+rev=5fd795a";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-pony";
rev = "af8a2d40ed813d818380e7798f16732f34d95bf6";
hash = "sha256-fgPnDU58qfZfRmBA2hBQt23TjJqiU6XobBYzRD7ZFz0=";
rev = "5fd795ae7597b568b0a356c5d243cc92162bc00c";
hash = "sha256-uwxqbWK3Zy5heGQ3aSX73X6wY0FY3ewqjsQXgDl8nb0=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-pony";
};
@ -1364,6 +1386,17 @@
};
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
};
puppet = buildGrammar {
language = "puppet";
version = "0.0.0+rev=5e1bb97";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-puppet";
rev = "5e1bb979ea71efc0860d4bc56eb3b3f7a670d6ec";
hash = "sha256-7xqZ5nVAyflQ84Zah6M6yxpJ8qQooWl6tOodioXvsI8=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-puppet";
};
python = buildGrammar {
language = "python";
version = "0.0.0+rev=6282715";
@ -1520,12 +1553,12 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=fbf9e50";
version = "0.0.0+rev=0a70e15";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a";
hash = "sha256-hWooQfE7sWXfOkGai3hREoEulcwWT6XPT4xAc+dfjKk=";
rev = "0a70e15da977489d954c219af9b50b8a722630ee";
hash = "sha256-CrNY+4nsYQOzzVR7X+yuo4+5s6K3VHtVQyWfledKJ1U=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
@ -1542,12 +1575,12 @@
};
scheme = buildGrammar {
language = "scheme";
version = "0.0.0+rev=9a23ff3";
version = "0.0.0+rev=6abcfe3";
src = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-scheme";
rev = "9a23ff3df8f03da555f7679ab640a98a9e851c79";
hash = "sha256-qEJgMSS6+q3lqks2CzG3XLZrd0Pl3b8jJiD/GA5TBOc=";
rev = "6abcfe33d976ebe3e244ca80273c7e8a070441b5";
hash = "sha256-6lxpFk9YWVape/Oq2GFYcyNH8J38W+dmFdz+ykqBX0U=";
};
meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
};
@ -1575,12 +1608,12 @@
};
smali = buildGrammar {
language = "smali";
version = "0.0.0+rev=b002dce";
version = "0.0.0+rev=9bf8aa6";
src = fetchFromSourcehut {
owner = "~yotam";
repo = "tree-sitter-smali";
rev = "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3";
hash = "sha256-KZ5+3xqQkxAZcOY8UVxfycQWlaGHq9pv4MzjiIaVtLY=";
rev = "9bf8aa671a233ae2d2c6e9512c7144ce121b1fb6";
hash = "sha256-V5JnB1JT8vV5zA+OjM0a7fBGC8CEqyPcUbeD8NoRTSE=";
};
meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali";
};
@ -1619,12 +1652,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=8f1c49f";
version = "0.0.0+rev=9de72fb";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "8f1c49febcb8944d39df8554d32c749b4f5f3158";
hash = "sha256-9/Otouynt5Cqh5UdeiMsTo+F22fBu1U+EuN7e+TYQy4=";
rev = "9de72fb40cd6d13a64c3aeeabc079c6b8dadb339";
hash = "sha256-WcKrYjOnWRf2ei4bAGH7zJJ/DEaaQ8lmAmO5LEkg17g=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@ -1685,12 +1718,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=05467af";
version = "0.0.0+rev=56ecc99";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "05467af73ac315fc80c7f3ef397e261f30395e2a";
hash = "sha256-4/5ZzxkMiv8qXCXM/M/+NBX9uMw46DnGTEFKbPgNNzU=";
rev = "56ecc996e5765054fc25cdae5fbddfd75a64287b";
hash = "sha256-GH0HpxAprOlOLv8zqsP1O0/RbIn93FfdgAHp56Pyw9g=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -1708,13 +1741,13 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=0802b36";
version = "0.0.0+rev=ff822fd";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "xasc";
repo = "tree-sitter-t32";
rev = "0802b3638a1c5022b4d55bdafa64f856ed43d7d6";
hash = "sha256-9c5EUgtvoXXZQY5AtahyfmG9SGxcjhrrOxWa0eyicqU=";
rev = "ff822fd77bb919854ba60d05f4d373d9d578d0e0";
hash = "sha256-jHVfyp8yLaxI+Aa4iH1fXpNIzIoGLdQwo7SvRGFKbFQ=";
};
meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32";
};
@ -1810,12 +1843,12 @@
};
tsx = buildGrammar {
language = "tsx";
version = "0.0.0+rev=b66d19b";
version = "0.0.0+rev=286e90c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3";
hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34=";
rev = "286e90c32060032225f636a573d0e999f7766c97";
hash = "sha256-lg/FxjosZkhosllT0PyCKggV1Z2V4rPdKFD4agRLeBo=";
};
location = "tsx";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -1844,12 +1877,12 @@
};
typescript = buildGrammar {
language = "typescript";
version = "0.0.0+rev=b66d19b";
version = "0.0.0+rev=286e90c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3";
hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34=";
rev = "286e90c32060032225f636a573d0e999f7766c97";
hash = "sha256-lg/FxjosZkhosllT0PyCKggV1Z2V4rPdKFD4agRLeBo=";
};
location = "typescript";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -1934,12 +1967,12 @@
};
vimdoc = buildGrammar {
language = "vimdoc";
version = "0.0.0+rev=15c2fdc";
version = "0.0.0+rev=b3fca1b";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
rev = "15c2fdcc57f51f1caef82fe75e1ffb733626dcae";
hash = "sha256-pke1yxPfZt4hykmT76sHpk/LOQHfcH/oII7oZyU8m6U=";
rev = "b3fca1b950ca9666bd1e891efe79470fb6dc403e";
hash = "sha256-u+w304+VJ0pinvzqNM59Xd0g5YWuOatOSn2avozqTSY=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
};
@ -2011,12 +2044,12 @@
};
zig = buildGrammar {
language = "zig";
version = "0.0.0+rev=9b84cb6";
version = "0.0.0+rev=0d08703";
src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
rev = "9b84cb66e7d480e7c0370f4e33e8325bac6ad09f";
hash = "sha256-IyVYRqSAqCxUK5ADXlTfNK9MhcdvDVwCJ2Y5VF/oYVs=";
rev = "0d08703e4c3f426ec61695d7617415fff97029bd";
hash = "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=";
};
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
};

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -780,6 +780,7 @@ https://github.com/jgdavey/tslime.vim/,,
https://github.com/Quramy/tsuquyomi/,,
https://github.com/folke/twilight.nvim/,,
https://github.com/leafgarland/typescript-vim/,,
https://github.com/jose-elias-alvarez/typescript.nvim/,,
https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,,
https://github.com/chrisbra/unicode.vim/,,

9
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -19,6 +19,7 @@
, alejandra
, millet
, shfmt
, typst-lsp
, autoPatchelfHook
, zlib
, stdenv
@ -2278,6 +2279,14 @@ let
version = "0.4.1";
sha256 = "sha256-NZejUb99JDcnqjihLTPkNzVCgpqDkbiwAySbBVZ0esY=";
};
nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${typst-lsp}/bin/typst-lsp"' package.json | sponge package.json
'';
meta = {
changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
description = "A VSCode extension for providing a language server for Typst";

6
pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix
View file

@ -7,10 +7,12 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lua";
publisher = "sumneko";
version = "3.5.6";
sha256 = "sha256-Unzs9rX/0MlQprSvScdBCCFMeLCaGzWsMbcFqSKY2XY=";
version = "3.6.19";
sha256 = "sha256-7f8zovJS1lNwrUryxgadrBbNRw/OwFqry57JWKY1D8E=";
};
# Running chmod in runtime will lock up extension
# indefinitely if the binary is in nix store.
patches = [ ./remove-chmod.patch ];
postInstall = ''

8
pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch
View file

@ -1,8 +1,6 @@
diff --git a/client/out/languageserver.js b/client/out/languageserver.js
index 6c7429c..6f53aa4 100644
--- a/client/out/languageserver.js
+++ b/client/out/languageserver.js
@@ -79,11 +79,9 @@ class LuaClient {
@@ -145,11 +145,9 @@
break;
case "linux":
command = this.context.asAbsolutePath(path.join('server', binDir ? binDir : 'bin-Linux', 'lua-language-server'));
@ -12,5 +10,5 @@ index 6c7429c..6f53aa4 100644
command = this.context.asAbsolutePath(path.join('server', binDir ? binDir : 'bin-macOS', 'lua-language-server'));
- yield fs.promises.chmod(command, '777');
break;
}
let serverOptions = {
default:
throw new Error(`Unsupported operating system "${platform}"!`);

18
pkgs/applications/emulators/xemu/default.nix
View file

@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
version = "0.7.85";
version = "0.7.87";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${finalAttrs.version}";
hash = "sha256-sVUkB2KegdKlHlqMvSwB1nLdJGun2x2x9HxtNHnpp1s=";
hash = "sha256-NPvyXDrTKt7PIspLPrUBo7qs9hsHV+6u7dQlIqdlQtw=";
fetchSubmodules = true;
};
@ -89,20 +89,14 @@ stdenv.mkDerivation (finalAttrs: {
})
];
preConfigure = let
# When the data below can't be obtained through git, the build process tries
# to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
branch = "master";
commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351";
inherit (finalAttrs) version;
in ''
preConfigure = ''
patchShebangs .
configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
substituteInPlace ./scripts/xemu-version.sh \
--replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'"
echo '${commit}' > XEMU_COMMIT
echo '${branch}' > XEMU_BRANCH
echo '${version}' > XEMU_VERSION
# When the data below can't be obtained through git, the build process tries
# to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
echo '${finalAttrs.version}' > XEMU_VERSION
'';
preBuild = ''

335
pkgs/applications/graphics/oculante/Cargo.lock generated
View file

@ -363,7 +363,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
"syn 2.0.15",
]
[[package]]
@ -588,9 +588,9 @@ checksum = "7439becb5fafc780b6f4de382b1a7a3e70234afe783854a4702ee8adbb838609"
[[package]]
name = "concurrent-queue"
version = "2.1.0"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
"crossbeam-utils",
]
@ -636,9 +636,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "core-graphics"
@ -688,9 +688,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.7"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
@ -1058,13 +1058,13 @@ dependencies = [
[[package]]
name = "errno"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -1098,9 +1098,9 @@ dependencies = [
[[package]]
name = "evalexpr"
version = "8.1.0"
version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aacfb566035f8cd02f6ec9247c242f3f9904a0b288ea383abcf4e95df6436a34"
checksum = "6aed2b80295745e5fed7a9e869bb8b592961584379df6fddcf0922877206974e"
[[package]]
name = "event-listener"
@ -1128,7 +1128,7 @@ dependencies = [
"flume",
"half",
"lebe",
"miniz_oxide",
"miniz_oxide 0.6.2",
"rayon-core",
"smallvec",
"zune-inflate",
@ -1179,6 +1179,15 @@ dependencies = [
"instant",
]
[[package]]
name = "fdeflate"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
dependencies = [
"simd-adler32",
]
[[package]]
name = "find-crate"
version = "0.6.3"
@ -1206,7 +1215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
"miniz_oxide",
"miniz_oxide 0.6.2",
]
[[package]]
@ -1234,7 +1243,7 @@ dependencies = [
"futures-sink",
"nanorand",
"pin-project",
"spin 0.9.7",
"spin 0.9.8",
]
[[package]]
@ -1302,7 +1311,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
"syn 2.0.15",
]
[[package]]
@ -1411,9 +1420,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
"fastrand",
"futures-core",
@ -1432,7 +1441,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
"syn 2.0.15",
]
[[package]]
@ -1516,9 +1525,9 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.2.8"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@ -1774,9 +1783,9 @@ dependencies = [
[[package]]
name = "h2"
version = "0.3.16"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
dependencies = [
"bytes",
"fnv",
@ -1887,9 +1896,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
version = "0.14.25"
version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes",
"futures-channel",
@ -2016,13 +2025,13 @@ dependencies = [
[[package]]
name = "io-lifetimes"
version = "1.0.9"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
"hermit-abi 0.3.1",
"libc",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -2033,14 +2042,14 @@ checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "is-terminal"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -2157,9 +2166,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
[[package]]
name = "kurbo"
version = "0.9.2"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5174361704392c4a640258d5020e14ec820a8c1820d5ba67b2311962f411b52b"
checksum = "28a2d0c1781729f69dbea30f968608cadfaeb6582e5ce903a167a5216b53cd0f"
dependencies = [
"arrayvec 0.7.2",
]
@ -2215,9 +2224,9 @@ dependencies = [
[[package]]
name = "libavif-sys"
version = "0.14.1"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8ed7ab954ad8e287cb69d8aadfa577a494b478864aaf7d89efefdad8c6922d5"
checksum = "2c7b9293d221c7d4b4290d4479c491a09b877943208593f1563d8521c4b55930"
dependencies = [
"cmake",
"libc",
@ -2227,9 +2236,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.140"
version = "0.2.141"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
[[package]]
name = "libdav1d-sys"
@ -2281,9 +2290,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
version = "0.3.1"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
[[package]]
name = "lock_api"
@ -2460,6 +2469,16 @@ dependencies = [
"adler",
]
[[package]]
name = "miniz_oxide"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
"simd-adler32",
]
[[package]]
name = "mio"
version = "0.8.6"
@ -2636,9 +2655,9 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
[[package]]
name = "notan"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d94d6b9c12dae32ed4c0d195b9767c77b3bbc6aeb05765b750dc0e4fb7f44e"
checksum = "4fe05ab2904de4bad18950790a346b21ace46399308a1257cc96727b42cdf465"
dependencies = [
"notan_app",
"notan_backend",
@ -2654,9 +2673,9 @@ dependencies = [
[[package]]
name = "notan_app"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3270760bbc1945e953e12b0a73904200ea1d369806ce9dbdd75dd5aa12fabf8"
checksum = "5cf05fb9bd79b1a75b7d05f4d524b252ffd3b65e0334abc0988563b9e8ed3d22"
dependencies = [
"bytemuck",
"downcast-rs",
@ -2680,9 +2699,9 @@ dependencies = [
[[package]]
name = "notan_backend"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46840ee15153745cf7c4c92aaeb94affb9ac2683725dcf5b484ec46b553467f2"
checksum = "157b87a240d02a8cacdfb3a6e916f2db19ab79c108dcb70de1af028f02852c4c"
dependencies = [
"notan_web",
"notan_winit",
@ -2690,18 +2709,18 @@ dependencies = [
[[package]]
name = "notan_core"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b4b7defb83b378e903917b79c58427a1cb91cb2e22a8254fc559d2c2ba914e6"
checksum = "0d9b634a7f30f311802a031b3b02287365e48c10a14cb44f2576acfaa64f2e11"
dependencies = [
"web-sys",
]
[[package]]
name = "notan_draw"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28ab4cb11d4d00bc325045a53d2d1ae2dc449dfca80df7a663015bb4759e7bce"
checksum = "5e89627179eaa85bec2de5966562a89ba6cb5d72175eadb983421f463b25687b"
dependencies = [
"log",
"lyon",
@ -2717,9 +2736,9 @@ dependencies = [
[[package]]
name = "notan_egui"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ccda210aa1e65395daf4987aae412309f83c3b6bfa2e5794de585687c4d138"
checksum = "4119d7b4cd389af870ae7ff9e9f9ab39ffc6766d5c65e52f1c5bc02d1393d69c"
dependencies = [
"bytemuck",
"egui",
@ -2731,9 +2750,9 @@ dependencies = [
[[package]]
name = "notan_glow"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "693f27c0f625dbb4225011a51c077ce32990643ba38ce0985ce625d2680d74d6"
checksum = "48961f4ccc256904221e4be862a57bc0963a20b2b30333c7eeffeae14ee4cf45"
dependencies = [
"bytemuck",
"glow",
@ -2748,9 +2767,9 @@ dependencies = [
[[package]]
name = "notan_glyph"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1153c4a4b416c42c1d63691dfde3c4af94cdfb37523ab292073c2b467282d5eb"
checksum = "c24760e1fa2ab081fc493ccd2f2a6946864d87b8806767dfd998eb7365aae3c4"
dependencies = [
"bytemuck",
"glyph_brush",
@ -2762,9 +2781,9 @@ dependencies = [
[[package]]
name = "notan_graphics"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91c38da02cbe02a90aa76336796956914ecc89c541d4de9913965619ad1e198b"
checksum = "64b8437c9bb4f96b1fd18ae3e61a6b1a437ac32f3ccf078de531ab38cd6861ee"
dependencies = [
"bytemuck",
"glsl-layout",
@ -2777,9 +2796,9 @@ dependencies = [
[[package]]
name = "notan_input"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de23a07f8a1203487179bcf257a938ce87747c02d53b8c8c364d9a3f779c01d0"
checksum = "78c182ba310d14e24e39fdbbb523f8686d2bcd85a8e3415ac15a1b203383b320"
dependencies = [
"hashbrown 0.13.2",
"log",
@ -2789,9 +2808,9 @@ dependencies = [
[[package]]
name = "notan_macro"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94ce02dadae5862a47e1acfdd1f5bb8427829ab22ca0462374b241d5a308fcb6"
checksum = "cbf38df1753b05ffd6e4f3e6cf309f8f2c1f6d60d97b0b29f0da81da3fcd35b4"
dependencies = [
"cfg_aliases",
"glsl-to-spirv",
@ -2804,18 +2823,18 @@ dependencies = [
[[package]]
name = "notan_math"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5361d47f89ede17397790c8c81ae3ec789b2a18c8b0f1459146e003c116d9856"
checksum = "4768d6a1f20f635ae20dffde5f4d1d4d84bfd8caebe312e4c4ca7d134f2aae1d"
dependencies = [
"glam",
]
[[package]]
name = "notan_text"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c78ef6196517146ed3be9f21c93acff1457b80f8afb50387f573eeb5ffac7e41"
checksum = "db09dd4b60817fff7cc8852837e5dc97ea7520d894dff29d01f2d3b74480aa7e"
dependencies = [
"hashbrown 0.13.2",
"lazy_static",
@ -2829,9 +2848,9 @@ dependencies = [
[[package]]
name = "notan_utils"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444beb25a698cb9a1df22f062062c232d8f0625f4cb20f47a0ba4c389ce65770"
checksum = "7293931f914054e89fd958112ad34f707ec5e89caedb29fdfafeb7f71744318b"
dependencies = [
"instant",
"log",
@ -2839,9 +2858,9 @@ dependencies = [
[[package]]
name = "notan_web"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2108fe65b2ac951ff34919f65c47065890164e70695e9d8a73837eca88590140"
checksum = "2efe6523a123951d028a30275d8891d6678fa41cfadd4b0b29182c1755f7152c"
dependencies = [
"console_error_panic_hook",
"futures-util",
@ -2858,9 +2877,9 @@ dependencies = [
[[package]]
name = "notan_winit"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "355289e0ca3284d3268a20580b4acd2b2d24c4a7e01360e188456b5b11700108"
checksum = "c407c236419054799047de0880e0ac2cec2d9666e2c2a006ee57424845aef396"
dependencies = [
"glutin",
"glutin-winit",
@ -3037,9 +3056,9 @@ checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
[[package]]
name = "objc2"
version = "0.3.0-beta.3.patch-leaks.2"
version = "0.3.0-beta.3.patch-leaks.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d9bb2ee6b71d02b1b3554ed600d267ee9a2796acc9fa43fb7748e13fe072dd"
checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
dependencies = [
"block2",
"objc-sys",
@ -3075,7 +3094,7 @@ dependencies = [
[[package]]
name = "oculante"
version = "0.6.58"
version = "0.6.63"
dependencies = [
"anyhow",
"arboard",
@ -3116,7 +3135,6 @@ dependencies = [
"strum_macros",
"tiff 0.9.0",
"tiny-skia 0.8.3",
"tonemap",
"turbojpeg",
"usvg",
"webbrowser",
@ -3211,9 +3229,9 @@ dependencies = [
[[package]]
name = "parking"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
[[package]]
name = "parking_lot"
@ -3394,21 +3412,22 @@ dependencies = [
[[package]]
name = "png"
version = "0.17.7"
version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
dependencies = [
"bitflags",
"crc32fast",
"fdeflate",
"flate2",
"miniz_oxide",
"miniz_oxide 0.7.1",
]
[[package]]
name = "polling"
version = "2.6.0"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa"
checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa"
dependencies = [
"autocfg",
"bitflags",
@ -3417,7 +3436,7 @@ dependencies = [
"libc",
"log",
"pin-project-lite",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -3474,9 +3493,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.54"
version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
@ -3577,9 +3596,9 @@ dependencies = [
[[package]]
name = "rav1e"
version = "0.6.3"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "277898094f0d03c6a609e491324102daf5080e71c06b4b25e5acf8b89d26c945"
checksum = "be22fc799d8dc5573ba290fd436cea91ccfc0c6b7e121750ea5939cc786429ec"
dependencies = [
"arbitrary",
"arg_enum_proc_macro",
@ -3750,9 +3769,9 @@ dependencies = [
[[package]]
name = "resvg"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3781eed5e82686ce0cc64b081b70920487ad709525b4555060a63d53636dd46f"
checksum = "84558b03726d979bf0444a5a88791cd451108fe45db699f3324388d700c048dc"
dependencies = [
"gif",
"jpeg-decoder",
@ -3876,16 +3895,16 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.37.6"
version = "0.37.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -4033,29 +4052,29 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.159"
version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.159"
version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
"syn 2.0.15",
]
[[package]]
name = "serde_json"
version = "1.0.95"
version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
@ -4118,9 +4137,9 @@ dependencies = [
[[package]]
name = "simba"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
dependencies = [
"approx",
"num-complex",
@ -4220,9 +4239,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
version = "0.9.7"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
dependencies = [
"lock_api",
]
@ -4326,9 +4345,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.12"
version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
dependencies = [
"proc-macro2",
"quote",
@ -4393,7 +4412,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.12",
"syn 2.0.15",
]
[[package]]
@ -4578,12 +4597,6 @@ dependencies = [
"winnow",
]
[[package]]
name = "tonemap"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d97478858c823077ed7bc79d6a84be4e0af8e9882b222e61a8a5dbae458f45d"
[[package]]
name = "tower-service"
version = "0.3.2"
@ -4754,9 +4767,9 @@ checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
[[package]]
name = "usvg"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15cc6c2525931fafd8dd1b1169805c02b6ad8aeb85ca454413cc251df0592220"
checksum = "67a6cab2bc32b5a4310a06c7d3c6b51b5c7897b1f7c7d2bf73bf052f5754950f"
dependencies = [
"base64",
"log",
@ -4769,9 +4782,9 @@ dependencies = [
[[package]]
name = "usvg-parser"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8177e95723471c172d1163d4d6b28c0ede7a3ef6389a117b69ae323faf8b62a1"
checksum = "b2352a2c05655a7e4d3dca76cf65764efce35527472668bae5c6fc876b4c996d"
dependencies = [
"data-url",
"flate2",
@ -4786,9 +4799,9 @@ dependencies = [
[[package]]
name = "usvg-text-layout"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0accc97b136de1893848eede9b1b44e8e0acaaa687e65c64097335029fd72c54"
checksum = "392baafaaa861ff8c9863546f92a60c51380fc49aa185a6840fb2af564c73530"
dependencies = [
"fontdb",
"kurbo",
@ -4802,9 +4815,9 @@ dependencies = [
[[package]]
name = "usvg-tree"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a58ac99ef85e0a970d0b1cdb89b9327069d853876da8b64a2bd96fc0d25cad8c"
checksum = "f9cb92fe40e0ffb45fd01349187e276a695f6c676a016d72ba09510009594829"
dependencies = [
"kurbo",
"rctree",
@ -5045,9 +5058,9 @@ dependencies = [
[[package]]
name = "webbrowser"
version = "0.8.8"
version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e"
checksum = "b692165700260bbd40fbc5ff23766c03e339fbaca907aeea5cb77bf0a553ca83"
dependencies = [
"core-foundation",
"dirs 4.0.0",
@ -5141,7 +5154,7 @@ version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
dependencies = [
"windows-targets",
"windows-targets 0.42.2",
]
[[package]]
@ -5163,12 +5176,12 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
@ -5178,7 +5191,16 @@ version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets",
"windows-targets 0.42.2",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.0",
]
[[package]]
@ -5187,21 +5209,42 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-targets"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
"windows_i686_gnu 0.48.0",
"windows_i686_msvc 0.48.0",
"windows_x86_64_gnu 0.48.0",
"windows_x86_64_gnullvm 0.48.0",
"windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
@ -5214,6 +5257,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
@ -5226,6 +5275,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
@ -5238,6 +5293,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
@ -5250,12 +5311,24 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
@ -5268,6 +5341,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "windres"
version = "0.2.2"

10
pkgs/applications/graphics/oculante/default.nix
View file

@ -19,16 +19,18 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.6.58";
version = "0.6.63";
src = fetchFromGitHub {
owner = "woelper";
repo = pname;
rev = version;
sha256 = "sha256-Cs7f6RSOoZFOtQWH67l3A6kv/o2lN5NOn+BEasV03RU=";
sha256 = "sha256-ynxGpx8LLcd4/n9hz/bbhpZUxqX1sPS7LFYPZ22hTxo=";
};
cargoLock.lockFile = ./Cargo.lock;
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [
cmake
@ -63,6 +65,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/woelper/oculante";
changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
maintainers = with maintainers; [ dit7ya figsoda ];
};
}

4
pkgs/applications/misc/arianna/default.nix
View file

@ -19,14 +19,14 @@
mkDerivation rec {
pname = "arianna";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = "arianna";
rev = "v${version}";
hash = "sha256-X3PDGWsQ8Alj5fisZC1tTHQDLPmjtiLw0X9gMvh5KFI=";
hash = "sha256-IETqKVIWeICFgqmBSVz8ea8100hHGXIo5S3O0OaIC04=";
};
nativeBuildInputs = [

8
pkgs/applications/misc/flavours/default.nix
View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "flavours";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "Misterio77";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q2YW9oFqzkmWscoE4p9E43bo1/4bQrTnd8tvPsJqJyQ=";
hash = "sha256-48f05kIojCCANxV2rGmyXvGVqID2Wy0uh/YavR8d3XI=";
};
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
cargoSha256 = "sha256-IrVcd8ilWbaigGMqT+kaIW3gnE+m+Ik5IyhQ4zPlyPE=";
cargoHash = "sha256-YeIiyyGjjXoyuQ2td393LuiyvDmLZdoWf2BGYWqynD4=";
nativeBuildInputs = [ installShellFiles ];
@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Misterio77/flavours";
changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fortuneteller2k ];
maintainers = with maintainers; [ fortuneteller2k misterio77 ];
};
}

97
pkgs/applications/misc/therion/default.nix Normal file
View file

@ -0,0 +1,97 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, perl
, tcl
, tcllib
, tk
, expat
, bwidget
, python3
, texlive
, survex
, makeWrapper
, fmt
, proj
, wxGTK32
, vtk
, freetype
, libjpeg
, gettext
, libGL
, libGLU
, sqlite
, libtiff
, curl
, tkimg
}:
stdenv.mkDerivation rec {
pname = "therion";
version = "6.1.7";
src = fetchFromGitHub {
owner = "therion";
repo = "therion";
rev = "v${version}";
hash = "sha256-q+p1akGfzBeZejeYiJ8lrSbEIMTsX5YuIG/u35oh0JI=";
};
nativeBuildInputs = [
cmake
pkg-config
perl
python3
texlive.combined.scheme-tetex
makeWrapper
tcl.tclPackageHook
];
preConfigure = ''
export OUTDIR=$out
'';
cmakeFlags = [
"-DBUILD_THBOOK=OFF"
];
buildInputs = [
expat
tkimg
proj
wxGTK32
vtk
tk
freetype
libjpeg
gettext
libGL
libGLU
sqlite
libtiff
curl
fmt
tcl
tcllib
bwidget
];
fixupPhase = ''
runHook preFixup
wrapProgram $out/bin/therion \
--prefix PATH : ${lib.makeBinPath [ survex texlive.combined.scheme-tetex ]}
wrapProgram $out/bin/xtherion \
--prefix PATH : ${lib.makeBinPath [ tk ]}
runHook postFixup
'';
meta = with lib; {
description = "Therion – cave surveying software";
homepage = "https://therion.speleo.sk/";
changelog = "https://github.com/therion/therion/blob/${src.rev}/CHANGES";
license = licenses.gpl2Only;
maintainers = with maintainers; [ matthewcroughan ];
};
}

8
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -331,7 +331,7 @@ let
buildPhase = let
buildCommand = target: ''
ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
(
source chrome/installer/linux/common/installer.include
PACKAGE=$packageName
@ -341,7 +341,11 @@ let
'';
targets = extraAttrs.buildTargets or [];
commands = map buildCommand targets;
in lib.concatStringsSep "\n" commands;
in ''
runHook preBuild
${lib.concatStringsSep "\n" commands}
runHook postBuild
'';
postFixup = ''
# Make sure that libGLESv2 and libvulkan are found by dlopen.

6
pkgs/applications/networking/browsers/palemoon/bin.nix
View file

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "palemoon-bin";
version = "32.1.0";
version = "32.1.1";
src = fetchzip {
urls = [
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
];
hash = if withGTK3 then
"sha256-2oKLkQi+NQHhEI1zsWCN8JiSsrVFefSdGcmS7v9gZoI="
"sha256-Kre+F1AE4bC5hAODYjo+S6TUCpKk8KMnYumQWHz+epY="
else
"sha256-rSQuCCCvTKHcGDHS0VEyMwroZ/zD7RvaW3/K5sXefw4=";
"sha256-LIsep7KsNhsw3zlmgltu6/4qZEWjGQbUmLqHCabSTfg=";
};
preferLocalBuild = true;

2
pkgs/applications/networking/cluster/helm-docs/default.nix
View file

@ -17,7 +17,7 @@ buildGoModule rec {
ldflags = [
"-w"
"-s"
"-X main.version=v${version}"
"-X main.version=${version}"
];
meta = with lib; {

28
pkgs/applications/networking/cluster/terraform-backend-git/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "terraform-backend-git";
version = "0.1.4";
src = fetchFromGitHub {
owner = "plumber-cd";
repo = "terraform-backend-git";
rev = "v${version}";
hash = "sha256-nRh2eIVVBdb8jFfgmPoOk4y0TDoCeng50TRA+nphn58=";
};
vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Terraform HTTP Backend implementation that uses Git repository as storage";
homepage = "https://github.com/plumber-cd/terraform-backend-git";
changelog = "https://github.com/plumber-cd/terraform-backend-git/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ blaggacao ];
};
}

10
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -419,11 +419,11 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
"hash": "sha256-iFYYKFPa9+pTpmTddFzqB1yRwBnp8NG281oxQP7V6+U=",
"hash": "sha256-gMuQNI0+zvveVqyhRdIyPyxVNfdk6PUXpf4Iv2Y+jI4=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v5.23.0",
"rev": "v5.24.0",
"spdx": "MIT",
"vendorHash": null
},
@ -927,13 +927,13 @@
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
},
"rancher2": {
"hash": "sha256-UM000GXkWwNWYM1El3wjXgqbmcMkD9Gl69ZARSJOfZo=",
"hash": "sha256-UDVKmOON190eQzGrxzVtq7gDYeKBBM1nnL2ujU1wDo8=",
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
"owner": "rancher",
"repo": "terraform-provider-rancher2",
"rev": "v2.0.0",
"rev": "v3.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y="
"vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc="
},
"random": {
"hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=",

14
pkgs/applications/networking/shellhub-agent/default.nix
View file

@ -5,22 +5,24 @@
, makeWrapper
, openssh
, libxcrypt
, testers
, shellhub-agent
}:
buildGo120Module rec {
pname = "shellhub-agent";
version = "0.11.7";
version = "0.11.8";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "d5ESQQgBPUFe2tuCbeFIqiWPpr9wUczbXLc5QdXurXY=";
sha256 = "/nBwi94VFKzdZxQ030tCqEhDM0fE3bxc4MraOCNtmbE=";
};
modRoot = "./agent";
vendorSha256 = "sha256-/85rIBfFBpXYrsCBDGVzXfAxO6xXQ8uTL2XeEPKQwDQ=";
vendorSha256 = "sha256-1R5K/BlMNKtCESV5xVFh2MawfloSDmST2764WDXmqZk=";
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
@ -29,6 +31,12 @@ buildGo120Module rec {
rev-prefix = "v";
ignoredVersions = ".(rc|beta).*";
};
tests.version = testers.testVersion {
package = shellhub-agent;
command = "agent --version";
version = "v${version}";
};
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/office/qownnotes/default.nix
View file

@ -17,14 +17,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.4.7";
version = "23.5.0";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "sha256-E9ap7TcICVwalPfScPEcn4lgNkDI2sPtdIgwRQkcOd0=";
sha256 = "sha256-W1bu3isEe1j7XTj+deLNk6Ncssy2UKG+eF36fe1FFWs=";
};
nativeBuildInputs = [

6
pkgs/applications/office/wpsoffice/default.nix
View file

@ -20,14 +20,14 @@
stdenv.mkDerivation rec {
pname = "wpsoffice";
version = "11.1.0.11691";
version = "11.1.0.11698";
src = if useChineseVersion then fetchurl {
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb";
sha256 = "sha256-ubFYACnsMObde9TGp1tyHtG0n5NxYMFtEbY9KXj62No=";
sha256 = "sha256-m7BOE2IF2m75mV/4X3HY9UJcidL0S0biqkidddp4LbQ=";
} else fetchurl {
url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb";
sha256 = "sha256-F1foPaDd4YiAcCePleKsABjFzsb2Uv+Lkja+58pnquI=";
sha256 = "sha256-spqxQK/xTE8yFPmGbSbrDY1vSxkan2kwAWpCWIExhgs=";
};
unpackCmd = "dpkg -x $src .";

10
pkgs/applications/science/biology/ants/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ANTs";
version = "2.4.3";
version = "2.4.4";
src = fetchFromGitHub {
owner = "ANTsX";
repo = "ANTs";
rev = "refs/tags/v${version}";
sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g=";
owner = "ANTsX";
repo = "ANTs";
rev = "refs/tags/v${version}";
hash = "sha256-GQndI8ayBvqujb2/qXT6RBAfr8hNPCI5IbwYkPlyNg0=";
};
nativeBuildInputs = [ cmake makeWrapper ];

4
pkgs/applications/science/electronics/nvc/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "nickg";
repo = pname;
rev = "r${version}";
hash = "sha256-UeA+6RKZMttLThyAf80ONximXRJNw5mUNM+cyCDTcGM=";
hash = "sha256-xB2COtYgbg00rrOWTbcBocRnqF5682jUG2eS7I71Ln4=";
};
nativeBuildInputs = [

23
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View file

@ -1,12 +1,10 @@
{ lib, mkDerivation, fetchFromGitHub, SDL2
, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2
, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools
, gst_all_1, wayland, pkg-config
}:
{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport
, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake
, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qgroundcontrol";
version = "4.2.4";
version = "4.2.6";
qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -23,7 +21,7 @@ mkDerivation rec {
];
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkg-config qmake qttools ];
nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ];
preConfigure = ''
mkdir build
@ -69,21 +67,16 @@ mkDerivation rec {
owner = "mavlink";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pPxqYxBlw9re1rlUU2qz0gFRmT+PmslrcBv97VEG84k=";
sha256 = "sha256-mMeKDfylVEqLo1i2ucUBu287Og4472Ecp7Cge9Cw3kE=";
fetchSubmodules = true;
};
patches = [
# fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132
# remove once updated past 4.2.0
./fix-10132.patch
];
meta = with lib; {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
homepage = "http://qgroundcontrol.com/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ lopsided98 ];
mainProgram = "QGroundControl";
};
}

62
pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch
View file

@ -1,62 +0,0 @@
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
index 2b314e0..ad1425e 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
GstQSGTexture::GstQSGTexture ()
{
- static volatile gsize _debug;
+ static gsize _debug;
initializeOpenGLFunctions();
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
index 3a68576..5203d13 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
@@ -58,7 +58,7 @@ gst_qt_get_gl_display ()
{
GstGLDisplay *display = NULL;
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
- static volatile gsize _debug;
+ static gsize _debug;
g_assert (app != NULL);
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
index f031b36..3c6722a 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
@@ -106,7 +106,7 @@ void InitializeSceneGraph::run()
QtGLVideoItem::QtGLVideoItem()
{
- static volatile gsize _debug;
+ static gsize _debug;
if (g_once_init_enter (&_debug)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
index 8bf14ae..2f88aa9 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
QQuickWindow( parent ), source (src)
{
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
- static volatile gsize _debug;
+ static gsize _debug;
g_assert (app != NULL);
@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering()
g_mutex_lock (&this->priv->lock);
- static volatile gsize once = 0;
+ static gsize once = 0;
if (g_once_init_enter(&once)) {
this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
g_once_init_leave(&once,1);

14
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,14 +1,14 @@
{
"version": "15.11.0",
"repo_hash": "sha256-oLdw6hDn7DLWvAt2RoHkixXCkzKm0dt7iid65MPH7kM=",
"yarn_hash": "0b4k43512p8lm1bmiq5piv8wg1f0x2h9q8pgwnms7b2xb4sfn0g1",
"version": "15.11.1",
"repo_hash": "sha256-xhwWn/+GSAKYy5YcjgIUPJUvhBquvCWu6eFg5ZiNM7s=",
"yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.11.0-ee",
"rev": "v15.11.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.11.0",
"GITLAB_PAGES_VERSION": "15.11.0",
"GITALY_SERVER_VERSION": "15.11.1",
"GITLAB_PAGES_VERSION": "15.11.1",
"GITLAB_SHELL_VERSION": "14.18.0",
"GITLAB_WORKHORSE_VERSION": "15.11.0"
"GITLAB_WORKHORSE_VERSION": "15.11.1"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.11.0";
version = "15.11.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-kpqSDtj9ctS5PVWTJv5z/HVXYjIlP6CU/FGgueXwKic=";
sha256 = "sha256-D12R9liFsrH0XwGSLkmhCbWMbPXrp0kzus4t4Kuw4cg=";
};
vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "15.11.0";
version = "15.11.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-nYpDyLg9nhl6EA0nwUzA+DFtyZVDnwplQTi1KJTwFbU=";
sha256 = "sha256-BPChY2t0ygH73XZYDWDb0EVPqrniMxzg3JWgcmsAesA=";
};
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.11.0";
version = "15.11.1";
src = fetchFromGitLab {
owner = data.owner;

4
pkgs/applications/version-management/got/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.87";
version = "0.88";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
hash = "sha256-fG8UihNXCxc0j01ImAAI3N0ViNrd9gnTUhRKs7Il5R4=";
hash = "sha256-F8EHMKAQq/fV/i6+Vf42hmVjhbptuuiO8zfE9kfzzqA=";
};
nativeBuildInputs = [ pkg-config bison ]

7
pkgs/applications/video/go-chromecast/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-chromecast";
version = "0.2.12";
version = "0.3.1";
src = fetchFromGitHub {
owner = "vishen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-h8qWwMaEhXnj6ZSrKAXBVbrMR0je41EoOtFeN9XlCuk=";
hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI=";
};
vendorSha256 = "sha256-PpMLHuJR6irp+QHhzguwGtBy30HM7DR0tNGiwB07M5E=";
vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ];
@ -20,6 +20,5 @@ buildGoModule rec {
description = "CLI for Google Chromecast, Home devices and Cast Groups";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
broken = true; # build fails with go > 1.17
};
}

4
pkgs/applications/virtualization/virtualbox/fix-audio-driver-loading.patch
View file

@ -7,7 +7,7 @@ index cfcb0abbf..2ce564f6f 100644
RTLDRMOD hMod = NIL_RTLDRMOD;
- int rc = RTLdrLoadSystemEx(VBOX_ALSA_LIB, RTLDRLOAD_FLAGS_NO_UNLOAD, &hMod);
+ int rc = RTLdrLoad(VBOX_ALSA_LIB, &hMod);
+ int rc = RTLdrLoadEx(VBOX_ALSA_LIB, &hMod, RTLDRLOAD_FLAGS_NO_UNLOAD, nullptr);
if (RT_SUCCESS(rc))
{
for (uintptr_t i = 0; i < RT_ELEMENTS(SharedFuncs); i++)
@ -20,7 +20,7 @@ index a17fc93f9..148f5c39a 100644
RTLDRMOD hMod = NIL_RTLDRMOD;
- int rc = RTLdrLoadSystemEx(VBOX_PULSE_LIB, RTLDRLOAD_FLAGS_NO_UNLOAD, &hMod);
+ int rc = RTLdrLoad(VBOX_PULSE_LIB, &hMod);
+ int rc = RTLdrLoadEx(VBOX_PULSE_LIB, &hMod, RTLDRLOAD_FLAGS_NO_UNLOAD, nullptr);
if (RT_SUCCESS(rc))
{
for (unsigned i = 0; i < RT_ELEMENTS(g_aImportedFunctions); i++)

9
pkgs/data/fonts/noto-fonts/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, stdenvNoCC
, lib
, gitUpdater
, fetchFromGitHub
, fetchurl
, cairo
@ -34,13 +35,13 @@ rec {
}:
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "23.4.1";
version = "23.5.1";
src = fetchFromGitHub {
owner = "notofonts";
repo = "notofonts.github.io";
rev = "noto-monthly-release-${version}";
hash = "sha256-hiBbhcwktacuoYJnZcsh7Aej5QIrBNkqrel2NhjNjCU=";
hash = "sha256-tIzn9xBDVFT7h9+p2NltA0v0mvB1OH9rX9+eXvIPhv0=";
};
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
@ -74,6 +75,10 @@ rec {
done
'');
passthru.updateScript = gitUpdater {
rev-prefix = "noto-monthly-release-";
};
meta = with lib; {
description = "Beautiful and free fonts for many languages";
homepage = "https://www.google.com/get/noto/";

6
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202304200041";
version = "202304270044";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "7869655f0a2c9fd81d04e091b1c2657029b6e1f9";
sha256 = "sha256-pgQU8gLErC9zo/GtwxHC2+4svFsxkgceV3IZPovVMo4=";
rev = "015e040dbd71ec79f57555d9c2721326e4254b34";
sha256 = "sha256-yY+mEsnc4x6zgslpu8755tGt7I17xBB1RXdAzSLtf2U=";
};
installPhase = ''

6
pkgs/data/themes/colloid-gtk-theme/default.nix
View file

@ -19,17 +19,17 @@ in
lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "rimless" "normal" ] tweaks
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "gruvbox" "rimless" "normal" ] tweaks
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022.11.11";
version = "2023.04.11";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-3uiQYiseNEKDahjurjnDj9pakx1p94BfsR3LBO2dd/s=";
hash = "sha256-lVHDQmu9GLesasmI2GQ0hx4f2NtgaM4IlJk/hXe2XzY=";
};
nativeBuildInputs = [

19
pkgs/desktops/gnome/extensions/collisions.json
View file

@ -298,5 +298,22 @@
"floating-panel-usedbymyself@wpism"
]
},
"44": {}
"44": {
"applications-menu": [
"apps-menu@gnome-shell-extensions.gcampax.github.com",
"Applications_Menu@rmy.pobox.com"
],
"workspace-indicator": [
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
"horizontal-workspace-indicator@tty2.io"
],
"clipboard-indicator": [
"clipboard-indicator@tudmotu.com",
"clipboard-indicator@Dieg0Js.github.io"
],
"virtualbox-applet": [
"vbox-applet@gs.eros2.info",
"vbox-applet@buba98"
]
}
}

15
pkgs/desktops/gnome/extensions/extensionRenames.nix
View file

@ -10,19 +10,23 @@
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
# Make sure to move them up once they are updated
# ####### GNOME 43 #######
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
"PersianCalendar@oxygenws.com" = "persian-calendar";
"persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2";
"clipboard-indicator@tudmotu.com" = "clipboard-indicator";
"clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2";
"vbox-applet@gs.eros2.info" = "virtualbox-applet";
"vbox-applet@buba98" = "virtualbox-applet-2";
# ####### GNOME 43 #######
"PersianCalendar@oxygenws.com" = "persian-calendar";
"persian-calendar@iamrezamousavi.gmail.com" = "persian-calendar-2";
# DEPRECATED: Use "Caffeine" instead
"KeepAwake@jepfa.de" = "keep-awake";
"awake@vixalien.com" = null;
@ -30,9 +34,6 @@
"noannoyance@sindex.com" = "noannoyance";
"noannoyance@daase.net" = "noannoyance-2";
"vbox-applet@gs.eros2.info" = "virtualbox-applet";
"vbox-applet@buba98" = "virtualbox-applet-2";
"batime@martin.zurowietz.de" = "battery-time";
"batterytime@typeof.pw" = "battery-time-2";

278
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

19
pkgs/desktops/gnome/games/gnome-nibbles/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, gnome
, gtk3
@ -12,7 +11,6 @@
, gettext
, itstool
, vala
, python3
, libxml2
, libgee
, libgnome-games-support
@ -24,30 +22,17 @@
stdenv.mkDerivation rec {
pname = "gnome-nibbles";
version = "3.38.2";
version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5";
sha256 = "l1/eHYPHsVs5Lqx6NZFhKQ/IrrdgXBHnHO4MPDJrXmE=";
};
patches = [
# Fix build with recent Vala.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch";
sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch";
sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ=";
})
];
nativeBuildInputs = [
meson
ninja
vala
python3
pkg-config
wrapGAppsHook
gettext

63
pkgs/development/compilers/flutter/default.nix
View file

@ -1,36 +1,55 @@
{ callPackage, fetchzip, dart }:
{ callPackage, fetchzip, dart, lib, stdenv }:
let
mkFlutter = { version, engineVersion, patches, dart, src }: callPackage ./flutter.nix { inherit version engineVersion patches dart src; };
mkCustomFlutter = args: callPackage ./flutter.nix args;
wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; };
getPatches = dir:
let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files;
flutterDrv = { version, engineVersion, dartVersion, hash, dartHash, patches }: mkFlutter {
inherit version engineVersion patches;
dart = dart.override {
version = dartVersion;
sources = {
"${dartVersion}-x86_64-linux" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
sha256 = dartHash.x86_64-linux;
};
"${dartVersion}-aarch64-linux" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = dartHash.aarch64-linux;
mkFlutter = { version, engineVersion, dartVersion, hash, dartHash, patches }:
let args = {
inherit version engineVersion patches;
dart = dart.override {
version = dartVersion;
sources = {
"${dartVersion}-x86_64-linux" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
sha256 = dartHash.x86_64-linux;
};
"${dartVersion}-aarch64-linux" = fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = dartHash.aarch64-linux;
};
};
};
src = fetchzip {
url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
sha256 = hash;
};
}; in (mkCustomFlutter args).overrideAttrs (prev: next: {
passthru = next.passthru // rec {
inherit wrapFlutter mkCustomFlutter mkFlutter;
buildFlutterApplication = callPackage ../../../build-support/flutter {
# Package a minimal version of Flutter that only uses Linux desktop release artifacts.
flutter = wrapFlutter
(mkCustomFlutter (args // {
includedEngineArtifacts = {
common = [ "flutter_patched_sdk_product" ];
platform.linux = lib.optionals stdenv.hostPlatform.isLinux
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
(architecture: [ "release" ]));
};
}));
};
};
src = fetchzip {
url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
sha256 = hash;
};
};
});
flutter2Patches = getPatches ./patches/flutter2;
flutter3Patches = getPatches ./patches/flutter3;
in
{
inherit mkFlutter wrapFlutter flutterDrv flutter3Patches flutter2Patches;
stable = flutterDrv {
inherit wrapFlutter;
stable = mkFlutter {
version = "3.7.12";
engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314";
dartVersion = "2.19.6";
@ -42,7 +61,7 @@ in
patches = flutter3Patches;
};
v2 = flutterDrv {
v2 = mkFlutter {
version = "2.10.5";
engineVersion = "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab";
dartVersion = "2.16.2";

16
pkgs/development/compilers/flutter/flutter.nix
View file

@ -25,7 +25,7 @@
, lndir
, git
, which
}@args:
}:
let
engineArtifactDirectory =
@ -160,24 +160,10 @@ let
passthru = {
inherit dart;
# The derivation containing the original Flutter SDK files.
# When other derivations wrap this one, any unmodified files
# found here should be included as-is, for tooling compatibility.
sdk = unwrapped;
buildFlutterApplication = callPackage ../../../build-support/flutter {
# Package a minimal version of Flutter that only uses Linux desktop release artifacts.
flutter = callPackage ./wrapper.nix {
flutter = callPackage ./flutter.nix (args // {
includedEngineArtifacts = {
common = [ "flutter_patched_sdk_product" ];
platform.linux = lib.optionals stdenv.hostPlatform.isLinux
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
(architecture: [ "release" ]));
};
});
};
};
};
meta = with lib; {

12
pkgs/development/compilers/ghcjs/8.10/configured-ghcjs-src.nix
View file

@ -5,8 +5,7 @@
, gcc
, cabal-install
, runCommand
, lib
, stdenv
, fetchpatch
, ghc
, happy
@ -28,7 +27,14 @@ runCommand "configured-ghcjs-src" {
cabal-install
gcc
];
inherit ghcjsSrc;
ctimePatch = fetchpatch {
name = "ghcjs-base-ctime-64-bit.patch";
url = "https://github.com/ghcjs/ghcjs/commit/b7711fbca7c3f43a61f1dba526e6f2a2656ef44c.patch";
hash = "sha256-zZ3l8/5gbIGtvu0s2Xl92fEDhkhJ2c2w+5Ql5qkvr3s=";
};
} ''
export HOME=$(pwd)
mkdir $HOME/.cabal
@ -37,6 +43,8 @@ runCommand "configured-ghcjs-src" {
chmod -R +w "$out"
cd "$out"
patch -p1 -i "$ctimePatch"
# TODO: Find a better way to avoid impure version numbers
sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac

5
pkgs/development/compilers/lobster/default.nix
View file

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, unstableGitUpdater
, cmake
, callPackage
@ -9,7 +8,7 @@
, xorg
# Darwin deps
, cf-private
, CoreFoundation
, Cocoa
, AudioToolbox
, OpenGL
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = if stdenv.isDarwin
then [
cf-private
CoreFoundation
Cocoa
AudioToolbox
OpenGL

8
pkgs/development/interpreters/ivy/default.nix
View file

@ -2,19 +2,21 @@
buildGoModule rec {
pname = "ivy";
version = "0.2.8";
version = "0.2.10";
src = fetchFromGitHub {
rev = "v${version}";
owner = "robpike";
repo = "ivy";
sha256 = "sha256-pb/dJfEXz13myT6XadCg0kKd+n9bcHNBc84ES+hDw2Y=";
hash = "sha256-6rZfBx6jKNOEnG+cmrzgvjUoCHQe+olPeX11qX8ep38=";
};
vendorSha256 = null;
vendorHash = null;
subPackages = [ "." ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/robpike/ivy";
description = "ivy, an APL-like calculator";

6
pkgs/development/libraries/abseil-cpp/202103.nix
View file

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch";
sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5";
})
] ++ lib.optionals stdenv.hostPlatform.isLoongArch64 [
# https://github.com/abseil/abseil-cpp/pull/1110
(fetchpatch {
url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch";
sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc=";
})
];
cmakeFlags = [

41
pkgs/development/libraries/cxx-rs/Cargo.lock generated
View file

@ -79,7 +79,7 @@ dependencies = [
[[package]]
name = "cxx"
version = "1.0.86"
version = "1.0.94"
dependencies = [
"cc",
"cxx-build",
@ -94,7 +94,7 @@ dependencies = [
[[package]]
name = "cxx-build"
version = "1.0.86"
version = "1.0.94"
dependencies = [
"cc",
"codespan-reporting",
@ -105,17 +105,17 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
"syn",
"syn 2.0.15",
]
[[package]]
name = "cxx-gen"
version = "0.7.86"
version = "0.7.94"
dependencies = [
"codespan-reporting",
"proc-macro2",
"quote",
"syn",
"syn 2.0.15",
]
[[package]]
@ -129,22 +129,22 @@ dependencies = [
[[package]]
name = "cxxbridge-cmd"
version = "1.0.86"
version = "1.0.94"
dependencies = [
"clap",
"codespan-reporting",
"proc-macro2",
"quote",
"syn",
"syn 2.0.15",
]
[[package]]
name = "cxxbridge-flags"
version = "1.0.86"
version = "1.0.94"
[[package]]
name = "cxxbridge-macro"
version = "1.0.86"
version = "1.0.94"
dependencies = [
"clang-ast",
"cxx",
@ -154,7 +154,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
"syn",
"syn 2.0.15",
]
[[package]]
@ -256,18 +256,18 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "proc-macro2"
version = "1.0.49"
version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.23"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
@ -307,7 +307,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 1.0.107",
]
[[package]]
@ -338,6 +338,17 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "termcolor"
version = "1.1.3"

4
pkgs/development/libraries/cxx-rs/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cxx-rs";
version = "1.0.86";
version = "1.0.94";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cxx";
rev = version;
sha256 = "sha256-bysuvCapesU/HaNfTfMUas7g3clf8299HmCChpd7abY=";
sha256 = "sha256-h6TmQyxhoOhaAWBZr9rRPCf0BE2QMBIYm5uTVKD2paE=";
};
cargoLock = {

4
pkgs/development/libraries/java/jffi/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jffi";
version = "1.3.10";
version = "1.3.11";
src = fetchFromGitHub {
owner = "jnr";
repo = "jffi";
rev = "jffi-${version}";
sha256 = "sha256-2Y0l1bDr/f3vxwRjDX62xeC5pUmIbk4XH5prh8c91As=";
sha256 = "sha256-fZnZH2j/IXbfsJkJG8s2ArOrWwVE2kgvSREVaSVoDyo=";
};
nativeBuildInputs = [ jdk ant texinfo pkg-config ];

27
pkgs/development/libraries/libvisio/default.nix
View file

@ -1,5 +1,18 @@
{ lib, stdenv, fetchurl, boost, libwpd, libwpg, pkg-config, zlib, gperf
, librevenge, libxml2, icu, perl, cppunit, doxygen
{ lib
, stdenv
, fetchurl
, boost
, libwpd
, libwpg
, pkg-config
, zlib
, gperf
, librevenge
, libxml2
, icu
, perl
, cppunit
, doxygen
}:
stdenv.mkDerivation rec {
@ -13,12 +26,9 @@ stdenv.mkDerivation rec {
sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg";
};
nativeBuildInputs = [ pkg-config cppunit doxygen ];
buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ];
configureFlags = [
"--disable-werror"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config doxygen perl gperf ];
buildInputs = [ boost libwpd libwpg zlib librevenge libxml2 icu cppunit ];
doCheck = true;
@ -27,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio";
license = licenses.mpl20;
platforms = platforms.unix;
maintainers = with maintainers; [ nickcao ];
};
}

4
pkgs/development/libraries/pinocchio/default.nix
View file

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "pinocchio";
version = "2.6.17";
version = "2.6.18";
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-P/2cwFMtVaxT+qt2RDa7qjUIFjDBJ7U6epRFahOKux4=";
hash = "sha256-HkNCZpdGi2hJc2+/8XwLrrJcibpyA7fQN1vNuZ9jyhw=";
};
# error: use of undeclared identifier '__sincos'

28
pkgs/development/libraries/tkimg/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, fetchsvn, tcl, tcllib, tk, xorg }:
tcl.mkTclDerivation rec {
pname = "tkimg";
version = "623";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/tkimg/code/trunk";
rev = version;
sha256 = "sha256-6GlkqYxXmMGjiJTZS2fQNVSimcKc1BZ/lvzvtkhty+o=";
};
configureFlags = [
"--with-tcl=${tcl}/lib"
"--with-tk=${tk}/lib"
"--with-tkinclude=${tk.dev}/include"
];
buildInputs = [ xorg.libX11 tcllib ];
meta = {
homepage = "https://sourceforge.net/projects/tkimg/";
description = "The Img package adds several image formats to Tcl/Tk";
maintainers = with lib.maintainers; [ matthewcroughan ];
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
};
}

9
pkgs/development/libraries/tl-expected/default.nix
View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "tl-expected-unstable";
version = "2023-02-15"; # 37 commits ahead of version 1.0.0
pname = "tl-expected";
version = "1.1.0";
src = fetchFromGitHub {
owner = "TartanLlama";
repo = "expected";
rev = "9d812f5e3b5bc68023f6e31d29489cdcaacef606";
fetchSubmodules = true;
hash = "sha256-ZokcGQgHH37nmTMLmxFcun4S1RjXuXb9NfWHet8Fbc4=";
rev = "v${version}";
hash = "sha256-AuRU8VI5l7Th9fJ5jIc/6mPm0Vqbbt6rY8QCCNDOU50=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/mobile/maestro/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.26.1";
version = "1.27.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "1hq4y8qwnw6mb962g2cp7a5qp8x95p6268d34hjpx0i2h40s9vrk";
sha256 = "1ldlc8qj8nzy44h6qwgz0xiwp3a6fm0wkl05sl1r20iv7sr92grz";
};
dontUnpack = true;

1
pkgs/development/node-packages/node-packages.json
View file

@ -22,6 +22,7 @@
, "@tailwindcss/line-clamp"
, "@tailwindcss/typography"
, "@uppy/companion"
, "@volar/vue-language-server"
, "@vue/cli"
, {"@webassemblyjs/cli": "1.11.1"}
, {"@webassemblyjs/repl": "1.11.1"}

1235
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/development/node-packages/overrides.nix
View file

@ -626,6 +626,10 @@ final: prev: {
};
};
volar = final."@volar/vue-language-server".override {
name = "volar";
};
wavedrom-cli = prev.wavedrom-cli.override {
nativeBuildInputs = [ pkgs.pkg-config final.node-pre-gyp ];
# These dependencies are required by

74
pkgs/development/python-modules/aiooss2/default.nix Normal file
View file

@ -0,0 +1,74 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, oss2
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, requests
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "aiooss2";
version = "0.2.5";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "karajan1001";
repo = "aiooss2";
rev = "refs/tags/${version}";
hash = "sha256-NYr8i5OAYRaRnDkNmnw1IWXnSp7HAovNaSV79xcwyHo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pythonRelaxDeps = [
"aiohttp"
"oss2"
];
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools
setuptools-scm
];
propagatedBuildInputs = [
aiohttp
oss2
];
nativeCheckInputs = [
pytest-mock
pytest-asyncio
pytestCheckHook
requests
];
pythonImportsCheck = [
"aiooss2"
];
disabledTestPaths = [
# Tests require network access
"tests/func/test_bucket.py"
"tests/func/test_object.py"
"tests/func/test_resumable.py"
"tests/unit/test_adapter.py"
];
meta = with lib; {
description = "Library for aliyun OSS (Object Storage Service)";
homepage = "https://github.com/karajan1001/aiooss2";
changelog = "https://github.com/karajan1001/aiooss2/blob/${version}/CHANGES.txt";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/asyncstdlib/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asyncstdlib";
version = "3.10.6";
version = "3.10.7";
format = "flit";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "maxfischer2781";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-JfKcmmusFmMckYc2+EBItt5V6o4Dk+foIv5hb7wMsHs=";
hash = "sha256-lX5mOcoZTb6EfRHT0qTTWst3NErLti4jZwAeQx4pHGA=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/chalice/default.nix
View file

@ -16,6 +16,7 @@
, requests
, setuptools
, six
, typing-extensions
, watchdog
, websocket-client
, wheel
@ -23,21 +24,22 @@
buildPythonPackage rec {
pname = "chalice";
version = "1.27.3";
version = "1.28.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-izzoYxzkaQqcEM5e8BhZeZIxtAGRDNH/qvqwvrx250s=";
hash = "sha256-m3pSD4fahBW6Yt/w07Co4fTZD7k6as5cPwoK5QSry6M=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "attrs>=19.3.0,<21.5.0" "attrs" \
--replace "inquirer>=2.7.0,<3.0.0" "inquirer" \
--replace "pip>=9,<22.3" "pip" \
--replace "pip>=9,<23.1" "pip" \
'';
propagatedBuildInputs = [
@ -51,6 +53,7 @@ buildPythonPackage rec {
pyyaml
setuptools
six
typing-extensions
wheel
watchdog
];
@ -87,13 +90,20 @@ buildPythonPackage rec {
# https://github.com/aws/chalice/issues/1850
"test_resolve_endpoint"
"test_endpoint_from_arn"
# Tests require dist
"test_setup_tar_gz_hyphens_in_name"
"test_both_tar_gz"
"test_both_tar_bz2"
];
pythonImportsCheck = [ "chalice" ];
pythonImportsCheck = [
"chalice"
];
meta = with lib; {
description = "Python Serverless Microframework for AWS";
homepage = "https://github.com/aws/chalice";
changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
};

7
pkgs/development/python-modules/channels-redis/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "channels-redis";
version = "4.0.0";
version = "4.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "django";
repo = "channels_redis";
rev = version;
hash = "sha256-YiLNrMRroa8T4uPNwa5ussFoFYjyg31waGpBGhAETmY=";
rev = "refs/tags/${version}";
hash = "sha256-Eid9aWlLNnqr3WAnsLe+Pz9gsugCsdDKi0+nFNF02CI=";
};
buildInputs = [
@ -54,6 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Redis-backed ASGI channel layer implementation";
homepage = "https://github.com/django/channels_redis/";
changelog = "https://github.com/django/channels_redis/blob/${version}/CHANGELOG.txt";
license = licenses.bsd3;
maintainers = with maintainers; [ mmai ];
};

4
pkgs/development/python-modules/cwl-upgrader/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "cwl-upgrader";
version = "1.2.4";
version = "1.2.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "common-workflow-language";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3pKnkU8lks3w+N7w2qST9jr4/CS6YzgnBVLTlgq1gf0=";
hash = "sha256-lVIy0aa+hqbi46NfwXCKWDRzszneyuyo6KXxAcr/xIA=";
};
postPatch = ''

9
pkgs/development/python-modules/datafusion/default.nix
View file

@ -32,21 +32,21 @@ in
buildPythonPackage rec {
pname = "datafusion";
version = "22.0.0";
version = "23.0.0";
format = "pyproject";
src = fetchFromGitHub {
name = "datafusion-source";
owner = "apache";
repo = "arrow-datafusion-python";
rev = "22.0.0";
hash = "sha256-EKurQ4h5IOTU3JiGN+MHrDciQUadUrywNRhnv9S/9iY=";
rev = "refs/tags/${version}";
hash = "sha256-ndee7aNmoTtZyfl9UUXdNVHkp0GAuJWkyfZJyRrGwn8=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "datafusion-cargo-deps";
inherit src pname version;
hash = "sha256-0kfavTFqsQ1Uvg5nQw6VFGlvih8ysOyS2KGT4cTIsVI=";
hash = "sha256-eDweEc+7dDbF0WBi6M5XAPIiHRjlYAdf2eNJdwj4D7c=";
};
nativeBuildInputs = with rustPlatform; [
@ -79,6 +79,7 @@ buildPythonPackage rec {
that uses Apache Arrow as its in-memory format.
'';
homepage = "https://arrow.apache.org/datafusion/";
changelog = "https://github.com/apache/arrow-datafusion-python/blob/${version}/CHANGELOG.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ cpcloud ];
};

4
pkgs/development/python-modules/desktop-notifier/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.4.3";
version = "3.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SamSchott";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-V5CggWp9G0/XoQhArrY3LCvfkF2SymORDWdJGjsr7yI=";
hash = "sha256-l7Ykja1LDtbRt65wI1LjGkxxs3oMvN3bKqveGNZ5Fgc=";
};
nativeBuildInputs = [

2
pkgs/development/python-modules/enamlx/default.nix
View file

@ -4,6 +4,7 @@
, enaml
, pyqtgraph
, pythonocc-core
, typing-extensions
}:
buildPythonPackage rec {
@ -22,6 +23,7 @@ buildPythonPackage rec {
# Until https://github.com/inkcut/inkcut/issues/105 perhaps
pyqtgraph
pythonocc-core
typing-extensions
];
# qt_occ_viewer test requires enaml.qt.QtOpenGL which got dropped somewhere

9
pkgs/development/python-modules/fsspec/default.nix
View file

@ -13,8 +13,6 @@
, requests
, smbprotocol
, tqdm
# optionals
, adlfs
, dask
, distributed
@ -31,7 +29,7 @@
buildPythonPackage rec {
pname = "fsspec";
version = "2022.10.0";
version = "2023.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -40,7 +38,7 @@ buildPythonPackage rec {
owner = "fsspec";
repo = "filesystem_spec";
rev = version;
hash = "sha256-+lPt/zqI3Mkt+QRNXq+Dxm3h/ryZJsfrmayVi/BTtbg=";
hash = "sha256-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM=";
};
propagatedBuildInputs = [
@ -137,6 +135,9 @@ buildPythonPackage rec {
# test accesses this remote ftp server:
# https://ftp.fau.de/debian-cd/current/amd64/log/success
"test_find"
# Tests want to access S3
"test_urlpath_inference_errors"
"test_mismatch"
] ++ lib.optionals (stdenv.isDarwin) [
# works locally on APFS, fails on hydra with AssertionError comparing timestamps
# darwin hydra builder uses HFS+ and has only one second timestamp resolution

46
pkgs/development/python-modules/fuzzytm/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, gensim
, numpy
, pandas
, pyfume
, scipy
, pythonOlder
}:
buildPythonPackage rec {
pname = "fuzzytm";
version = "2.0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "FuzzyTM";
inherit version;
hash = "sha256-IELkjd3/yc2lBYsLP6mms9LEcXOfVtNNooEKCMf9BtU=";
};
propagatedBuildInputs = [
gensim
numpy
pandas
pyfume
scipy
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"FuzzyTM"
];
meta = with lib; {
description = "Library for Fuzzy Topic Models";
homepage = "https://github.com/ERijck/FuzzyTM";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
};
}

8
pkgs/development/python-modules/gcsfs/default.nix
View file

@ -12,13 +12,14 @@
, ujson
, aiohttp
, crcmod
, pytest-timeout
, pytest-vcr
, vcrpy
}:
buildPythonPackage rec {
pname = "gcsfs";
version = "2022.10.0";
version = "2023.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,8 +27,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "fsspec";
repo = pname;
rev = version;
hash = "sha256-+S4AziibYWos/hZ1v3883b1Vv3y4xjIDUrQ8c2XJ1MQ=";
rev = "refs/tags/${version}";
hash = "sha256-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o=";
};
propagatedBuildInputs = [
@ -44,6 +45,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-vcr
pytest-timeout
pytestCheckHook
vcrpy
];

10
pkgs/development/python-modules/gensim/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "gensim";
version = "4.3.0";
version = "4.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-ZL1+ximQIVh4gi6LJWnRg1BU9WzfU2AN3+mSfjHztI0=";
hash = "sha256-i18RwOalMICGtI6PaEEiOk+ho31RNoRhK37oVLUzAV8=";
};
nativeBuildInputs = [
@ -54,10 +54,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Topic-modelling library";
homepage = "https://radimrehurek.com/gensim/";
changelog = "https://github.com/RaRe-Technologies/gensim/blob/${version}/CHANGELOG.md";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ jyp ];
# python310 errors as: No matching distribution found for FuzzyTM>=0.4.0
# python311 errors as: longintrepr.h: No such file or directory
broken = true; # At 2023-02-05
};
}

6
pkgs/development/python-modules/glean-sdk/default.nix
View file

@ -17,19 +17,19 @@
buildPythonPackage rec {
pname = "glean-sdk";
version = "52.2.0";
version = "52.6.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-iW432YtZtRGUWia33Lsnu+aQuedhBJdh8dZ30FPg6Vk=";
hash = "sha256-TTV6oydUP2znEOm7KZElugNDfROnlPmyC19Ig1H8/wM=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-/7qKIQglNKGveKFtPeqd35Mq2hH/20BGTgDBgip4PnI=";
hash = "sha256-Np2TfgKP3yfJqA4WZyyedGp9XtKJjDikUov5pvB/opk=";
};
nativeBuildInputs = [

45
pkgs/development/python-modules/glymur/default.nix
View file

@ -1,38 +1,42 @@
{ lib, stdenv
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, numpy
, scikitimage
, openjpeg
, procps
, pytestCheckHook
, contextlib2
, mock
, importlib-resources
, isPy27
, lxml
, numpy
, openjpeg
, pytestCheckHook
, pythonOlder
, scikitimage
, setuptools
}:
buildPythonPackage rec {
pname = "glymur";
version = "0.9.3";
version = "0.12.4";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "quintusdias";
repo = pname;
rev = "v${version}";
sha256 = "1xlpax56qg5qqh0s19xidgvv2483sc684zj7rh6zw1m1z9m37drr";
rev = "refs/tags/v${version}";
hash = "sha256-H7aA1nHd8JI3+4dzZhu+GOv/0Y2KRdDkn6Fvc76ny/A=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
numpy
] ++ lib.optionals isPy27 [ contextlib2 mock importlib-resources ];
];
nativeCheckInputs = [
scikitimage
procps
pytestCheckHook
lxml
pytestCheckHook
scikitimage
];
postConfigure = ''
@ -45,13 +49,18 @@ buildPythonPackage rec {
# fsh systems by reading an .rc file and such, and is obviated by the patch
# in postConfigure
"tests/test_config.py"
"tests/test_tiff2jp2.py"
];
pythonImportsCheck = [
"glymur"
];
meta = with lib; {
description = "Tools for accessing JPEG2000 files";
homepage = "https://github.com/quintusdias/glymur";
changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

8
pkgs/development/python-modules/inform/default.nix
View file

@ -6,18 +6,21 @@
, six
, hypothesis
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "inform";
version = "1.27";
version = "1.28";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "KenKundert";
repo = "inform";
rev = "refs/tags/v${version}";
hash = "sha256-SvE+UAGpUomUBHlH4aYZ1BYmLp3BherRjosKsIaOA/s=";
hash = "sha256-RA8/or3HTS/rQmG4A/Eg5j24YElaTEpnHa1yksARVMQ=";
};
nativeBuildInputs = [
@ -46,6 +49,7 @@ buildPythonPackage rec {
allow you to simply and cleanly print different types of messages.
'';
homepage = "https://inform.readthedocs.io";
changelog = "https://github.com/KenKundert/inform/blob/v${version}/doc/releases.rst";
license = licenses.gpl3Only;
maintainers = with maintainers; [ jeremyschlatter ];
};

4
pkgs/development/python-modules/inquirer/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "inquirer";
version = "3.1.2";
version = "3.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "magmax";
repo = "python-inquirer";
rev = "refs/tags/v${version}";
hash = "sha256-7kq0sZzPeCX7TA5Cl2rg6Uw+9jLz335a+tOrO0+Cyas=";
hash = "sha256-7GfHsCQgnDUdiM1z9YNdDuwMNy6rLjR1UTnZMgpQ5k4=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/intake/default.nix
View file

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "intake";
version = "0.6.6";
version = "0.6.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-/VQKLmEpIOULTPpJKuVLyqqQVLKVhwVBoos9Q/upwQM=";
hash = "sha256-7A9wuuOQyGhdGj6T5VY+NrZjEOf/y8dCzSkHuPhNsKI=";
};
propagatedBuildInputs = [
@ -52,7 +52,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
intake-parquet
pytestCheckHook
] ++ passthru.optional-dependencies.server;
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
passthru.optional-dependencies = {
server = [

13
pkgs/development/python-modules/invocations/default.nix
View file

@ -3,6 +3,7 @@
, blessings
, fetchFromGitHub
, invoke
, pythonOlder
, releases
, semantic-version
, tabulate
@ -12,20 +13,21 @@
buildPythonPackage rec {
pname = "invocations";
version = "3.0.1";
version = "3.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pyinvoke";
repo = pname;
rev = version;
hash = "sha256-G0sl2DCROxlTnW3lWKeGw4qDmnaeRC4xYf27d6YePjE=";
rev = "refs/tags/${version}";
hash = "sha256-sXMxTOi0iCz7Zq0lXkpproUtkId5p/GCqP1TvgqYlME=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "semantic_version>=2.4,<2.7" "semantic_version" \
--replace "tabulate==0.7.5" "tabulate"
--replace "semantic_version>=2.4,<2.7" "semantic_version"
'';
propagatedBuildInputs = [
@ -48,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Common/best-practice Invoke tasks and collections";
homepage = "https://invocations.readthedocs.io/";
changelog = "https://github.com/pyinvoke/invocations/blob/${version}/docs/changelog.rst";
license = licenses.bsd2;
maintainers = with maintainers; [ samuela ];
};

38
pkgs/development/python-modules/ipyniivue/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, hatchling
, hatch-jupyter-builder
, ipywidgets
, jupyter-ui-poll
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ipyniivue";
version = "1.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-vFbEV/ZMXvKZeQUR536OZQ/5uIkt4tOWcCGRPMdc34I";
};
nativeBuildInputs = [ hatchling hatch-jupyter-builder ];
propagatedBuildInputs = [ ipywidgets jupyter-ui-poll ];
nativeCheckImports = [ pytestCheckHook ];
pythonImportsCheck = [ "ipyniivue" ];
meta = with lib; {
description = "Show a nifti image in a webgl 2.0 canvas within a jupyter notebook cell";
homepage = "https://github.com/niivue/ipyniivue";
changelog = "https://github.com/niivue/ipyniivue/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
};
}

38
pkgs/development/python-modules/jupyter-ui-poll/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
, ipython
}:
buildPythonPackage rec {
pname = "jupyter-ui-poll";
version = "0.2.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Kirill888";
repo = "jupyter-ui-poll";
rev = "refs/tags/v${version}";
hash = "sha256-DWZFvzx0aNTmf1x8Rq19OT0PFRxdpKefWYFh8C116Fw";
};
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [
ipython
];
doCheck = false; # no tests in package :(
pythonImportsCheck = [ "jupyter_ui_poll" ];
meta = with lib; {
description = "Block jupyter cell execution while interacting with widgets";
homepage = "https://github.com/Kirill888/jupyter-ui-poll";
changelog = "https://github.com/Kirill888/jupyter-ui-poll/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

6
pkgs/development/python-modules/kornia/default.nix
View file

@ -9,15 +9,16 @@
buildPythonPackage rec {
pname = "kornia";
version = "0.6.11";
version = "0.6.12";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-APqITIt2P+16qp27dwLoAq9vY5CYpd49IWfYHTcZTSI=";
hash = "sha256-qLJos1ivEws/jFK4j0Kp1ij9J9ZwCoHFRYXnlYxwPFY=";
};
propagatedBuildInputs = [
@ -47,6 +48,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://kornia.github.io/kornia";
changelog = "https://github.com/kornia/kornia/releases/tag/v${version}";
description = "Differentiable computer vision library";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];

63
pkgs/development/python-modules/lifelines/default.nix
View file

@ -1,46 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, numpy
, scipy
, pandas
, matplotlib
, autograd
, autograd-gamma
, formulaic
, scikit-learn
, sybil
, flaky
, jinja2
, buildPythonPackage
, dill
, fetchFromGitHub
, flaky
, formulaic
, jinja2
, matplotlib
, numpy
, pandas
, psutil
, pytestCheckHook
, pythonOlder
, scikit-learn
, scipy
, sybil
}:
buildPythonPackage rec {
pname = "lifelines";
version = "0.27.4";
version = "0.27.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "CamDavidsonPilon";
repo = "lifelines";
rev = "v${version}";
hash = "sha256-KDoXplqkTsk85dmcTBhbj2GDcC4ry+2z5C2QHAnBTw4=";
rev = "refs/tags/v${version}";
hash = "sha256-6ulg3R59QHy31CXit8tddi6F0vPKVRZDIu0zdS19xu0=";
};
propagatedBuildInputs = [
numpy
scipy
pandas
matplotlib
autograd
autograd-gamma
formulaic
matplotlib
numpy
pandas
scipy
];
pythonImportsCheck = [ "lifelines" ];
checkInputs = [
nativeCheckInputs = [
dill
flaky
jinja2
@ -50,14 +52,23 @@ buildPythonPackage rec {
sybil
];
pythonImportsCheck = [
"lifelines"
];
disabledTestPaths = [
"lifelines/tests/test_estimation.py"
];
meta = {
homepage = "https://lifelines.readthedocs.io";
disabledTests = [
"test_datetimes_to_durations_with_different_frequencies"
];
meta = with lib; {
description = "Survival analysis in Python";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ swflint ];
homepage = "https://lifelines.readthedocs.io";
changelog = "https://github.com/CamDavidsonPilon/lifelines/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ swflint ];
};
}

4
pkgs/development/python-modules/openapi-core/default.nix
View file

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "openapi-core";
version = "0.17.0";
version = "0.17.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "p1c2u";
repo = "openapi-core";
rev = "refs/tags/${version}";
hash = "sha256-LxCaP8r+89UmV/VfqtA/mWV/CXd6ZfRQnNnM0Jde7ko=";
hash = "sha256-xlrG2FF55qDsrkdSqCBLu3/QLtZs48ZUB90B2CemY64=";
};
postPatch = ''

4
pkgs/development/python-modules/openapi-schema-validator/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "openapi-schema-validator";
version = "0.4.3";
version = "0.4.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "p1c2u";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-rp0Oq5WWPpna5rHrq/lfRNxjK5/FLgPZ5uzVfDT/YiI=";
hash = "sha256-2XTCdp9dfzhNKCpq71pt7yEZm9abiEmFHD/114W+jOQ=";
};
postPatch = ''

4
pkgs/development/python-modules/openapi-spec-validator/default.nix
View file

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "openapi-spec-validator";
version = "0.5.5";
version = "0.5.6";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "p1c2u";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-t7u0p6V2woqIFsqywv7k5s5pbbnmcn45YnlFWH1PEi4=";
hash = "sha256-BIGHaZhrEc7wcIesBIXdVRzozllCNOz67V+LmQfZ8oY=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/opensearch-py/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "opensearch-py";
version = "2.1.1";
version = "2.2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "opensearch-project";
repo = "opensearch-py";
rev = "refs/tags/v${version}";
hash = "sha256-uJ6fdRPDK76qKHE4E6dI01vKgvfqbc6A1RCwnOtuOTY=";
hash = "sha256-dMVwr0ghTH4Dm2HnfDHb0r/T3COcekeIjT4BBcmGLsc=";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/oss2/default.nix
View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "oss2";
version = "2.16.0";
version = "2.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-oss-python-sdk";
rev = version;
hash = "sha256-Q8U7zMlqpKSoW99MBm9p0AnrGZY7M9oRNImMNJaEjSw=";
rev = "refs/tags/${version}";
hash = "sha256-EL6qbtVyOJ2RGw3sZiRJouqVNLBMUKGycAZl31M1+oQ=";
};
nativeBuildInputs = [
@ -57,10 +57,13 @@ buildPythonPackage rec {
# Tests require network access
"tests/test_api_base.py"
"tests/test_async_fetch_task.py"
"tests/test_bucket_access_monitor.py"
"tests/test_bucket_cname.py"
"tests/test_bucket_inventory.py"
"tests/test_bucket_meta_query.py"
"tests/test_bucket_replication.py"
"tests/test_bucket_resource_group.py"
"tests/test_bucket_style.py"
"tests/test_bucket_transfer_acceleration.py"
"tests/test_bucket_versioning.py"
"tests/test_bucket_worm.py"
@ -105,6 +108,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Alibaba Cloud OSS SDK for Python";
homepage = "https://github.com/aliyun/aliyun-oss-python-sdk";
changelog = "https://github.com/aliyun/aliyun-oss-python-sdk/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

9
pkgs/development/python-modules/ossfs/default.nix
View file

@ -1,16 +1,17 @@
{ lib
, aiooss2
, buildPythonPackage
, fetchFromGitHub
, fsspec
, oss2
, pythonOlder
, setuptools-scm
, pythonRelaxDepsHook
, setuptools-scm
}:
buildPythonPackage rec {
pname = "ossfs";
version = "2023.1.0";
version = "2023.4.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -19,12 +20,13 @@ buildPythonPackage rec {
owner = "fsspec";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo=";
hash = "sha256-xYxoEU4+XyiEZThLEyRVHNFg7Bc6jrYEEtq8o+4PtnY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pythonRelaxDeps = [
"aiooss2"
"fsspec"
"oss2"
];
@ -35,6 +37,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
aiooss2
fsspec
oss2
];

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