mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 08:01:31 +00:00
Merge master into staging-next
This commit is contained in:
@@ -9542,12 +9542,6 @@
|
||||
name = "Fritz Stracke";
|
||||
keys = [ { fingerprint = "7A9D 6DB2 0C5A AA55 7838 EEE6 B8CA 2D9A D8F0 506F"; } ];
|
||||
};
|
||||
ftrvxmtrx = {
|
||||
email = "ftrvxmtrx@gmail.com";
|
||||
github = "ftrvxmtrx";
|
||||
githubId = 248148;
|
||||
name = "Sigrid Solveig Haflínudóttir";
|
||||
};
|
||||
ftsimas = {
|
||||
name = "Filippos Tsimas";
|
||||
email = "filippos.tsimas@outlook.com";
|
||||
|
||||
@@ -8,6 +8,11 @@ let
|
||||
cfg = config.services.part-db;
|
||||
pkg = cfg.package;
|
||||
|
||||
envFile = pkgs.writeText "part-db-env" (
|
||||
lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}=\"${value}\"") cfg.settings)
|
||||
+ "\n"
|
||||
);
|
||||
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkPackageOption
|
||||
@@ -62,6 +67,17 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/run/secrets/part-db.env";
|
||||
description = ''
|
||||
Path to a file containing extra Part-DB environment variables in dotenv
|
||||
format. This can be used for secrets such as `APP_SECRET` without
|
||||
putting them in the Nix store.
|
||||
'';
|
||||
};
|
||||
|
||||
poolConfig = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.oneOf [
|
||||
@@ -176,18 +192,34 @@ in
|
||||
root = "${pkg}/public";
|
||||
locations = {
|
||||
"/" = {
|
||||
tryFiles = "$uri $uri/ /index.php?$query_string";
|
||||
tryFiles = "$uri $uri/ /index.php$is_args$args";
|
||||
index = "index.php";
|
||||
extraConfig = ''
|
||||
add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; sandbox;" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
sendfile off;
|
||||
'';
|
||||
};
|
||||
"~ \\.php$" = {
|
||||
"= /index.php" = {
|
||||
extraConfig = ''
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params ;
|
||||
fastcgi_param SCRIPT_FILENAME $request_filename;
|
||||
fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
|
||||
fastcgi_param DOCUMENT_ROOT $realpath_root;
|
||||
fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.part-db.socket};
|
||||
internal;
|
||||
'';
|
||||
};
|
||||
"~ \\.php$" = {
|
||||
return = "404";
|
||||
};
|
||||
"~* ^/media/.*\\.(php[3-8]?|phar|phtml|pht|phps)$" = {
|
||||
return = "403";
|
||||
};
|
||||
"~* \\.svg$" = {
|
||||
extraConfig = ''
|
||||
add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; frame-ancestors 'none'; sandbox;" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
'';
|
||||
};
|
||||
};
|
||||
@@ -197,10 +229,32 @@ in
|
||||
|
||||
systemd = {
|
||||
services = {
|
||||
part-db-setup = {
|
||||
before = [ "part-db-migrate.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
restartTriggers = [ envFile ];
|
||||
script = ''
|
||||
install -Dm0600 -o part-db -g part-db ${envFile} /var/lib/part-db/env.local
|
||||
''
|
||||
+ lib.optionalString (cfg.environmentFile != null) ''
|
||||
cat ${lib.escapeShellArg cfg.environmentFile} >> /var/lib/part-db/env.local
|
||||
'';
|
||||
};
|
||||
|
||||
part-db-migrate = {
|
||||
before = [ "phpfpm-part-db.service" ];
|
||||
after = [ "postgresql.target" ];
|
||||
requires = [ "postgresql.target" ];
|
||||
after = [
|
||||
"postgresql.target"
|
||||
"part-db-setup.service"
|
||||
];
|
||||
requires = [
|
||||
"postgresql.target"
|
||||
"part-db-setup.service"
|
||||
];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
@@ -235,10 +289,30 @@ in
|
||||
user = "part-db";
|
||||
group = "part-db";
|
||||
};
|
||||
"/var/lib/part-db/env.local"."L+" = {
|
||||
argument = "${pkgs.writeText "part-db-env" (
|
||||
lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}=\"${value}\"") cfg.settings)
|
||||
)}";
|
||||
"/var/lib/part-db/".d = {
|
||||
mode = "0755";
|
||||
user = "part-db";
|
||||
group = "part-db";
|
||||
};
|
||||
"/var/lib/part-db/public/".d = {
|
||||
mode = "0755";
|
||||
user = "part-db";
|
||||
group = "part-db";
|
||||
};
|
||||
"/var/lib/part-db/public/media/".d = {
|
||||
mode = "0755";
|
||||
user = "part-db";
|
||||
group = "part-db";
|
||||
};
|
||||
"/var/lib/part-db/uploads/".d = {
|
||||
mode = "0750";
|
||||
user = "part-db";
|
||||
group = "part-db";
|
||||
};
|
||||
"/var/lib/part-db/share/".d = {
|
||||
mode = "0750";
|
||||
user = "part-db";
|
||||
group = "part-db";
|
||||
};
|
||||
"/var/log/part-db/".d = {
|
||||
mode = "0750";
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
{ lib, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
name = "part-db";
|
||||
meta.maintainers = with lib.maintainers; [ oddlama ];
|
||||
|
||||
nodes = {
|
||||
machine = {
|
||||
services.part-db.enable = true;
|
||||
services.part-db = {
|
||||
enable = true;
|
||||
environmentFile = pkgs.writeText "part-db.env" ''
|
||||
APP_SECRET=0123456789abcdef0123456789abcdef
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -15,8 +20,22 @@
|
||||
machine.wait_for_unit("part-db-migrate.service")
|
||||
machine.wait_for_unit("phpfpm-part-db.service")
|
||||
machine.wait_for_unit("nginx.service")
|
||||
|
||||
machine.succeed("test -d /var/lib/part-db/public/media")
|
||||
machine.succeed("test -d /var/lib/part-db/uploads")
|
||||
machine.succeed("test -d /var/lib/part-db/share")
|
||||
machine.succeed("test $(readlink ${pkgs.part-db}/public/media) = /var/lib/part-db/public/media/")
|
||||
machine.succeed("test $(readlink ${pkgs.part-db}/uploads) = /var/lib/part-db/uploads/")
|
||||
machine.succeed("grep APP_SECRET=0123456789abcdef0123456789abcdef /var/lib/part-db/env.local")
|
||||
machine.succeed("test $(stat -c %a:%U:%G /var/lib/part-db/env.local) = 600:part-db:part-db")
|
||||
|
||||
machine.wait_for_open_port(80)
|
||||
|
||||
machine.succeed("curl -L --fail http://localhost | grep 'Part-DB'", timeout=10)
|
||||
machine.succeed("echo static > /var/lib/part-db/public/media/static.txt")
|
||||
machine.succeed("curl -I --fail http://localhost/media/static.txt | grep 'Content-Security-Policy'")
|
||||
machine.succeed("curl -I --fail http://localhost/media/static.txt | grep 'X-Content-Type-Options: nosniff'")
|
||||
machine.succeed("echo '<?php echo 1; ?>' > /var/lib/part-db/public/media/shell.phar")
|
||||
machine.succeed("curl -I http://localhost/media/shell.phar | grep 'HTTP/1.1 403 Forbidden'")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Fast console MPEG Audio Player and decoder library";
|
||||
homepage = "https://mpg123.org";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1286,8 +1286,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "denoland";
|
||||
name = "vscode-deno";
|
||||
version = "3.52.0";
|
||||
hash = "sha256-0Qkruo7Eh86JRm58G7XhyceUpCJDmhoYaPjUKJQjFiU=";
|
||||
version = "3.53.0";
|
||||
hash = "sha256-M+wFee1x/cCgGMFrDaV7OtIhEORHkLHf/Z06/VuZZmg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog";
|
||||
|
||||
@@ -838,7 +838,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "150.0.7871.46",
|
||||
"version": "150.0.7871.100",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583",
|
||||
@@ -850,16 +850,16 @@
|
||||
"hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "150.0.7871.46-1",
|
||||
"hash": "sha256-SuZTPUpv7onrHvDrwZO0Xo/mxLVcGUSxf2xb+OC//L8="
|
||||
"rev": "150.0.7871.100-1",
|
||||
"hash": "sha256-a+bGt3sROlE9edUBN2/VGn/grN6BqxWX/bsUlAVoAxY="
|
||||
},
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "5b586c06e0d27582900f17e2d59c5370d8d6e0bb",
|
||||
"hash": "sha256-OAZNyZtR5WFWW42r74RSy9fT7Eb7CNZwzoIHhuoqR28=",
|
||||
"rev": "b5a9b587b83512ef1fab99cb7510c58a06d22089",
|
||||
"hash": "sha256-bylGmZC9NhUjcU6amK3mwuZ1it7uTm2hsC60DaKINr4=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
||||
@@ -127,189 +127,13 @@ let
|
||||
removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}";
|
||||
in
|
||||
lib.optionalAttrs config.allowAliases {
|
||||
_assert = archived "_assert" "2025/10";
|
||||
azurestack = archived "azurestack" "2025/10";
|
||||
googleworkspace = archived "googleworkspace" "2025/10";
|
||||
huaweicloudstack = archived "huaweicloudstack" "2025/10";
|
||||
metal = archived "metal" "2025/10";
|
||||
stackpath = archived "stackpath" "2025/10";
|
||||
vra7 = archived "vra7" "2025/10";
|
||||
ccloud = removed "ccloud" "2025/11. Try sap-cloud-infrastructure_sci instead.";
|
||||
sapcc_ccloud = removed "sapcc_ccloud" "2025/11. Try sap-cloud-infrastructure_sci instead.";
|
||||
argocd = removed "argocd" "2025/12. Try argoproj-labs_argocd instead.";
|
||||
oboukili_argocd = removed "oboukili_argocd" "2025/12. Try argoproj-labs_argocd instead.";
|
||||
};
|
||||
|
||||
# added 2025-10-12
|
||||
renamed-providers = lib.optionalAttrs config.allowAliases {
|
||||
onepassword =
|
||||
lib.warnOnInstantiate
|
||||
"terraform-providers.onepassword has been renamed to terraform-providers.1password_onepassword"
|
||||
actualProviders."1password_onepassword";
|
||||
thunder = lib.warnOnInstantiate "terraform-providers.thunder has been renamed to terraform-providers.a10networks_thunder" actualProviders.a10networks_thunder;
|
||||
netlify = lib.warnOnInstantiate "terraform-providers.netlify has been renamed to terraform-providers.aegirhealth_netlify" actualProviders.aegirhealth_netlify;
|
||||
aiven = lib.warnOnInstantiate "terraform-providers.aiven has been renamed to terraform-providers.aiven_aiven" actualProviders.aiven_aiven;
|
||||
akamai = lib.warnOnInstantiate "terraform-providers.akamai has been renamed to terraform-providers.akamai_akamai" actualProviders.akamai_akamai;
|
||||
alicloud = lib.warnOnInstantiate "terraform-providers.alicloud has been renamed to terraform-providers.aliyun_alicloud" actualProviders.aliyun_alicloud;
|
||||
minio = lib.warnOnInstantiate "terraform-providers.minio has been renamed to terraform-providers.aminueza_minio" actualProviders.aminueza_minio;
|
||||
auth0 = lib.warnOnInstantiate "terraform-providers.auth0 has been renamed to terraform-providers.auth0_auth0" actualProviders.auth0_auth0;
|
||||
aviatrix = lib.warnOnInstantiate "terraform-providers.aviatrix has been renamed to terraform-providers.aviatrixsystems_aviatrix" actualProviders.aviatrixsystems_aviatrix;
|
||||
dhall = lib.warnOnInstantiate "terraform-providers.dhall has been renamed to terraform-providers.awakesecurity_dhall" actualProviders.awakesecurity_dhall;
|
||||
baiducloud = lib.warnOnInstantiate "terraform-providers.baiducloud has been renamed to terraform-providers.baidubce_baiducloud" actualProviders.baidubce_baiducloud;
|
||||
brightbox = lib.warnOnInstantiate "terraform-providers.brightbox has been renamed to terraform-providers.brightbox_brightbox" actualProviders.brightbox_brightbox;
|
||||
buildkite = lib.warnOnInstantiate "terraform-providers.buildkite has been renamed to terraform-providers.buildkite_buildkite" actualProviders.buildkite_buildkite;
|
||||
pass = lib.warnOnInstantiate "terraform-providers.pass has been renamed to terraform-providers.camptocamp_pass" actualProviders.camptocamp_pass;
|
||||
sops = lib.warnOnInstantiate "terraform-providers.sops has been renamed to terraform-providers.carlpett_sops" actualProviders.carlpett_sops;
|
||||
checkly = lib.warnOnInstantiate "terraform-providers.checkly has been renamed to terraform-providers.checkly_checkly" actualProviders.checkly_checkly;
|
||||
aci = lib.warnOnInstantiate "terraform-providers.aci has been renamed to terraform-providers.ciscodevnet_aci" actualProviders.ciscodevnet_aci;
|
||||
ciscoasa = lib.warnOnInstantiate "terraform-providers.ciscoasa has been renamed to terraform-providers.ciscodevnet_ciscoasa" actualProviders.ciscodevnet_ciscoasa;
|
||||
age = lib.warnOnInstantiate "terraform-providers.age has been renamed to terraform-providers.clementblaise_age" actualProviders.clementblaise_age;
|
||||
cloudamqp = lib.warnOnInstantiate "terraform-providers.cloudamqp has been renamed to terraform-providers.cloudamqp_cloudamqp" actualProviders.cloudamqp_cloudamqp;
|
||||
cloudflare = lib.warnOnInstantiate "terraform-providers.cloudflare has been renamed to terraform-providers.cloudflare_cloudflare" actualProviders.cloudflare_cloudflare;
|
||||
cloudfoundry = lib.warnOnInstantiate "terraform-providers.cloudfoundry has been renamed to terraform-providers.cloudfoundry-community_cloudfoundry" actualProviders.cloudfoundry-community_cloudfoundry;
|
||||
utils = lib.warnOnInstantiate "terraform-providers.utils has been renamed to terraform-providers.cloudposse_utils" actualProviders.cloudposse_utils;
|
||||
cloudscale = lib.warnOnInstantiate "terraform-providers.cloudscale has been renamed to terraform-providers.cloudscale-ch_cloudscale" actualProviders.cloudscale-ch_cloudscale;
|
||||
constellix = lib.warnOnInstantiate "terraform-providers.constellix has been renamed to terraform-providers.constellix_constellix" actualProviders.constellix_constellix;
|
||||
porkbun = lib.warnOnInstantiate "terraform-providers.porkbun has been renamed to terraform-providers.cullenmcdermott_porkbun" actualProviders.cullenmcdermott_porkbun;
|
||||
postgresql = lib.warnOnInstantiate "terraform-providers.postgresql has been renamed to terraform-providers.cyrilgdn_postgresql" actualProviders.cyrilgdn_postgresql;
|
||||
rabbitmq = lib.warnOnInstantiate "terraform-providers.rabbitmq has been renamed to terraform-providers.cyrilgdn_rabbitmq" actualProviders.cyrilgdn_rabbitmq;
|
||||
datadog = lib.warnOnInstantiate "terraform-providers.datadog has been renamed to terraform-providers.datadog_datadog" actualProviders.datadog_datadog;
|
||||
nexus = lib.warnOnInstantiate "terraform-providers.nexus has been renamed to terraform-providers.datadrivers_nexus" actualProviders.datadrivers_nexus;
|
||||
deno = lib.warnOnInstantiate "terraform-providers.deno has been renamed to terraform-providers.denoland_deno" actualProviders.denoland_deno;
|
||||
hydra = lib.warnOnInstantiate "terraform-providers.hydra has been renamed to terraform-providers.determinatesystems_hydra" actualProviders.determinatesystems_hydra;
|
||||
digitalocean = lib.warnOnInstantiate "terraform-providers.digitalocean has been renamed to terraform-providers.digitalocean_digitalocean" actualProviders.digitalocean_digitalocean;
|
||||
libvirt = lib.warnOnInstantiate "terraform-providers.libvirt has been renamed to terraform-providers.dmacvicar_libvirt" actualProviders.dmacvicar_libvirt;
|
||||
dnsimple = lib.warnOnInstantiate "terraform-providers.dnsimple has been renamed to terraform-providers.dnsimple_dnsimple" actualProviders.dnsimple_dnsimple;
|
||||
dme = lib.warnOnInstantiate "terraform-providers.dme has been renamed to terraform-providers.dnsmadeeasy_dme" actualProviders.dnsmadeeasy_dme;
|
||||
doppler = lib.warnOnInstantiate "terraform-providers.doppler has been renamed to terraform-providers.dopplerhq_doppler" actualProviders.dopplerhq_doppler;
|
||||
bitbucket = lib.warnOnInstantiate "terraform-providers.bitbucket has been renamed to terraform-providers.drfaust92_bitbucket" actualProviders.drfaust92_bitbucket;
|
||||
equinix = lib.warnOnInstantiate "terraform-providers.equinix has been renamed to terraform-providers.equinix_equinix" actualProviders.equinix_equinix;
|
||||
exoscale = lib.warnOnInstantiate "terraform-providers.exoscale has been renamed to terraform-providers.exoscale_exoscale" actualProviders.exoscale_exoscale;
|
||||
bigip = lib.warnOnInstantiate "terraform-providers.bigip has been renamed to terraform-providers.f5networks_bigip" actualProviders.f5networks_bigip;
|
||||
fastly = lib.warnOnInstantiate "terraform-providers.fastly has been renamed to terraform-providers.fastly_fastly" actualProviders.fastly_fastly;
|
||||
flexibleengine = lib.warnOnInstantiate "terraform-providers.flexibleengine has been renamed to terraform-providers.flexibleenginecloud_flexibleengine" actualProviders.flexibleenginecloud_flexibleengine;
|
||||
fortios = lib.warnOnInstantiate "terraform-providers.fortios has been renamed to terraform-providers.fortinetdev_fortios" actualProviders.fortinetdev_fortios;
|
||||
kubectl = lib.warnOnInstantiate "terraform-providers.kubectl has been renamed to terraform-providers.gavinbunney_kubectl" actualProviders.gavinbunney_kubectl;
|
||||
gitlab = lib.warnOnInstantiate "terraform-providers.gitlab has been renamed to terraform-providers.gitlabhq_gitlab" actualProviders.gitlabhq_gitlab;
|
||||
gandi = lib.warnOnInstantiate "terraform-providers.gandi has been renamed to terraform-providers.go-gandi_gandi" actualProviders.go-gandi_gandi;
|
||||
gitea = lib.warnOnInstantiate "terraform-providers.gitea has been renamed to terraform-providers.go-gitea_gitea" actualProviders.go-gitea_gitea;
|
||||
harbor = lib.warnOnInstantiate "terraform-providers.harbor has been renamed to terraform-providers.goharbor_harbor" actualProviders.goharbor_harbor;
|
||||
grafana = lib.warnOnInstantiate "terraform-providers.grafana has been renamed to terraform-providers.grafana_grafana" actualProviders.grafana_grafana;
|
||||
gridscale = lib.warnOnInstantiate "terraform-providers.gridscale has been renamed to terraform-providers.gridscale_gridscale" actualProviders.gridscale_gridscale;
|
||||
archive = lib.warnOnInstantiate "terraform-providers.archive has been renamed to terraform-providers.hashicorp_archive" actualProviders.hashicorp_archive;
|
||||
aws = lib.warnOnInstantiate "terraform-providers.aws has been renamed to terraform-providers.hashicorp_aws" actualProviders.hashicorp_aws;
|
||||
awscc = lib.warnOnInstantiate "terraform-providers.awscc has been renamed to terraform-providers.hashicorp_awscc" actualProviders.hashicorp_awscc;
|
||||
azuread = lib.warnOnInstantiate "terraform-providers.azuread has been renamed to terraform-providers.hashicorp_azuread" actualProviders.hashicorp_azuread;
|
||||
azurerm = lib.warnOnInstantiate "terraform-providers.azurerm has been renamed to terraform-providers.hashicorp_azurerm" actualProviders.hashicorp_azurerm;
|
||||
cloudinit = lib.warnOnInstantiate "terraform-providers.cloudinit has been renamed to terraform-providers.hashicorp_cloudinit" actualProviders.hashicorp_cloudinit;
|
||||
consul = lib.warnOnInstantiate "terraform-providers.consul has been renamed to terraform-providers.hashicorp_consul" actualProviders.hashicorp_consul;
|
||||
dns = lib.warnOnInstantiate "terraform-providers.dns has been renamed to terraform-providers.hashicorp_dns" actualProviders.hashicorp_dns;
|
||||
external = lib.warnOnInstantiate "terraform-providers.external has been renamed to terraform-providers.hashicorp_external" actualProviders.hashicorp_external;
|
||||
google = lib.warnOnInstantiate "terraform-providers.google has been renamed to terraform-providers.hashicorp_google" actualProviders.hashicorp_google;
|
||||
google-beta = lib.warnOnInstantiate "terraform-providers.google-beta has been renamed to terraform-providers.hashicorp_google-beta" actualProviders.hashicorp_google-beta;
|
||||
helm = lib.warnOnInstantiate "terraform-providers.helm has been renamed to terraform-providers.hashicorp_helm" actualProviders.hashicorp_helm;
|
||||
http = lib.warnOnInstantiate "terraform-providers.http has been renamed to terraform-providers.hashicorp_http" actualProviders.hashicorp_http;
|
||||
kubernetes = lib.warnOnInstantiate "terraform-providers.kubernetes has been renamed to terraform-providers.hashicorp_kubernetes" actualProviders.hashicorp_kubernetes;
|
||||
local = lib.warnOnInstantiate "terraform-providers.local has been renamed to terraform-providers.hashicorp_local" actualProviders.hashicorp_local;
|
||||
nomad = lib.warnOnInstantiate "terraform-providers.nomad has been renamed to terraform-providers.hashicorp_nomad" actualProviders.hashicorp_nomad;
|
||||
null = lib.warnOnInstantiate "terraform-providers.null has been renamed to terraform-providers.hashicorp_null" actualProviders.hashicorp_null;
|
||||
random = lib.warnOnInstantiate "terraform-providers.random has been renamed to terraform-providers.hashicorp_random" actualProviders.hashicorp_random;
|
||||
tfe = lib.warnOnInstantiate "terraform-providers.tfe has been renamed to terraform-providers.hashicorp_tfe" actualProviders.hashicorp_tfe;
|
||||
time = lib.warnOnInstantiate "terraform-providers.time has been renamed to terraform-providers.hashicorp_time" actualProviders.hashicorp_time;
|
||||
tls = lib.warnOnInstantiate "terraform-providers.tls has been renamed to terraform-providers.hashicorp_tls" actualProviders.hashicorp_tls;
|
||||
vault = lib.warnOnInstantiate "terraform-providers.vault has been renamed to terraform-providers.hashicorp_vault" actualProviders.hashicorp_vault;
|
||||
vsphere = lib.warnOnInstantiate "terraform-providers.vsphere has been renamed to terraform-providers.hashicorp_vsphere" actualProviders.hashicorp_vsphere;
|
||||
heroku = lib.warnOnInstantiate "terraform-providers.heroku has been renamed to terraform-providers.heroku_heroku" actualProviders.heroku_heroku;
|
||||
hcloud = lib.warnOnInstantiate "terraform-providers.hcloud has been renamed to terraform-providers.hetznercloud_hcloud" actualProviders.hetznercloud_hcloud;
|
||||
huaweicloud = lib.warnOnInstantiate "terraform-providers.huaweicloud has been renamed to terraform-providers.huaweicloud_huaweicloud" actualProviders.huaweicloud_huaweicloud;
|
||||
ibm = lib.warnOnInstantiate "terraform-providers.ibm has been renamed to terraform-providers.ibm-cloud_ibm" actualProviders.ibm-cloud_ibm;
|
||||
icinga2 = lib.warnOnInstantiate "terraform-providers.icinga2 has been renamed to terraform-providers.icinga_icinga2" actualProviders.icinga_icinga2;
|
||||
infoblox = lib.warnOnInstantiate "terraform-providers.infoblox has been renamed to terraform-providers.infobloxopen_infoblox" actualProviders.infobloxopen_infoblox;
|
||||
github = lib.warnOnInstantiate "terraform-providers.github has been renamed to terraform-providers.integrations_github" actualProviders.integrations_github;
|
||||
artifactory = lib.warnOnInstantiate "terraform-providers.artifactory has been renamed to terraform-providers.jfrog_artifactory" actualProviders.jfrog_artifactory;
|
||||
project = lib.warnOnInstantiate "terraform-providers.project has been renamed to terraform-providers.jfrog_project" actualProviders.jfrog_project;
|
||||
sentry = lib.warnOnInstantiate "terraform-providers.sentry has been renamed to terraform-providers.jianyuan_sentry" actualProviders.jianyuan_sentry;
|
||||
openwrt = lib.warnOnInstantiate "terraform-providers.openwrt has been renamed to terraform-providers.joneshf_openwrt" actualProviders.joneshf_openwrt;
|
||||
triton = lib.warnOnInstantiate "terraform-providers.triton has been renamed to terraform-providers.joyent_triton" actualProviders.joyent_triton;
|
||||
keycloak = lib.warnOnInstantiate "terraform-providers.keycloak has been renamed to terraform-providers.keycloak_keycloak" actualProviders.keycloak_keycloak;
|
||||
neon = lib.warnOnInstantiate "terraform-providers.neon has been renamed to terraform-providers.kislerdm_neon" actualProviders.kislerdm_neon;
|
||||
docker = lib.warnOnInstantiate "terraform-providers.docker has been renamed to terraform-providers.kreuzwerker_docker" actualProviders.kreuzwerker_docker;
|
||||
launchdarkly = lib.warnOnInstantiate "terraform-providers.launchdarkly has been renamed to terraform-providers.launchdarkly_launchdarkly" actualProviders.launchdarkly_launchdarkly;
|
||||
linode = lib.warnOnInstantiate "terraform-providers.linode has been renamed to terraform-providers.linode_linode" actualProviders.linode_linode;
|
||||
htpasswd = lib.warnOnInstantiate "terraform-providers.htpasswd has been renamed to terraform-providers.loafoe_htpasswd" actualProviders.loafoe_htpasswd;
|
||||
ssh = lib.warnOnInstantiate "terraform-providers.ssh has been renamed to terraform-providers.loafoe_ssh" actualProviders.loafoe_ssh;
|
||||
incus = lib.warnOnInstantiate "terraform-providers.incus has been renamed to terraform-providers.lxc_incus" actualProviders.lxc_incus;
|
||||
dexidp = lib.warnOnInstantiate "terraform-providers.dexidp has been renamed to terraform-providers.marcofranssen_dexidp" actualProviders.marcofranssen_dexidp;
|
||||
bitwarden = lib.warnOnInstantiate "terraform-providers.bitwarden has been renamed to terraform-providers.maxlaverse_bitwarden" actualProviders.maxlaverse_bitwarden;
|
||||
migadu = lib.warnOnInstantiate "terraform-providers.migadu has been renamed to terraform-providers.metio_migadu" actualProviders.metio_migadu;
|
||||
kafka = lib.warnOnInstantiate "terraform-providers.kafka has been renamed to terraform-providers.mongey_kafka" actualProviders.mongey_kafka;
|
||||
kafka-connect = lib.warnOnInstantiate "terraform-providers.kafka-connect has been renamed to terraform-providers.mongey_kafka-connect" actualProviders.mongey_kafka-connect;
|
||||
mongodbatlas = lib.warnOnInstantiate "terraform-providers.mongodbatlas has been renamed to terraform-providers.mongodb_mongodbatlas" actualProviders.mongodb_mongodbatlas;
|
||||
namecheap = lib.warnOnInstantiate "terraform-providers.namecheap has been renamed to terraform-providers.namecheap_namecheap" actualProviders.namecheap_namecheap;
|
||||
jetstream = lib.warnOnInstantiate "terraform-providers.jetstream has been renamed to terraform-providers.nats-io_jetstream" actualProviders.nats-io_jetstream;
|
||||
ansible = lib.warnOnInstantiate "terraform-providers.ansible has been renamed to terraform-providers.nbering_ansible" actualProviders.nbering_ansible;
|
||||
newrelic = lib.warnOnInstantiate "terraform-providers.newrelic has been renamed to terraform-providers.newrelic_newrelic" actualProviders.newrelic_newrelic;
|
||||
ns1 = lib.warnOnInstantiate "terraform-providers.ns1 has been renamed to terraform-providers.ns1-terraform_ns1" actualProviders.ns1-terraform_ns1;
|
||||
linuxbox = lib.warnOnInstantiate "terraform-providers.linuxbox has been renamed to terraform-providers.numtide_linuxbox" actualProviders.numtide_linuxbox;
|
||||
secret = lib.warnOnInstantiate "terraform-providers.secret has been renamed to terraform-providers.numtide_secret" actualProviders.numtide_secret;
|
||||
nutanix = lib.warnOnInstantiate "terraform-providers.nutanix has been renamed to terraform-providers.nutanix_nutanix" actualProviders.nutanix_nutanix;
|
||||
okta = lib.warnOnInstantiate "terraform-providers.okta has been renamed to terraform-providers.okta_okta" actualProviders.okta_okta;
|
||||
oktaasa = lib.warnOnInstantiate "terraform-providers.oktaasa has been renamed to terraform-providers.oktadeveloper_oktaasa" actualProviders.oktadeveloper_oktaasa;
|
||||
opennebula = lib.warnOnInstantiate "terraform-providers.opennebula has been renamed to terraform-providers.opennebula_opennebula" actualProviders.opennebula_opennebula;
|
||||
openstack = lib.warnOnInstantiate "terraform-providers.openstack has been renamed to terraform-providers.terraform-provider-openstack_openstack" actualProviders.terraform-provider-openstack_openstack;
|
||||
opentelekomcloud = lib.warnOnInstantiate "terraform-providers.opentelekomcloud has been renamed to terraform-providers.opentelekomcloud_opentelekomcloud" actualProviders.opentelekomcloud_opentelekomcloud;
|
||||
opsgenie = lib.warnOnInstantiate "terraform-providers.opsgenie has been renamed to terraform-providers.opsgenie_opsgenie" actualProviders.opsgenie_opsgenie;
|
||||
oci = lib.warnOnInstantiate "terraform-providers.oci has been renamed to terraform-providers.oracle_oci" actualProviders.oracle_oci;
|
||||
ovh = lib.warnOnInstantiate "terraform-providers.ovh has been renamed to terraform-providers.ovh_ovh" actualProviders.ovh_ovh;
|
||||
slack = lib.warnOnInstantiate "terraform-providers.slack has been renamed to terraform-providers.pablovarela_slack" actualProviders.pablovarela_slack;
|
||||
pagerduty = lib.warnOnInstantiate "terraform-providers.pagerduty has been renamed to terraform-providers.pagerduty_pagerduty" actualProviders.pagerduty_pagerduty;
|
||||
powerdns = lib.warnOnInstantiate "terraform-providers.powerdns has been renamed to terraform-providers.pan-net_powerdns" actualProviders.pan-net_powerdns;
|
||||
elasticsearch = lib.warnOnInstantiate "terraform-providers.elasticsearch has been renamed to terraform-providers.phillbaker_elasticsearch" actualProviders.phillbaker_elasticsearch;
|
||||
ct = lib.warnOnInstantiate "terraform-providers.ct has been renamed to terraform-providers.poseidon_ct" actualProviders.poseidon_ct;
|
||||
matchbox = lib.warnOnInstantiate "terraform-providers.matchbox has been renamed to terraform-providers.poseidon_matchbox" actualProviders.poseidon_matchbox;
|
||||
rancher2 = lib.warnOnInstantiate "terraform-providers.rancher2 has been renamed to terraform-providers.rancher_rancher2" actualProviders.rancher_rancher2;
|
||||
rootly = lib.warnOnInstantiate "terraform-providers.rootly has been renamed to terraform-providers.rootlyhq_rootly" actualProviders.rootlyhq_rootly;
|
||||
rundeck = lib.warnOnInstantiate "terraform-providers.rundeck has been renamed to terraform-providers.rundeck_rundeck" actualProviders.rundeck_rundeck;
|
||||
sakuracloud = lib.warnOnInstantiate "terraform-providers.sakuracloud has been renamed to terraform-providers.sacloud_sakuracloud" actualProviders.sacloud_sakuracloud;
|
||||
btp = lib.warnOnInstantiate "terraform-providers.btp has been renamed to terraform-providers.sap_btp" actualProviders.sap_btp;
|
||||
scaleway = lib.warnOnInstantiate "terraform-providers.scaleway has been renamed to terraform-providers.scaleway_scaleway" actualProviders.scaleway_scaleway;
|
||||
shell = lib.warnOnInstantiate "terraform-providers.shell has been renamed to terraform-providers.scottwinkler_shell" actualProviders.scottwinkler_shell;
|
||||
selectel = lib.warnOnInstantiate "terraform-providers.selectel has been renamed to terraform-providers.selectel_selectel" actualProviders.selectel_selectel;
|
||||
talos = lib.warnOnInstantiate "terraform-providers.talos has been renamed to terraform-providers.siderolabs_talos" actualProviders.siderolabs_talos;
|
||||
skytap = lib.warnOnInstantiate "terraform-providers.skytap has been renamed to terraform-providers.skytap_skytap" actualProviders.skytap_skytap;
|
||||
snowflake = lib.warnOnInstantiate "terraform-providers.snowflake has been renamed to terraform-providers.snowflake-labs_snowflake" actualProviders.snowflake-labs_snowflake;
|
||||
spacelift = lib.warnOnInstantiate "terraform-providers.spacelift has been renamed to terraform-providers.spacelift-io_spacelift" actualProviders.spacelift-io_spacelift;
|
||||
signalfx = lib.warnOnInstantiate "terraform-providers.signalfx has been renamed to terraform-providers.splunk-terraform_signalfx" actualProviders.splunk-terraform_signalfx;
|
||||
spotinst = lib.warnOnInstantiate "terraform-providers.spotinst has been renamed to terraform-providers.spotinst_spotinst" actualProviders.spotinst_spotinst;
|
||||
statuscake = lib.warnOnInstantiate "terraform-providers.statuscake has been renamed to terraform-providers.statuscakedev_statuscake" actualProviders.statuscakedev_statuscake;
|
||||
sumologic = lib.warnOnInstantiate "terraform-providers.sumologic has been renamed to terraform-providers.sumologic_sumologic" actualProviders.sumologic_sumologic;
|
||||
sysdig = lib.warnOnInstantiate "terraform-providers.sysdig has been renamed to terraform-providers.sysdiglabs_sysdig" actualProviders.sysdiglabs_sysdig;
|
||||
tailscale = lib.warnOnInstantiate "terraform-providers.tailscale has been renamed to terraform-providers.tailscale_tailscale" actualProviders.tailscale_tailscale;
|
||||
proxmox = lib.warnOnInstantiate "terraform-providers.proxmox has been renamed to terraform-providers.telmate_proxmox" actualProviders.telmate_proxmox;
|
||||
temporalcloud = lib.warnOnInstantiate "terraform-providers.temporalcloud has been renamed to terraform-providers.temporalio_temporalcloud" actualProviders.temporalio_temporalcloud;
|
||||
tencentcloud = lib.warnOnInstantiate "terraform-providers.tencentcloud has been renamed to terraform-providers.tencentcloudstack_tencentcloud" actualProviders.tencentcloudstack_tencentcloud;
|
||||
remote = lib.warnOnInstantiate "terraform-providers.remote has been renamed to terraform-providers.tenstad_remote" actualProviders.tenstad_remote;
|
||||
virtualbox = lib.warnOnInstantiate "terraform-providers.virtualbox has been renamed to terraform-providers.terra-farm_virtualbox" actualProviders.terra-farm_virtualbox;
|
||||
lxd = lib.warnOnInstantiate "terraform-providers.lxd has been renamed to terraform-providers.terraform-lxd_lxd" actualProviders.terraform-lxd_lxd;
|
||||
routeros = lib.warnOnInstantiate "terraform-providers.routeros has been renamed to terraform-providers.terraform-routeros_routeros" actualProviders.terraform-routeros_routeros;
|
||||
hetznerdns = lib.warnOnInstantiate "terraform-providers.hetznerdns has been renamed to terraform-providers.timohirt_hetznerdns" actualProviders.timohirt_hetznerdns;
|
||||
pocketid = lib.warnOnInstantiate "terraform-providers.pocketid has been renamed to terraform-providers.trozz_pocketid" actualProviders.trozz_pocketid;
|
||||
turbot = lib.warnOnInstantiate "terraform-providers.turbot has been renamed to terraform-providers.turbot_turbot" actualProviders.turbot_turbot;
|
||||
unifi = lib.warnOnInstantiate "terraform-providers.unifi has been renamed to terraform-providers.ubiquiti-community_unifi" actualProviders.ubiquiti-community_unifi;
|
||||
ucloud = lib.warnOnInstantiate "terraform-providers.ucloud has been renamed to terraform-providers.ucloud_ucloud" actualProviders.ucloud_ucloud;
|
||||
acme = lib.warnOnInstantiate "terraform-providers.acme has been renamed to terraform-providers.vancluever_acme" actualProviders.vancluever_acme;
|
||||
venafi = lib.warnOnInstantiate "terraform-providers.venafi has been renamed to terraform-providers.venafi_venafi" actualProviders.venafi_venafi;
|
||||
vinyldns = lib.warnOnInstantiate "terraform-providers.vinyldns has been renamed to terraform-providers.vinyldns_vinyldns" actualProviders.vinyldns_vinyldns;
|
||||
avi = lib.warnOnInstantiate "terraform-providers.avi has been renamed to terraform-providers.vmware_avi" actualProviders.vmware_avi;
|
||||
vcd = lib.warnOnInstantiate "terraform-providers.vcd has been renamed to terraform-providers.vmware_vcd" actualProviders.vmware_vcd;
|
||||
wavefront = lib.warnOnInstantiate "terraform-providers.wavefront has been renamed to terraform-providers.vmware_wavefront" actualProviders.vmware_wavefront;
|
||||
vpsadmin = lib.warnOnInstantiate "terraform-providers.vpsadmin has been renamed to terraform-providers.vpsfreecz_vpsadmin" actualProviders.vpsfreecz_vpsadmin;
|
||||
vultr = lib.warnOnInstantiate "terraform-providers.vultr has been renamed to terraform-providers.vultr_vultr" actualProviders.vultr_vultr;
|
||||
mailgun = lib.warnOnInstantiate "terraform-providers.mailgun has been renamed to terraform-providers.wgebis_mailgun" actualProviders.wgebis_mailgun;
|
||||
yandex = lib.warnOnInstantiate "terraform-providers.yandex has been renamed to terraform-providers.yandex-cloud_yandex" actualProviders.yandex-cloud_yandex;
|
||||
};
|
||||
|
||||
# excluding aliases, used by terraform-full
|
||||
actualProviders = automated-providers // special-providers;
|
||||
in
|
||||
actualProviders // removed-providers // renamed-providers // { inherit actualProviders mkProvider; }
|
||||
actualProviders // removed-providers // { inherit actualProviders mkProvider; }
|
||||
|
||||
@@ -110,11 +110,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"bpg_proxmox": {
|
||||
"hash": "sha256-Hi37jOpSfBO13BrBSQCrTaYhcyIuL4PAIV9ow7f4eOU=",
|
||||
"hash": "sha256-lZQTbs5hPGswNiF5lJ+95y30i0TQAH3v5W4bVilp+CE=",
|
||||
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
|
||||
"owner": "bpg",
|
||||
"repo": "terraform-provider-proxmox",
|
||||
"rev": "v0.111.0",
|
||||
"rev": "v0.111.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE="
|
||||
},
|
||||
@@ -1184,13 +1184,13 @@
|
||||
"vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY="
|
||||
},
|
||||
"scaleway_scaleway": {
|
||||
"hash": "sha256-9fmNBTOG+A1X+em1nphvwmMUrM/kaR64HlI/e2QeWlA=",
|
||||
"hash": "sha256-rO5xmAJB2ndhVh7Lkun1Gxi04+I2lGVtkbbCbmngp3E=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.77.1",
|
||||
"rev": "v2.78.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-nqDob9nyw21LwSj8lDrA/5kGxe4KwwnHy0+FedIJr3k="
|
||||
"vendorHash": "sha256-x2cppxUU58nN7eu+wMxIoS16HezxzkHWI50ck2r34ls="
|
||||
},
|
||||
"scottwinkler_shell": {
|
||||
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
|
||||
@@ -1202,13 +1202,13 @@
|
||||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"selectel_selectel": {
|
||||
"hash": "sha256-xoIwvrjeuY1T+7pyBQfoU8orWC4qMuQ9IgbLYIEzLIA=",
|
||||
"hash": "sha256-DKz+Cs8Jh480SnZsG7x+CE70pCP43GhQa9S1gl5oWl0=",
|
||||
"homepage": "https://registry.terraform.io/providers/selectel/selectel",
|
||||
"owner": "selectel",
|
||||
"repo": "terraform-provider-selectel",
|
||||
"rev": "v8.1.0",
|
||||
"rev": "v8.2.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Y2oj1DIn80CCdJ7ZM/p6sGqT64dGIEFg/vXXSv6B+iE="
|
||||
"vendorHash": "sha256-PERDJ74FtXhK+HUd9EjYINpmUXVX+kHtkRbFf6gv8Ng="
|
||||
},
|
||||
"siderolabs_talos": {
|
||||
"hash": "sha256-/NACmEpodBNx+Q2M9y3JnKpw9a3Y1eFDdTQ+48MXAc8=",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
ftrvxmtrx
|
||||
chris-martin
|
||||
];
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -10,13 +10,13 @@ let
|
||||
{ modRoot, vendorHash }:
|
||||
buildGoModule rec {
|
||||
pname = "bird-lg-${modRoot}";
|
||||
version = "1.4.5";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xddxdd";
|
||||
repo = "bird-lg-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xKDpaGnMv8e2OKV3547d7Jsq3VFNwayhCL2dGKVYSZM=";
|
||||
hash = "sha256-Ca+wMiIMcknqhn+p8Cb00ibvsrsFXyFxvGhqOWrzZcA=";
|
||||
};
|
||||
|
||||
doDist = false;
|
||||
@@ -42,12 +42,12 @@ let
|
||||
|
||||
bird-lg-frontend = generic {
|
||||
modRoot = "frontend";
|
||||
vendorHash = "sha256-tqpDH7KfpwPuOvIfx3vVclMGOMNFroiBcNb1lN0PtQc=";
|
||||
vendorHash = "sha256-SmpCCvOP9HQh+Niqa3EhRGj1a7EXQgwRW2hTJgv+oIw=";
|
||||
};
|
||||
|
||||
bird-lg-proxy = generic {
|
||||
modRoot = "proxy";
|
||||
vendorHash = "sha256-9BpsRIIidBEm+ivwFIo00H9MTH4R3kkze/W/HaH8124=";
|
||||
vendorHash = "sha256-LRj5OvCu0e0iNW8nEUmbnKhhvaUXOVNIYGv0Lmai28g=";
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "boring";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alebeck";
|
||||
repo = "boring";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PU/DwYgP8pcBc21GwuMMiQIzdU4BhBvHzk9YrktYo1Y=";
|
||||
hash = "sha256-Llc/zxra07DD3pxsUZGAKN2ltegCeTMTI/jSg76gn3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "buildbox";
|
||||
version = "1.4.11";
|
||||
version = "1.4.13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BuildGrid";
|
||||
repo = "buildbox/buildbox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-8Et5wgiugoDLtW2C2nsth5iPXPGQ7wkPDSc6hrBgeG8=";
|
||||
hash = "sha256-W/QV65A7zm2vUdvJRrR+bxe8O3Zogzrx86RmqFVCY84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "carapace-bridge";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carapace-sh";
|
||||
repo = "carapace-bridge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HEVFg9rW1UiRpcZlENTg+YgB/AwmtuEuNqTf4jXW4wU=";
|
||||
hash = "sha256-+PxsIkNRG9lwmhdzW/KB+CUkjJUXpYNn82m1tqIo/NE=";
|
||||
};
|
||||
|
||||
# buildGoModule tries to run `go mod vendor` instead of `go work vendor` on
|
||||
# the workspace if proxyVendor is off
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-RLx5QtA3oTsDSmSWoRqV0LJ+rSifSRc+WAQyeh0Xnbw=";
|
||||
vendorHash = "sha256-5d1LTwfYJe2RCNYNpKbO/3ofayTXDHD+OFul+wuXO0w=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/carapace-bridge/main.go \
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "0-unstable-2026-06-16";
|
||||
version = "0-unstable-2026-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "832db4c7c99b526bf3608ea40a5a904cae77b691";
|
||||
hash = "sha256-bf3pA4JOCN+BhtIFIHBplHkLqvtdwYKZObrdkw+2v4E=";
|
||||
rev = "056c78eb619bdf985d4414cbf73abfc5226d5c04";
|
||||
hash = "sha256-1WhU2GYUU2l3tKpb5F6VxY61HPOHqtuS6hbI+upCmH8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-5yOJwuqeW9tyXRmp/G1gEsv4h2OIr3QFYCXZC8pbJQI=";
|
||||
npmDepsHash = "sha256-ifDAM08pfdbqPl9G5s5cx8hGzldNuVc0DcXDyCGgkkI=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crossplane-cli";
|
||||
version = "2.3.3";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crossplane";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-X40vTjtai6zlZWvGG/wPt8us4AONcXZ9TxIZn2cPH2E=";
|
||||
hash = "sha256-pD91bH+K0nWDXv51mWtNlQVtBLi/zDEjAxAJ6ywd69g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WAGIhGW7R5BZuQmERbJhN3mFCLVSDsNqtAFYnrNo7XE=";
|
||||
vendorHash = "sha256-d7ZgiRF5LVxJoOwqfe0nHyJmakbexGEA7865QXUotP8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "daktari";
|
||||
version = "0.0.340";
|
||||
version = "0.0.341";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "genio-learn";
|
||||
repo = "daktari";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gHBpezrya7i4Gh3dQHynS5vJtBhvXndruGsRRBBRde8=";
|
||||
hash = "sha256-Z2NJ59APuw3AwJ4d3Ux8aaLugbzxjs7CnGQHyfIHiyk=";
|
||||
};
|
||||
|
||||
patches = [ ./optional-pyclip.patch ];
|
||||
|
||||
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
# upstream disable CGO in release build
|
||||
# https://github.com/crazy-max/diun/blob/76c0fe99212adc58d6a3433bbcde1ffa9fb879c4/Dockerfile#L11
|
||||
env.CGO_ENABLED = false;
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -31,8 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'');
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cd src
|
||||
makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data"
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
meta = {
|
||||
13
pkgs/by-name/es/espeakedit/gcc6.patch
Normal file
13
pkgs/by-name/es/espeakedit/gcc6.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git c/src/tr_languages.cpp i/src/tr_languages.cpp
|
||||
index ec210a5..9503f47 100755
|
||||
--- c/src/tr_languages.cpp
|
||||
+++ i/src/tr_languages.cpp
|
||||
@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
|
||||
0x200d, 1, // zero width joiner
|
||||
0, 0 };
|
||||
|
||||
-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
|
||||
+const char string_ordinal[] = {char(0xc2),char(0xba),0}; // masculine ordinal character, UTF-8
|
||||
|
||||
|
||||
static Translator* NewTranslator(void)
|
||||
@@ -61,12 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make -C src
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp src/espeakedit "$out/bin"
|
||||
runHook preInstall
|
||||
install -D src/espeakedit -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2026-07-07";
|
||||
version = "2026-07-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YjE8ovQAbBPOT7dES7ihHWUQE2b/jhfboLuoqxrd314=";
|
||||
hash = "sha256-5hRjsBHElDFzWwhFxEo254AgUbg2qYu3ekyNoGSqJMA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
relrod
|
||||
ftrvxmtrx
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Portable Git(Hub|Lab|ea) CLI tool";
|
||||
homepage = "https://herrhotzenplotz.de/gcli/";
|
||||
changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/${version}";
|
||||
changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/v${version}";
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "gcli";
|
||||
maintainers = with lib.maintainers; [ kenran ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
libconfuse,
|
||||
@@ -10,11 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "genimage";
|
||||
version = "19";
|
||||
version = "20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://public.pengutronix.de/software/genimage/genimage-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-fsT8uGVmKosv8gKEgZBE/6hBN788oW+3SXASkbwB8Qg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pengutronix";
|
||||
repo = "genimage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6pKqvpoEQWebubl6K5FzEAv2aUsBXgOBEAdcCwARkrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/vektra/mockery/v${lib.versions.major finalAttrs.version}/internal/logging.SemVer=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = false;
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/vektra/mockery/v${lib.versions.major finalAttrs.version}/pkg/logging.SemVer=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = false;
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -179,11 +179,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "150.0.7871.46";
|
||||
version = "150.0.7871.100";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-abQBOftzoCGnSfMvzeCFP7F4G286izyvFzrY9nR/qnw=";
|
||||
hash = "sha256-SbV/ACzm31CA1fglQtxc8RdBuTeal/HXXXtUFa0IYHk=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -289,11 +289,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "150.0.7871.47";
|
||||
version = "150.0.7871.101";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/ad2pojsfcj6hr5telal5kk4t6gua_150.0.7871.47/GoogleChrome-150.0.7871.47.dmg";
|
||||
hash = "sha256-1VTMVSBLfSRp9CxPaRkmdgAC0H5KNuZNWywTGLSphUI=";
|
||||
url = "http://dl.google.com/release2/chrome/fwvlzsetnpzv5sb7rdxd5a6nke_150.0.7871.101/GoogleChrome-150.0.7871.101.dmg";
|
||||
hash = "sha256-cumG2dMFXZuYCWWdIn6iJT0Bd24hauVMfXZzbDFVvuU=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gtt";
|
||||
version = "10";
|
||||
version = "11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eeeXun";
|
||||
repo = "gtt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ghdf8UQA+SfsBiD5bPrNZM8sPE+Xhbhn18iNl3xLh8c=";
|
||||
hash = "sha256-sgWoeBdS8HymVjaTjJZDU3KNuYLRLdC5I9k/tNEd0GA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6C+++HIVwOwOmlsdwXWF/ykyK9WOlq/ktIPjRslvllk=";
|
||||
|
||||
@@ -866,6 +866,28 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
ru_RU-mozilla = ru-ru-mozilla;
|
||||
ru-ru-mozilla = mkDict {
|
||||
pname = "hunspell-dict-ru-ru-mozilla";
|
||||
version = "0-unstable-2026-05-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Goudron";
|
||||
repo = "ru-spelling-dictionary";
|
||||
rev = "43cc600462d8681bc6e92d1afb29874e2902ea9b";
|
||||
hash = "sha256-EN/f5lbpBiyItEFcHTJbuwuJF3rghkB1f5T9G0a2tdk=";
|
||||
};
|
||||
|
||||
dictFileName = "ru_RU";
|
||||
readmeFile = "README.md";
|
||||
|
||||
meta = {
|
||||
description = "Hunspell dictionary for Russian, updated version as used in Mozilla products";
|
||||
homepage = "https://github.com/Goudron/ru-spelling-dictionary";
|
||||
license = [ lib.licenses.mpl20 ];
|
||||
};
|
||||
};
|
||||
|
||||
# CZECH
|
||||
|
||||
cs_CZ = cs-cz;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "jetbrains-toolbox";
|
||||
version = "3.5.0.84344";
|
||||
version = "3.6.1.85592";
|
||||
|
||||
updateScript = ./update.sh;
|
||||
|
||||
@@ -58,10 +58,10 @@ let
|
||||
aarch64 = "-arm64";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-u+ATMiioJAmr8wTde4g1hB/DZqPnLZoPNJp6Oiq6m5o=";
|
||||
aarch64-linux = "sha256-5sOJ7nrhNDCtAlrh2yoCUX/nGDm6gM5gV/y592zWQqQ=";
|
||||
x86_64-darwin = "sha256-o2v30FIeVafjKXWjwEY9Mw+rbNfQyXJZUvDF6+DAR58=";
|
||||
aarch64-darwin = "sha256-DDGoHMltZWW/7LtHdDiMwS7HEgs8iPrJqc0XC6YolpY=";
|
||||
x86_64-linux = "sha256-GhrN3oGdNqE4cYJmSAeRATk2yS6AVF6z+/VIb7ttoJc=";
|
||||
aarch64-linux = "sha256-vI0niFirdAnYKF7+1+ACD31i86PgpPXUfKPkHttusRo=";
|
||||
x86_64-darwin = "sha256-E58+mSFTptDE0Vb2xpfFgDOQrAB9LHi1pR+Hd7TlSYQ=";
|
||||
aarch64-darwin = "sha256-islydrfr1j2OlC3wyzGss+NlzjcyrMydYSv6fjFf4D0=";
|
||||
};
|
||||
in
|
||||
selectKernel {
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = "labwc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JSs1Xys0+XAPbxLv5pR91K0/e78mu5xLKu0HGdFFCEM=";
|
||||
hash = "sha256-1LINOZsdN5btT0VQvUwYXbSjuKdQdbkaI062OYAJSiE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "leetcode-cli";
|
||||
version = "0.5.0";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-EafEz5MhY9f56N1LCPaW+ktYrV01r9vHCbublDnfAKg=";
|
||||
hash = "sha256-+6DpMDWP2ApyoQTRXLy1mJn3MZzYqunhcoy+c6fHOAk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8bHpNckEsJ4VWlmEaDTeMW+Txi9SQh30lK5CKKperC8=";
|
||||
cargoHash = "sha256-bbwyuFY3i/pcWBJjaKIZf2zHEkp4raZp7i5cWZtS9w8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -19,15 +19,16 @@ assert lib.elem variant [
|
||||
"tdx"
|
||||
];
|
||||
|
||||
let
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}";
|
||||
version = "5.5.0";
|
||||
|
||||
kernelSrc = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.91.tar.xz";
|
||||
hash = "sha256-D/KrnhafnxlIVXRx+7RQ0wGPjFt3yvKI4aOYJYJZeWk=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}";
|
||||
version = "5.5.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libkrun";
|
||||
@@ -38,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${kernelSrc} $(KERNEL_TARBALL)'
|
||||
--replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${finalAttrs.kernelSrc} $(KERNEL_TARBALL)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "152.0.4-1",
|
||||
"packageVersion": "152.0.5-1",
|
||||
"source": {
|
||||
"rev": "152.0.4-1",
|
||||
"hash": "sha256-sbL3lZyYaewS84Yhb9HOHgV3xPvzbu+IcjdAW1hdlAY="
|
||||
"rev": "152.0.5-1",
|
||||
"hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "152.0.4",
|
||||
"hash": "sha512-DFZiq6j7iXkCr5Xbsv2YixltnPmui5h66J4KZJKsdTuNS4u3sydJCcLrIAqwmN81biPNYIRVZGf1XmkScxfzmg=="
|
||||
"version": "152.0.5",
|
||||
"hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lightning-terminal";
|
||||
version = "0.16.0-alpha";
|
||||
version = "0.17.0-alpha";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "lightning-terminal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lAWAyB6SAk23FS/smJyxl2yDayYLqzpNPI6bdPhRuK4=";
|
||||
hash = "sha256-TjvQaKT2+n08efm+hRImmyFkvoyl0hfyw3dgtm6S/gk=";
|
||||
leaveDotGit = true;
|
||||
# Populate values that require us to use git.
|
||||
postFetch = ''
|
||||
@@ -41,7 +41,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b7AjCKUtjGr1L0+dFnPupKPM/DDj6LlBQ2T25kxCwdk=";
|
||||
vendorHash = "sha256-VaXYBl6upod1fI86C7SzWD0Er2T81dZzaaBoFWTEoJc=";
|
||||
|
||||
buildInputs = [ lightning-app ];
|
||||
postUnpack = ''
|
||||
@@ -171,7 +171,7 @@ buildGoModule rec {
|
||||
version = "0.0.1";
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/app/yarn.lock";
|
||||
hash = "sha256-3oeuCsdm9HcMlKBBWsROY7SKN1vw8H/IXtvkTLrO07I=";
|
||||
hash = "sha256-EJwrnsIBwLKDI3mF54EjLvaKu1PYKKLXed9SKKwUZNA=";
|
||||
};
|
||||
|
||||
# Remove this command from package.json. It requires Git and it is not
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "livekit";
|
||||
version = "1.13.2";
|
||||
version = "1.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livekit";
|
||||
repo = "livekit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YX3ujJ81sjNw2PsUi8AM/iDG2cbP3mZ1U/AjHwp0LAw=";
|
||||
hash = "sha256-Xv3jOHXYQfmDeqEWzAZmuhkhva5+NcVIMilaPTyfHpw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9LBGMpSs7dGQmcHlCS8ymc79S+LwwHVWcNvlghg1L04=";
|
||||
vendorHash = "sha256-W7K2hqR/8fet5LimpF1b7GFIEZ8c16X9kShApotC2Yw=";
|
||||
|
||||
subPackages = [ "cmd/server" ];
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitLab,
|
||||
python3Packages,
|
||||
git,
|
||||
openssh,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "marge-bot";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
@@ -19,18 +19,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-nTVfsprCTa2S/F8GDdDw5SwQw+OrGkHrX/QwU1FZDsw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.setuptools
|
||||
build-system = with python3Packages; [
|
||||
hatchling
|
||||
uv-build
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
(with python3.pkgs; [
|
||||
dependencies =
|
||||
(with python3Packages; [
|
||||
configargparse
|
||||
maya
|
||||
pyyaml
|
||||
requests
|
||||
python-gitlab
|
||||
hatchling
|
||||
])
|
||||
++ [
|
||||
git
|
||||
@@ -38,10 +37,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
];
|
||||
|
||||
nativeCheckInputs =
|
||||
(with python3.pkgs; [
|
||||
(with python3Packages; [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
pendulum
|
||||
python-dateutil
|
||||
time-machine
|
||||
])
|
||||
++ [
|
||||
git
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
|
||||
# tests
|
||||
@@ -11,33 +11,6 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = _final: prev: {
|
||||
# Many tests fail with the current version of opentelemetry we have in nixpkgs
|
||||
# vibe.acp.exceptions.InternalError: module '...' has no attribute 'GEN_AI_PROVIDER_NAME'
|
||||
opentelemetry-api = prev.opentelemetry-api.overridePythonAttrs (old: rec {
|
||||
version = "1.40.0";
|
||||
src = old.src.override {
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg=";
|
||||
};
|
||||
});
|
||||
opentelemetry-exporter-otlp-proto-http =
|
||||
prev.opentelemetry-exporter-otlp-proto-http.overridePythonAttrs
|
||||
(old: {
|
||||
disabledTests =
|
||||
(old.disabledTests or [ ])
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# AssertionError: False is not true
|
||||
# self.assertTrue(0.75 < after - before < 1.25)
|
||||
"test_retry_timeout"
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
python3Packages = python.pkgs;
|
||||
in
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mistral-vibe";
|
||||
version = "2.19.0";
|
||||
|
||||
@@ -35,13 +35,13 @@ let
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "nzbhydra2";
|
||||
version = "8.8.4";
|
||||
version = "8.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theotherp";
|
||||
repo = "nzbhydra2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-A6Q6UoeyuOZP4FD4Y6oVOCu1a2bbIe+3xVHQIuOg0qk=";
|
||||
hash = "sha256-TKqqKFcmxGQ/u5XpRQbEQRdnVlILS8WDdVMXNsAz/yQ=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-mPNyJ4zijwQg8l0G+2cJPkwAVRFVbpCRfyFkA5ONBIE=";
|
||||
|
||||
@@ -31,14 +31,14 @@ in
|
||||
|
||||
py.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "oci-cli";
|
||||
version = "3.88.0";
|
||||
version = "3.89.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "oci-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Jjh6YNIOkHA1XaejIFl9JU9ktAr58aMGt4Zu4ZVaXFQ=";
|
||||
hash = "sha256-VnELp2RWpbES13AYXdZviobXtpV0OI7ptvdkghwUm9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -66,6 +66,7 @@ py.pkgs.buildPythonApplication (finalAttrs: {
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"setuptools"
|
||||
"click"
|
||||
"PyYAML"
|
||||
"cryptography"
|
||||
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/kcat/openal-soft/blob/master/ChangeLog";
|
||||
license = lib.licenses.lgpl2;
|
||||
pkgConfigModules = [ "openal" ];
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,10 +11,12 @@
|
||||
envLocalPath ? "/var/lib/part-db/env.local",
|
||||
cachePath ? "/var/cache/part-db/",
|
||||
logPath ? "/var/log/part-db/",
|
||||
mediaPath ? "/var/lib/part-db/public/media/",
|
||||
uploadsPath ? "/var/lib/part-db/uploads/",
|
||||
}:
|
||||
let
|
||||
pname = "part-db";
|
||||
version = "2.4.0";
|
||||
version = "2.13.1";
|
||||
|
||||
srcWithVendor = php.buildComposerProject2 {
|
||||
inherit pname version;
|
||||
@@ -23,7 +25,7 @@ let
|
||||
owner = "Part-DB";
|
||||
repo = "Part-DB-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-z/bvFFzKVMN6lr9RnrBc/hTrZ9a/mjgpkDYslUFHM50=";
|
||||
hash = "sha256-j7Kj03RxbrRoHJ4kFeZo1VmeHT3YucY4Zxog93+5Q38=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
@@ -36,7 +38,7 @@ let
|
||||
);
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gt5HBi+vV5WhaEXNFFIO8xcbX1Z60SICvxXWGNzsn5o=";
|
||||
vendorHash = "sha256-ZYo0gNsR9liMWWjHZGGf/XFNZJBnBrVVLf7WVhN/pY4=";
|
||||
|
||||
# Upstream composer.json file is missing the description field
|
||||
composerStrictValidation = false;
|
||||
@@ -65,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-F9kZ8nAIghkg+xUkglvRZXOSadv2lbKTP0gNfLD4LYE=";
|
||||
hash = "sha256-xdRMAOmGQFPuej/8A88edH23jL/3K8igx0BB7Z78sjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -79,10 +81,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir $out
|
||||
mv * .* $out/
|
||||
|
||||
rm -rf $out/var/{cache,log}
|
||||
rm -rf $out/var/{cache,log} $out/public/media $out/uploads
|
||||
ln -s ${envLocalPath} $out/.env.local
|
||||
ln -s ${logPath} $out/var/log
|
||||
ln -s ${cachePath} $out/var/cache
|
||||
ln -s ${mediaPath} $out/public/media
|
||||
ln -s ${uploadsPath} $out/uploads
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) part-db; };
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
||||
description = "Programmer's calculator";
|
||||
mainProgram = "pcalc";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pixi-pack";
|
||||
version = "0.7.9";
|
||||
version = "0.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Quantco";
|
||||
repo = "pixi-pack";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jCKlJPLlMrMByoVU1nzqccXBeyEi9CMjrWfL+ByqDhI=";
|
||||
hash = "sha256-5PU+ro+uE1iiBkgQocMYlHZmiS8+bScP1rF3VVXpn/c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0f7IkYPQ1kIBC4aCyBU0Dpo936awol0eJNW6KcFQIAA=";
|
||||
cargoHash = "sha256-9Of4qnt+MFrW42daZiLdHrbH5Z7tYpcN6Sg95FUlcQc=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0.2.0-unstable-2026-06-24";
|
||||
version = "0.2.0-unstable-2026-07-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "60f10bf3d57b68dccf4e1dfd573a72ec8db114d5";
|
||||
hash = "sha256-9jS1eXl1Mg/YwCVSZmpePHcwRKuiGXYOiDmNALRLmyY=";
|
||||
rev = "0cc61a18508245cabd093f065961abd5df0af028";
|
||||
hash = "sha256-tgLjEs9dt7TA9yRq/toUWPiorA4b20GnjmO6HJbFFd8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pamVUaMpkNVGY9tWPHsIiqflthzwELFOxgn90ncor/U=";
|
||||
vendorHash = "sha256-a53JKkoJmnSO+ShxUt68LEq9uDeNi/vN/d0OuhrIUvA=";
|
||||
|
||||
subPackages = [ "cmd/pkgsite" ];
|
||||
|
||||
|
||||
@@ -48,11 +48,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.84.2";
|
||||
version = "0.85.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-boeXTZ0I0uGGuSSU/qVwxwb4dNs2NDL4ip4BsZhVOis=";
|
||||
hash = "sha256-DXRRN2kCVW9ISF/IcLPkPHGXSQ7aHynQj3zh7czSWhI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "protonup-rs";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-tudrn2BeTB7+3DQmVxCMv+5vpIv3BwJ8sJqKwX+vHQU=";
|
||||
hash = "sha256-u5SvZuuHPRBwOTUlVmtg9nY98INqKvSnHE83I8UsA0E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kgSMfEQHxOWBQSb1PMYU4HmYzQwrECiFAKKwq4d6vwc=";
|
||||
cargoHash = "sha256-LKZaTwJur4eBLFPtsMZEmaqTzFAxLJEytl61KMs2+Y4=";
|
||||
|
||||
checkFlags = [
|
||||
# Requires internet access
|
||||
|
||||
@@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtractor";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qtractor/qtractor-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-0iMVdWljRWwypzYTQ+tk+y6QC68uYgIdBf+IujGlt5Q=";
|
||||
hash = "sha256-EkedVR9liSUoTNDBj3+zQ9OcXcYBbJmPTWP7BYsI564=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://schismtracker.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "schismtracker";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "see-cat";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guilhermeprokisch";
|
||||
repo = "see";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BlceC8XgKvSLOTKHlfQHxn0rhaFKL8rHqUcYBNntB5s=";
|
||||
hash = "sha256-3uyQW1PxLYxpissm96io5IrZ6uU4S4MdcS+O56CftxA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ccSuJqENO8DElZM5Nz+/rt7yAIMipcVJ3qOi9JR0CQY=";
|
||||
cargoHash = "sha256-Sba5l5Jx/F+Iux3TYT3gMWBkN9yyVQ1n3MZCNl7q0u8=";
|
||||
|
||||
meta = {
|
||||
description = "Cute cat(1) for the terminal";
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
# SHA of ${finalAttrs.version} for the tool's help output. Unfortunately this is needed in build flags.
|
||||
# The update script can update this automatically, the comment is used to find the line.
|
||||
let
|
||||
rev = "09b10f4ef2c32b3ee04ec59821ccae492e1e140d"; # update-commit-sha
|
||||
rev = "310c51d9874a4d10d021ec8a19f8b42292ec0bfc"; # update-commit-sha
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sonobuoy";
|
||||
version = "0.57.4"; # Do not forget to update `rev` above
|
||||
version = "0.57.5"; # Do not forget to update `rev` above
|
||||
|
||||
ldflags =
|
||||
let
|
||||
@@ -30,10 +30,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "sonobuoy";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LFYn7Ym1RS8/Uysm6I2HbVD48fu542TsHdqybzvLgrw=";
|
||||
hash = "sha256-yd2a4FeWpONn/SQ1UEVN6f1RwgOT4Sbs6rSYDAuTqCU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0PELYc2CK8FCDUvQomY6AkYd7VmhmTai64ITbpudMc4=";
|
||||
vendorHash = "sha256-saReHf6oYu1IydP0qNEuFCtrqHDsHoHlPJpo9kSIEiQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = meta // {
|
||||
maintainers = with lib.maintainers; [
|
||||
ftrvxmtrx
|
||||
timokau
|
||||
ma27
|
||||
];
|
||||
|
||||
@@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://systemc.org/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ atalii ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tellico";
|
||||
version = "4.2";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = "tellico";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4bwx5zWJT8jD+kRshHKROx8hc+zuysGTd0HOwU7Ena0=";
|
||||
hash = "sha256-CVZ3iicTMjg/uRQj09aB+215gucs/gwJW89BcIlBeto=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tt-smi";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "tenstorrent";
|
||||
repo = "tt-smi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0Z8F1XdFvnx1q5AUA3RiMbfRyw2nlRVgxhKVotr4GrQ=";
|
||||
hash = "sha256-lZ9fd8tkwfmWHEAJ8+cwBja3U7vxAVWQWrgope9/VO4=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tuxbox";
|
||||
version = "3.1.5";
|
||||
version = "3.1.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndyCappDev";
|
||||
repo = "tuxbox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5DpL9Mq/eXmk0Eh8vZY53TZXJxaJk1orS+luWnzYlrE=";
|
||||
hash = "sha256-BZUo02q2szaxnJYx8UvYvfCErJX4KFzToCvZLuBRJKQ=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildGo126Module,
|
||||
fetchFromGitHub,
|
||||
_experimental-update-script-combinators,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
writeShellApplication,
|
||||
nix,
|
||||
@@ -13,19 +14,19 @@
|
||||
let
|
||||
buildGoModule = buildGo126Module;
|
||||
in
|
||||
buildGoModule {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2026-06-25";
|
||||
version = "7.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "c080da62e73c5ea066b381303c74ae00b53368ac";
|
||||
hash = "sha256-B8CktiQg+JJKE6Lb19LgpAluXI2+ubo5dikEhQQxDs8=";
|
||||
tag = "typescript/v${finalAttrs.version}";
|
||||
hash = "sha256-fRejdQSwaxSS2pjHrbJO2CQgZS5lWJmBNEM/TgbJTJ8=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RKlkRodWH6DaAi1CZziBgIOfzFLm8aih+a0kHNekf5U=";
|
||||
vendorHash = "sha256-q6dMb2ab4uZ3GTrcA7v2JzfmOM+ZzBcJN6gKOpLfM/k=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -38,21 +39,21 @@ buildGoModule {
|
||||
"cmd/tsgo"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
version="$("$out/bin/tsgo" --version)"
|
||||
[[ "$version" == *"7.0.0"* ]]
|
||||
|
||||
runHook postInstallCheck
|
||||
postInstall = ''
|
||||
ln -s "$out/bin/tsgo" "$out/bin/tsc"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script {
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
"--use-github-releases"
|
||||
"--version-regex=^typescript/v([\\d.]+)$"
|
||||
"--src-only"
|
||||
];
|
||||
})
|
||||
@@ -81,10 +82,11 @@ buildGoModule {
|
||||
meta = {
|
||||
description = "Go implementation of TypeScript";
|
||||
homepage = "https://github.com/microsoft/typescript-go";
|
||||
changelog = "https://github.com/microsoft/typescript-go/releases/tag/typescript/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
kachick
|
||||
];
|
||||
mainProgram = "tsgo";
|
||||
mainProgram = "tsc";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Unicode VGA font";
|
||||
maintainers = [ lib.maintainers.ftrvxmtrx ];
|
||||
maintainers = [ ];
|
||||
homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
|
||||
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [
|
||||
lib.maintainers.ftrvxmtrx
|
||||
lib.maintainers.sternenseemann
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
@@ -28,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
buildInputs = [ systemdLibs ];
|
||||
buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemdLibs) [ systemdLibs ];
|
||||
|
||||
checkFlags = [
|
||||
# can't run on sandbox
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zerofs";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Barre";
|
||||
repo = "ZeroFS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7w6KLu5pauHfah+J9A+pa5mB3cbjNH4ADcc+Z5UPlmI=";
|
||||
hash = "sha256-xQOuMBScZn1I2SgmVKvZpKy95+/82SBI/kvl+zrzlT4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/zerofs";
|
||||
|
||||
cargoHash = "sha256-2w0bLGvKq0VyQyMt911zFXA78cy5PYP7OgJAyxGVjUY=";
|
||||
cargoHash = "sha256-ewqv2b1/T1Zl7oLKbCVNbt8jLURlFKyGQVatAl0B9Nc=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
||||
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
ftrvxmtrx
|
||||
];
|
||||
teams = [ lib.teams.enlightenment ];
|
||||
};
|
||||
|
||||
@@ -247,7 +247,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
ftrvxmtrx
|
||||
];
|
||||
teams = [ lib.teams.enlightenment ];
|
||||
};
|
||||
|
||||
@@ -88,7 +88,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
ftrvxmtrx
|
||||
];
|
||||
teams = [ lib.teams.enlightenment ];
|
||||
};
|
||||
|
||||
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
ftrvxmtrx
|
||||
];
|
||||
teams = [ lib.teams.enlightenment ];
|
||||
};
|
||||
|
||||
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
ftrvxmtrx
|
||||
];
|
||||
teams = [ lib.teams.enlightenment ];
|
||||
};
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "io";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-G49gAZ/lzir1YwEAPjBGRjNJ3VMxI+iXnsS0yev8f2s=";
|
||||
sha256 = "sha256-vKrKrqDHCa+nQRXwLp1fS2zO3dgS1ajYQ7/F293uYKQ=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional enableJava jdk;
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "apache-beam";
|
||||
version = "2.74.0";
|
||||
version = "2.75.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -74,13 +74,15 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "apache";
|
||||
repo = "beam";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-30abjaQFYNQ798GhS+MRMDkBbgsJyr6CYb9ymENLrfA=";
|
||||
hash = "sha256-jlY46uVYECZGrT4hCd2eo6QoM4zUm+veGcgcPsHdD5A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/sdks/python";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "distlib==0.4.2" "distlib" \
|
||||
--replace-fail "cython>=3.2.5,<4" "cython" \
|
||||
--replace-fail "==" ">="
|
||||
|
||||
substituteInPlace setup.py \
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "clarifai-grpc";
|
||||
version = "12.5.0";
|
||||
version = "12.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jwIpDtB4nXWCu9xqBnRrLGse+Mk1yiilq0pG6IIVNK0=";
|
||||
hash = "sha256-CoG2q7Z6Rima3llFm7MIKqNuECgdf895EZNbqEApU0Y=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "disposable-email-domains";
|
||||
version = "0.0.212";
|
||||
version = "0.0.216";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
|
||||
src = fetchPypi {
|
||||
pname = "disposable_email_domains";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-ZML2EvIx2oLYFMBxOiPxe3GNuA8W50AEPWwT5NP3ISo=";
|
||||
hash = "sha256-b9qSbIJ3wrINFnfhkzKu60WX7w6l860jjZ/klkeIhY4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -3,18 +3,18 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
requests,
|
||||
urllib3,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ec2-metadata";
|
||||
version = "2.17.0";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ec2_metadata";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-rZilr9j09J9ojkiZ3FBSV9oyNzSHYezusPx/x9AMyQ0=";
|
||||
hash = "sha256-EtfiaM4MsWv27cS+1VF/EPwJAGqsw8NP80IdrpC7COo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
urllib3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@@ -35,6 +35,6 @@ buildPythonPackage (finalAttrs: {
|
||||
changelog = "https://github.com/adamchainz/ec2-metadata/blob/${finalAttrs.version}/CHANGELOG.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ _9999years ];
|
||||
mainProgram = "ec2-metadata";
|
||||
mainProgram = "imds";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastcore";
|
||||
version = "1.13.8";
|
||||
version = "1.14.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = "fastcore";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NhEevAvDMSdQJCJZkbjBpD44IlEy3gV+97vZa4583rQ=";
|
||||
hash = "sha256-lWCUVgu/4Udv3r5BPbBoyn+VyMJYWLWvlcPP89pcC+w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hydra-core";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "facebookresearch";
|
||||
repo = "hydra";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5+uD3AzkV9MVRUWhYoIPo7D0GozQasEjeCNl8tBAB8c=";
|
||||
hash = "sha256-H947PLC0lkV9WJXXLtC0ThWHaAlsdWY6YSWiuRD9Y00=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
pydantic,
|
||||
@@ -20,6 +21,15 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-9T7ScIf5jJBbldNwLHEchrctr3V4LmqxNGhor6QIzO4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull test fixes for Pydantic 2.13+ from https://github.com/richard-gyiko/json-schema-to-pydantic/pull/46
|
||||
(fetchpatch {
|
||||
name = "pydantic-2.13-test-compat.patch";
|
||||
url = "https://github.com/richard-gyiko/json-schema-to-pydantic/commit/acfacd19f282011cfb96b8901d72867a39f57bff.patch";
|
||||
hash = "sha256-+dDFF/eloYuc+ANTjlr9tvI5ycX21o8G1xJOjGlrmTg=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lazy";
|
||||
version = "1.6";
|
||||
version = "2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cScyTscJ6DJPCMtGEcGr4Bd2vaU7uc5o3F36RsoO0+k=";
|
||||
hash = "sha256-+S7A0y3WvRFd3sTjMjRz68C2gq1Yxqynjr/Z5tGqV3c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "manifestoo-core";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "manifestoo_core";
|
||||
hash = "sha256-f+le+hJjsqP5/fXSOfO1DOFq8fl3A9/rioo8pVXoNxk=";
|
||||
hash = "sha256-wUx7YhLMv//nqesJbgYILViDJYHeGBpp05NqAed0Dx4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatch-vcs ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-opensonic";
|
||||
version = "10.0.0";
|
||||
version = "10.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "khers";
|
||||
repo = "py-opensonic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LT6pTtXCUMhk6uV9Y2inlAuP8osWUwsWOH7/yOW2OXI=";
|
||||
hash = "sha256-2MVMhawnmUXBoDItYwh0UQKD2RMwtZye5fwfCUjohK4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
36
pkgs/development/python-modules/pyaqvify/default.nix
Normal file
36
pkgs/development/python-modules/pyaqvify/default.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
aiohttp,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyaqvify";
|
||||
version = "0.0.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astrandb";
|
||||
repo = "pyaqvify";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZSSr7cWDvPxVq8YIqCPpE+nxrk/UHuNGZ/muyiGyp/c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
pythonImportsCheck = [ "pyaqvify" ];
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = {
|
||||
description = "Python async library for Aqvify integration with Home Assistant";
|
||||
homepage = "https://github.com/astrandb/pyaqvify";
|
||||
changelog = "https://github.com/astrandb/pyaqvify/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
})
|
||||
@@ -2,38 +2,34 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
setuptools,
|
||||
mock,
|
||||
pyserial,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pylacrosse";
|
||||
version = "0.4";
|
||||
format = "setuptools";
|
||||
version = "0.5";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hthiery";
|
||||
repo = "python-lacrosse";
|
||||
tag = version;
|
||||
hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-z2OlYFFK/+BONg22+Vk0kQQ0KJoQnRkjP7OUS/TVpfI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Migrate to pytest, https://github.com/hthiery/python-lacrosse/pull/17
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/hthiery/python-lacrosse/commit/cc2623c667bc252360a9b5ccb4fc05296cf23d9c.patch?full_index=1";
|
||||
hash = "sha256-LKryLnXMKj1lVClneyHNVOWM5KPPhOGy0/FX/7Qy/jU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version = version," "version = '${version}',"
|
||||
--replace "version = version," "version = '${finalAttrs.version}',"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pyserial ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ pyserial ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
@@ -49,4 +45,4 @@ buildPythonPackage rec {
|
||||
license = with lib.licenses; [ lgpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyleri";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cesbit";
|
||||
repo = "pyleri";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5umFhP6t0Aezm4ecjg4ix18JhC0mm+bjyIZYqBHZMmI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EmdQdUKFkt3sERU0Q4JOdoiFIvtRIRIl4V4BTId7Ngo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -27,8 +27,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module to parse SiriDB";
|
||||
homepage = "https://github.com/cesbit/pyleri";
|
||||
changelog = "https://github.com/cesbit/pyleri/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/cesbit/pyleri/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -87,7 +87,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
matejc
|
||||
ftrvxmtrx
|
||||
];
|
||||
teams = [ lib.teams.enlightenment ];
|
||||
};
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sgp4";
|
||||
version = "2.25";
|
||||
version = "2.26";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4Z7cbcwl1p+4/eCiZ7jwxE1+kVx7y+rPXTqLWVuvBnQ=";
|
||||
hash = "sha256-SNFXY7avk5P8ICQZBwVYjdNlD82QEzq5gOALxWB8YG4=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ numpy ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mcelog";
|
||||
version = "210";
|
||||
version = "211";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andikleen";
|
||||
repo = "mcelog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RcIcEu9Y6ggYHDP46hMA/HBXq447gYbOzCcyEAiBDNM=";
|
||||
hash = "sha256-u0T6AVy5pxBwU1bkKGP5RG5Bmp0UikwHbV/ij/V3ljE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -80,12 +80,12 @@ rec {
|
||||
};
|
||||
|
||||
new_feature = generic {
|
||||
version = "610.43.02";
|
||||
sha256_64bit = "sha256-MDSgVLtM33dS/43CclZMsQVROAS/9TU4lFkBsWyndGM=";
|
||||
sha256_aarch64 = "sha256-isWTnokUA/dzWocFBLalnk4+O5gSExVjs3dVpdYTU88=";
|
||||
openSha256 = "sha256-hP5NVZZ4vGsACHLmUDKq4uckpd/kn1GxCSYnnJfAuBs=";
|
||||
settingsSha256 = "sha256-0YAhufRgjDW+uR+kjaTb154fibpcDw8QowfrucoZsKE=";
|
||||
persistencedSha256 = "sha256-Whgv9X+v2fRhzliOl2LzltY9v1SxDafFfv3IUPqj/hk=";
|
||||
version = "610.43.03";
|
||||
sha256_64bit = "sha256-ReLUwTSiPDXlDyU6SqY+fl6NF+PRhdSgfIpY6WEu05I=";
|
||||
sha256_aarch64 = "sha256-jSdlXo60ilXLKWKvZfgbBnVqVYuw6zhnGuiDgwxYz94=";
|
||||
openSha256 = "sha256-QCXmqo2xNyIwjGv0da2MUC8ex641Mmc5DUI+uRFVwgE=";
|
||||
settingsSha256 = "sha256-z/t+SdEQdVJPwjKIRHO02d264Kt47eWiOwwsaxmh4xQ=";
|
||||
persistencedSha256 = "sha256-sOKUsAFHh0/COH+nNgbH9+7hWgivOzq4YmTuk9MOFfI=";
|
||||
};
|
||||
|
||||
beta = generic {
|
||||
|
||||
@@ -363,7 +363,8 @@
|
||||
];
|
||||
"aqvify" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: pyaqvify
|
||||
pyaqvify
|
||||
];
|
||||
"aranet" =
|
||||
ps: with ps; [
|
||||
aioesphomeapi
|
||||
@@ -7842,6 +7843,7 @@
|
||||
"apsystems"
|
||||
"aquacell"
|
||||
"aqualogic"
|
||||
"aqvify"
|
||||
"aranet"
|
||||
"arcam_fmj"
|
||||
"arve"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "pg_ivm";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sraoss";
|
||||
repo = "pg_ivm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z6g8ofu1s4SrQzasE9qOo3kjdFe00EZjvgVLewoGoDU=";
|
||||
hash = "sha256-8JQ7r/e5FRAWsshTcTmPnVnbwjXkshP4yaulYS7Zse4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -11,20 +11,16 @@
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
qtdeclarative,
|
||||
qtx11extras ? null,
|
||||
kitemviews,
|
||||
kwidgetsaddons,
|
||||
qtquickcontrols2 ? null,
|
||||
kcmutils,
|
||||
kcoreaddons,
|
||||
kdeclarative,
|
||||
kirigami ? null,
|
||||
kirigami2 ? null,
|
||||
isocodes,
|
||||
xkeyboard-config,
|
||||
libxkbfile,
|
||||
libplasma ? null,
|
||||
plasma-framework ? null,
|
||||
wrapQtAppsHook,
|
||||
kcmSupport ? true,
|
||||
}:
|
||||
@@ -64,26 +60,14 @@ stdenv.mkDerivation rec {
|
||||
xkeyboard-config
|
||||
libxkbfile
|
||||
]
|
||||
++ lib.optionals (lib.versions.major qtbase.version == "5") [
|
||||
qtx11extras
|
||||
]
|
||||
++ lib.optionals kcmSupport (
|
||||
[
|
||||
qtdeclarative
|
||||
kcoreaddons
|
||||
kdeclarative
|
||||
]
|
||||
++ lib.optionals (lib.versions.major qtbase.version == "5") [
|
||||
qtquickcontrols2
|
||||
plasma-framework
|
||||
kirigami2
|
||||
]
|
||||
++ lib.optionals (lib.versions.major qtbase.version == "6") [
|
||||
kcmutils
|
||||
libplasma
|
||||
kirigami
|
||||
]
|
||||
);
|
||||
++ lib.optionals kcmSupport [
|
||||
qtdeclarative
|
||||
kcoreaddons
|
||||
kdeclarative
|
||||
kcmutils
|
||||
libplasma
|
||||
kirigami
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Configuration Tool for Fcitx5";
|
||||
|
||||
@@ -135,7 +135,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
bbarker
|
||||
ftrvxmtrx
|
||||
kovirobi
|
||||
matthewdargan
|
||||
ylh
|
||||
|
||||
@@ -8616,12 +8616,8 @@ with pkgs;
|
||||
eval = false;
|
||||
} emacs.pkgs;
|
||||
|
||||
espeak-classic = callPackage ../applications/audio/espeak { };
|
||||
|
||||
espeak = espeak-ng;
|
||||
|
||||
espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
|
||||
|
||||
evolution-data-server-gtk4 = evolution-data-server.override {
|
||||
withGtk3 = false;
|
||||
withGtk4 = true;
|
||||
|
||||
@@ -14024,6 +14024,8 @@ self: super: with self; {
|
||||
|
||||
pyaprilaire = callPackage ../development/python-modules/pyaprilaire { };
|
||||
|
||||
pyaqvify = callPackage ../development/python-modules/pyaqvify { };
|
||||
|
||||
pyarlo = callPackage ../development/python-modules/pyarlo { };
|
||||
|
||||
pyarr = callPackage ../development/python-modules/pyarr { };
|
||||
|
||||
Reference in New Issue
Block a user