gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge d09337b003 into haskell-updates

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-07-26 00:21:56 +00:00
committed by GitHub
parent e68a89a876 d09337b003
commit 1c3ce1e240
363 changed files with 3796 additions and 8928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.git-blame-ignore-revs
+4
View File
@@ -281,3 +281,7 @@ b4532efe93882ae2e3fc579929a42a5a56544146
# emacs: keep elpa/nongnu/melpa package overrides sorted
9f2faf683ed48704aa17f693208a13aa64e22181
# nixfmt 1.0.0
62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt
5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt
ci/eval/default.nix
+2 -3
View File
@@ -64,8 +64,7 @@ let
-I "$src" \
--option restrict-eval true \
--option allow-import-from-derivation false \
--option eval-system "${evalSystem}" \
--arg enableWarnings false > $out/paths.json
--option eval-system "${evalSystem}" > $out/paths.json
'';
singleSystem =
@@ -99,7 +98,7 @@ let
set +e
command time -o "$outputDir/timestats/$myChunk" \
-f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \
nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \
nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \
--eval-system "$system" \
--option restrict-eval true \
--option allow-import-from-derivation false \
doc/build-helpers/fetchers.chapter.md
+2
View File
@@ -163,6 +163,8 @@ Nixpkgs fetchers can make use of a http(s) proxy. Each fetcher will automaticall
The environment variable `NIX_SSL_CERT_FILE` is also inherited in fetchers, and can be used to provide a custom certificate bundle to fetchers. This is usually required for a https proxy to work without certificate validation errors.
To use a temporary Tor instance as a proxy for fetching from `.onion` addresses, add `nativeBuildInputs = [ tor.proxyHook ];` to the fetcher parameters.
[]{#fetchurl}
## `fetchurl` {#sec-pkgs-fetchers-fetchurl}
doc/release-notes/rl-2511.section.md
+2
View File
@@ -25,6 +25,8 @@
- `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.
- `mx-puppet-discord` was removed from nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.
- `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
- `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env".
maintainers/maintainer-list.nix
+13 -3
View File
@@ -7047,11 +7047,10 @@
name = "Dzmitry Lahoda";
};
e-v-o-l-v-e = {
name = "Ivanoe Megnin-Preiss";
email = "megninpreiss.ivanoe@gmail.com";
email = "oss@imp-network.com";
github = "e-v-o-l-v-e";
githubId = 84813895;
matrix = "@evolve:matrix.imp-network.com";
name = "Ivanoe Megnin-Preiss";
};
e1mo = {
email = "nixpkgs@e1mo.de";
@@ -8285,6 +8284,12 @@
githubId = 92429150;
name = "Paul Meinhold";
};
feyorsh = {
email = "george@feyor.sh";
github = "Feyorsh";
githubId = 44840644;
name = "George Huebner";
};
ffinkdevs = {
email = "fink@h0st.space";
github = "ffinkdevs";
@@ -10144,6 +10149,11 @@
githubId = 3656888;
name = "hhm";
};
hhr2020 = {
name = "hhr2020";
github = "HHR2020";
githubId = 76608828;
};
hhydraa = {
email = "hcurfman@keemail.me";
github = "hcur";
nixos/doc/manual/redirects.json
+9
View File
@@ -1206,6 +1206,15 @@
"module-services-mautrix-signal-migrate-configuration": [
"index.html#module-services-mautrix-signal-migrate-configuration"
],
"module-services-mautrix-whatsapp": [
"index.html#module-services-mautrix-whatsapp"
],
"module-services-mautrix-whatsapp-configuration": [
"index.html#module-services-mautrix-whatsapp-configuration"
],
"module-services-mautrix-whatsapp-migrate-configuration": [
"index.html#module-services-mautrix-whatsapp-migrate-configuration"
],
"module-services-maubot": [
"index.html#module-services-maubot"
],
nixos/doc/manual/release-notes/rl-2111.section.md
+1 -1
View File
@@ -108,7 +108,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [influxdb-exporter](https://github.com/prometheus/influxdb_exporter) a Prometheus exporter that exports metrics received on an InfluxDB compatible endpoint is now available as [services.prometheus.exporters.influxdb](#opt-services.prometheus.exporters.influxdb.enable).
- [mx-puppet-discord](https://github.com/matrix-discord/mx-puppet-discord), a discord puppeting bridge for matrix. Available as [services.mx-puppet-discord](#opt-services.mx-puppet-discord.enable).
- [mx-puppet-discord](https://github.com/matrix-discord/mx-puppet-discord), a discord puppeting bridge for matrix. Available as `services.mx-puppet-discord`.
- [MeshCentral](https://www.meshcommander.com/meshcentral2/overview), a remote administration service ("TeamViewer but self-hosted and with more features") is now available with a package and a module: [services.meshcentral.enable](#opt-services.meshcentral.enable)
nixos/modules/hardware/fw-fanctrl.nix
+39 -41
View File
@@ -48,51 +48,49 @@ in
};
strategies = lib.mkOption {
default = null;
default = { };
description = ''
Additional strategies which can be used by fw-fanctrl
'';
type = lib.types.nullOr (
lib.types.attrsOf (
lib.types.submodule {
options = {
fanSpeedUpdateFrequency = lib.mkOption {
type = lib.types.ints.unsigned;
default = 5;
description = "How often the fan speed should be updated in seconds";
};
movingAverageInterval = lib.mkOption {
type = lib.types.ints.unsigned;
default = 25;
description = "Interval (seconds) of the last temperatures to use to calculate the average temperature";
};
speedCurve = lib.mkOption {
default = [ ];
description = "How should the speed curve look like";
type = lib.types.listOf (
lib.types.submodule {
options = {
temp = lib.mkOption {
type = lib.types.int;
default = 0;
description = "Temperature in °C at which the fan speed should be changed";
};
speed = lib.mkOption {
type = lib.types.ints.between 0 100;
default = 0;
description = "Percent how fast the fan should run at";
};
};
}
);
};
type = lib.types.attrsOf (
lib.types.submodule {
options = {
fanSpeedUpdateFrequency = lib.mkOption {
type = lib.types.ints.unsigned;
default = 5;
description = "How often the fan speed should be updated in seconds";
};
}
)
movingAverageInterval = lib.mkOption {
type = lib.types.ints.unsigned;
default = 25;
description = "Interval (seconds) of the last temperatures to use to calculate the average temperature";
};
speedCurve = lib.mkOption {
default = [ ];
description = "How should the speed curve look like";
type = lib.types.listOf (
lib.types.submodule {
options = {
temp = lib.mkOption {
type = lib.types.int;
default = 0;
description = "Temperature in °C at which the fan speed should be changed";
};
speed = lib.mkOption {
type = lib.types.ints.between 0 100;
default = 0;
description = "Percent how fast the fan should run at";
};
};
}
);
};
};
}
);
};
};
nixos/modules/module-list.nix
+1 -1
View File
@@ -779,7 +779,6 @@
./services/matrix/mautrix-telegram.nix
./services/matrix/mautrix-whatsapp.nix
./services/matrix/mjolnir.nix
./services/matrix/mx-puppet-discord.nix
./services/matrix/pantalaimon.nix
./services/matrix/synapse-auto-compressor.nix
./services/matrix/synapse.nix
@@ -1649,6 +1648,7 @@
./services/web-apps/part-db.nix
./services/web-apps/pds.nix
./services/web-apps/peering-manager.nix
./services/web-apps/peertube-runner.nix
./services/web-apps/peertube.nix
./services/web-apps/pgpkeyserver-lite.nix
./services/web-apps/photoprism.nix
nixos/modules/rename.nix
+4
View File
@@ -190,6 +190,10 @@ in
(mkRemovedOptionModule [ "services" "matrix-sliding-sync" ]
"The matrix-sliding-sync package has been removed, since matrix-synapse incorporated its functionality. Remove `services.sliding-sync` from your NixOS Configuration, and the `.well-known` record for `org.matrix.msc3575.proxy` from your webserver"
)
(mkRemovedOptionModule [
"services"
"mx-puppet-discord"
] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [
nixos/modules/services/matrix/mautrix-whatsapp.md
+32
View File
@@ -0,0 +1,32 @@
# Mautrix-Whatsapp {#module-services-mautrix-whatsapp}
[Mautrix-Whatsapp](https://github.com/mautrix/whatsapp) is a Matrix-Whatsapp puppeting bridge.
## Configuration {#module-services-mautrix-whatsapp-configuration}
1. Set [](#opt-services.mautrix-whatsapp.enable) to `true`. The service will use
SQLite by default.
2. To create your configuration check the default configuration for
[](#opt-services.mautrix-whatsapp.settings). To obtain the complete default
configuration, run
`nix-shell -p mautrix-whatsapp --run "mautrix-whatsapp -c default.yaml -e"`.
::: {.warning}
Mautrix-Whatsapp allows for some options like `encryption.pickle_key`,
`provisioning.shared_secret`, allow the value `generate` to be set.
Since the configuration file is regenerated on every start of the
service, the generated values would be discarded and might break your
installation. Instead, set those values via
[](#opt-services.mautrix-whatsapp.environmentFile).
:::
## Migrating from an older configuration {#module-services-mautrix-whatsapp-migrate-configuration}
With Mautrix-Whatsapp v0.11.0 the configuration has been rearranged. Mautrix-Whatsapp
performs an automatic configuration migration so your pre-0.7.0 configuration
should just continue to work.
In case you want to update your NixOS configuration, compare the migrated configuration
at `/var/lib/mautrix-whatsapp/config.yaml` with the default configuration
(`nix-shell -p mautrix-whatsapp --run "mautrix-whatsapp -c example.yaml -e"`) and
update your module configuration accordingly.
nixos/modules/services/matrix/mautrix-whatsapp.nix
+99 -51
View File
@@ -8,34 +8,55 @@ let
cfg = config.services.mautrix-whatsapp;
dataDir = "/var/lib/mautrix-whatsapp";
registrationFile = "${dataDir}/whatsapp-registration.yaml";
settingsFile = "${dataDir}/config.json";
settingsFile = "${dataDir}/config.yaml";
settingsFileUnsubstituted = settingsFormat.generate "mautrix-whatsapp-config-unsubstituted.json" cfg.settings;
settingsFormat = pkgs.formats.json { };
appservicePort = 29318;
# to be used with a list of lib.mkIf values
optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null);
mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v);
defaultConfig = {
network = {
displayname_template = "{{or .BusinessName .PushName .Phone}} (WA)";
identity_change_notices = true;
history_sync = {
request_full_sync = true;
};
};
bridge = {
command_prefix = "!wa";
relay.enabled = true;
permissions."*" = "relay";
};
database = {
type = "sqlite3-fk-wal";
uri = "file:${dataDir}/mautrix-whatsapp.db?_txlock=immediate";
};
homeserver.address = "http://localhost:8448";
appservice = {
hostname = "[::]";
port = appservicePort;
database.type = "sqlite3";
database.uri = "${dataDir}/mautrix-whatsapp.db";
id = "whatsapp";
bot.username = "whatsappbot";
bot.displayname = "WhatsApp Bridge Bot";
bot = {
username = "whatsappbot";
displayname = "WhatsApp Bridge Bot";
};
as_token = "";
hs_token = "";
};
bridge = {
username_template = "whatsapp_{{.}}";
displayname_template = "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)";
double_puppet_server_map = { };
login_shared_secret_map = { };
command_prefix = "!wa";
permissions."*" = "relay";
relay.enabled = true;
};
double_puppet = {
servers = { };
secrets = { };
};
# By default, the following keys/secrets are set to `generate`. This would break when the service
# is restarted, since the previously generated configuration will be overwritten everytime.
# If encryption is enabled, it's recommended to set those keys via `environmentFile`.
encryption.pickle_key = "";
provisioning.shared_secret = "";
public_media.signing_key = "";
direct_media.server_key = "";
logging = {
min_level = "info";
writers = lib.singleton {
@@ -49,65 +70,78 @@ let
in
{
options.services.mautrix-whatsapp = {
enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp";
enable = lib.mkEnableOption "mautrix-whatsapp, a Matrix-WhatsApp puppeting bridge";
package = lib.mkPackageOption pkgs "mautrix-whatsapp" { };
settings = lib.mkOption {
apply = lib.recursiveUpdate defaultConfig;
type = settingsFormat.type;
default = defaultConfig;
description = ''
{file}`config.yaml` configuration as a Nix attribute set.
Configuration options should match those described in
[example-config.yaml](https://github.com/mautrix/whatsapp/blob/master/example-config.yaml).
Configuration options should match those described in the example configuration.
Get an example configuration by executing `mautrix-whatsapp -c example.yaml --generate-example-config`
Secret tokens should be specified using {option}`environmentFile`
instead of this world-readable attribute set.
'';
example = {
appservice = {
database = {
type = "postgres";
uri = "postgresql:///mautrix_whatsapp?host=/run/postgresql";
};
id = "whatsapp";
ephemeral_events = false;
};
bridge = {
history_sync = {
request_full_sync = true;
};
private_chat_portal_meta = true;
mute_bridging = true;
encryption = {
allow = true;
default = true;
require = true;
};
provisioning = {
shared_secret = "disable";
};
mute_only_on_create = false;
permissions = {
"example.com" = "user";
};
};
database = {
type = "postgres";
uri = "postgresql:///mautrix_whatsapp?host=/run/postgresql";
};
homeserver = {
address = "http://[::1]:8008";
domain = "my-domain.tld";
};
appservice = {
id = "whatsapp";
ephemeral_events = false;
};
matrix.message_status_events = true;
provisioning = {
shared_secret = "disable";
};
backfill.enabled = true;
encryption = {
allow = true;
default = true;
require = true;
pickle_key = "$ENCRYPTION_PICKLE_KEY";
};
};
};
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
description = ''
File containing environment variables to be passed to the mautrix-whatsapp service,
in which secret tokens can be specified securely by optionally defining a value for
`MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET`.
File containing environment variables to be passed to the mautrix-whatsapp service.
If an environment variable `MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET` is set,
then its value will be used in the configuration file for the option
`double_puppet.secrets` without leaking it to the store, using the configured
`homeserver.domain` as key.
'';
};
serviceDependencies = lib.mkOption {
type = with lib.types; listOf str;
default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = lib.literalExpression "lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnits";
default =
lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
++ lib.optional config.services.matrix-conduit.enable "conduit.service";
defaultText = lib.literalExpression ''
optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
++ optional config.services.matrix-conduit.enable "conduit.service"
'';
description = ''
List of Systemd services to require and wait for when starting the application service.
List of systemd units to require and wait for when starting the application service.
'';
};
@@ -140,20 +174,28 @@ in
serviceConfig.SupplementaryGroups = [ "mautrix-whatsapp" ];
};
services.mautrix-whatsapp.settings = lib.mkMerge (
map mkDefaults [
defaultConfig
# Note: this is defined here to avoid the docs depending on `config`
{ homeserver.domain = config.services.matrix-synapse.settings.server_name; }
# Note: this is defined here to avoid the docs depending on `config`
services.mautrix-whatsapp.settings.homeserver = optOneOf (
with config.services;
[
(lib.mkIf matrix-synapse.enable (mkDefaults {
domain = matrix-synapse.settings.server_name;
}))
(lib.mkIf matrix-conduit.enable (mkDefaults {
domain = matrix-conduit.settings.global.server_name;
address = "http://localhost:${toString matrix-conduit.settings.global.port}";
}))
]
);
systemd.services.mautrix-whatsapp = {
description = "Mautrix-WhatsApp Service - A WhatsApp bridge for Matrix";
description = "Mautrix-WhatsApp, a Matrix-WhatsApp puppeting bridge";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
# ffmpeg is required for conversion of voice messages
path = [ pkgs.ffmpeg-headless ];
preStart = ''
# substitute the settings file by environment variables
@@ -183,7 +225,7 @@ in
${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token
| .[0].appservice.hs_token = .[1].hs_token
| .[0]
| if env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET else . end' \
| if env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET then .double_puppet.secrets.[.homeserver.domain] = env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET else . end' \
'${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp'
mv '${settingsFile}.tmp' '${settingsFile}'
umask $old_umask
@@ -201,7 +243,6 @@ in
--registration='${registrationFile}'
'';
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
@@ -227,5 +268,12 @@ in
restartTriggers = [ settingsFileUnsubstituted ];
};
};
meta.maintainers = with lib.maintainers; [ frederictobiasc ];
meta = {
buildDocsInSandbox = false;
doc = ./mautrix-whatsapp.md;
maintainers = with lib.maintainers; [
pentane
frederictobiasc
];
};
}
nixos/modules/services/matrix/mx-puppet-discord.nix
-125
View File
@@ -1,125 +0,0 @@
{
config,
pkgs,
lib,
...
}:
let
dataDir = "/var/lib/mx-puppet-discord";
registrationFile = "${dataDir}/discord-registration.yaml";
cfg = config.services.mx-puppet-discord;
settingsFormat = pkgs.formats.json { };
settingsFile = settingsFormat.generate "mx-puppet-discord-config.json" cfg.settings;
in
{
options = {
services.mx-puppet-discord = {
enable = lib.mkEnableOption ''
mx-puppet-discord is a discord puppeting bridge for matrix.
It handles bridging private and group DMs, as well as Guilds (servers)
'';
settings = lib.mkOption rec {
apply = lib.recursiveUpdate default;
inherit (settingsFormat) type;
default = {
bridge.port = 8434;
presence = {
enabled = true;
interval = 500;
};
provisioning.whitelist = [ ];
relay.whitelist = [ ];
# variables are preceded by a colon.
namePatterns = {
user = ":name";
userOverride = ":displayname";
room = ":name";
group = ":name";
};
#defaults to sqlite but can be configured to use postgresql with
#connstring
database.filename = "${dataDir}/database.db";
logging = {
console = "info";
lineDateFormat = "MMM-D HH:mm:ss.SSS";
};
};
example = lib.literalExpression ''
{
bridge = {
bindAddress = "localhost";
domain = "example.com";
homeserverUrl = "https://example.com";
};
provisioning.whitelist = [ "@admin:example.com" ];
relay.whitelist = [ "@.*:example.com" ];
}
'';
description = ''
{file}`config.yaml` configuration as a Nix attribute set.
Configuration options should match those described in
[
sample.config.yaml](https://github.com/matrix-discord/mx-puppet-discord/blob/master/sample.config.yaml).
'';
};
serviceDependencies = lib.mkOption {
type = with lib.types; listOf str;
default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = lib.literalExpression ''
lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = ''
List of Systemd services to require and wait for when starting the application service.
'';
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.mx-puppet-discord = {
description = "Matrix to Discord puppeting bridge";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
preStart = ''
# generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -r -c ${settingsFile} \
-f ${registrationFile}
fi
'';
serviceConfig = {
Type = "simple";
Restart = "always";
ProtectSystem = "strict";
ProtectHome = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true;
DynamicUser = true;
PrivateTmp = true;
WorkingDirectory = pkgs.mx-puppet-discord;
StateDirectory = baseNameOf dataDir;
UMask = "0027";
ExecStart = ''
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord \
-c ${settingsFile} \
-f ${registrationFile}
'';
};
};
};
meta.maintainers = with lib.maintainers; [ govanify ];
}
nixos/modules/services/monitoring/grafana.nix
+8
View File
@@ -430,6 +430,12 @@ in
type = types.path;
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = "Open the ports in the firewall for the server.";
};
settings = mkOption {
description = ''
Grafana settings. See <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/>
@@ -2078,6 +2084,8 @@ in
'';
};
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.server.http_port ];
users.users.grafana = {
uid = config.ids.uids.grafana;
description = "Grafana user";
nixos/modules/services/networking/kea.nix
+23 -17
View File
@@ -265,12 +265,24 @@ in
config =
let
commonEnvironment = {
KEA_CONTROL_SOCKET_DIR = "/run/kea";
KEA_LOCKFILE_DIR = "/run/kea";
KEA_PIDFILE_DIR = "/run/kea";
};
commonServiceConfig = {
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecReload = toString [
(lib.getExe' pkgs.coreutils "kill")
"-HUP"
"$MAINPID"
];
DynamicUser = true;
User = "kea";
ConfigurationDirectory = "kea";
Restart = "on-failure";
RuntimeDirectory = "kea";
RuntimeDirectoryMode = "0750";
RuntimeDirectoryPreserve = true;
StateDirectory = "kea";
UMask = "0077";
@@ -280,6 +292,12 @@ in
lib.mkMerge [
{
environment.systemPackages = [ package ];
users.users.kea = {
isSystemUser = true;
group = "kea";
};
users.groups.kea = { };
}
(lib.mkIf cfg.ctrl-agent.enable {
@@ -312,10 +330,7 @@ in
"kea-dhcp-ddns-server.service"
];
environment = {
KEA_PIDFILE_DIR = "/run/kea";
KEA_LOCKFILE_DIR = "/run/kea";
};
environment = commonEnvironment;
restartTriggers = [
ctrlAgentConfig
@@ -358,10 +373,7 @@ in
"multi-user.target"
];
environment = {
KEA_PIDFILE_DIR = "/run/kea";
KEA_LOCKFILE_DIR = "/run/kea";
};
environment = commonEnvironment;
restartTriggers = [
dhcp4Config
@@ -411,10 +423,7 @@ in
"multi-user.target"
];
environment = {
KEA_PIDFILE_DIR = "/run/kea";
KEA_LOCKFILE_DIR = "/run/kea";
};
environment = commonEnvironment;
restartTriggers = [
dhcp6Config
@@ -460,10 +469,7 @@ in
"multi-user.target"
];
environment = {
KEA_PIDFILE_DIR = "/run/kea";
KEA_LOCKFILE_DIR = "/run/kea";
};
environment = commonEnvironment;
restartTriggers = [
dhcpDdnsConfig
nixos/modules/services/networking/ssh/sshd.nix
+1
View File
@@ -766,6 +766,7 @@ in
restartTriggers = [ config.environment.etc."ssh/sshd_config".source ];
serviceConfig = {
Type = "notify-reload";
Restart = "always";
ExecStart = lib.concatStringsSep " " [
(lib.getExe' cfg.package "sshd")
nixos/modules/services/security/kanidm.nix
+1 -1
View File
@@ -548,7 +548,7 @@ in
description = "The redirect URL of the service. These need to exactly match the OAuth2 redirect target";
type =
let
originStrType = types.strMatching ".*://.*$";
originStrType = types.strMatching ".*://?.*$";
in
types.either originStrType (types.nonEmptyListOf originStrType);
example = "https://someservice.example.com/auth/login";
nixos/modules/services/video/frigate.nix
+2 -1
View File
@@ -632,7 +632,8 @@ in
serviceConfig = {
ExecStartPre = [
(pkgs.writeShellScript "frigate-clear-cache" ''
rm --recursive --force /var/cache/frigate/*
shopt -s extglob
rm --recursive --force /var/cache/frigate/!(model_cache)
'')
(pkgs.writeShellScript "frigate-create-writable-config" ''
cp --no-preserve=mode "${format.generate "frigate.yml" filteredConfig}" /run/frigate/frigate.yml
nixos/modules/services/web-apps/peertube-runner.nix
+256
View File
@@ -0,0 +1,256 @@
{
lib,
pkgs,
config,
...
}:
let
cfg = config.services.peertube-runner;
settingsFormat = pkgs.formats.toml { };
configFile = settingsFormat.generate "config.toml" cfg.settings;
env = {
NODE_ENV = "production";
XDG_CONFIG_HOME = "/var/lib/peertube-runner";
XDG_CACHE_HOME = "/var/cache/peertube-runner";
# peertube-runner makes its IPC socket in $XDG_DATA_HOME.
XDG_DATA_HOME = "/run/peertube-runner";
};
in
{
options.services.peertube-runner = {
enable = lib.mkEnableOption "peertube-runner";
package = lib.mkPackageOption pkgs [ "peertube" "runner" ] { };
user = lib.mkOption {
type = lib.types.str;
default = "prunner";
example = "peertube-runner";
description = "User account under which peertube-runner runs.";
};
group = lib.mkOption {
type = lib.types.str;
default = "prunner";
example = "peertube-runner";
description = "Group under which peertube-runner runs.";
};
settings = lib.mkOption {
type = settingsFormat.type;
default = { };
example = lib.literalExpression ''
{
jobs.concurrency = 4;
ffmpeg = {
threads = 0; # Let ffmpeg automatically choose.
nice = 5;
};
transcription.model = "large-v3";
}
'';
description = ''
Configuration for peertube-runner.
See available configuration options at https://docs.joinpeertube.org/maintain/tools#configuration.
'';
};
instancesToRegister = lib.mkOption {
type =
with lib.types;
attrsOf (submodule {
options = {
url = lib.mkOption {
type = lib.types.str;
example = "https://mypeertubeinstance.com";
description = "URL of the PeerTube instance.";
};
registrationTokenFile = lib.mkOption {
type = lib.types.path;
example = "/run/secrets/my-peertube-instance-registration-token";
description = ''
Path to a file containing a registration token for the PeerTube instance.
See how to generate registration tokens at https://docs.joinpeertube.org/admin/remote-runners#manage-remote-runners.
'';
};
runnerName = lib.mkOption {
type = lib.types.str;
example = "Transcription";
description = "Runner name declared to the PeerTube instance.";
};
runnerDescription = lib.mkOption {
type = with lib.types; nullOr str;
default = null;
example = "Runner for video transcription";
description = "Runner description declared to the PeerTube instance.";
};
};
});
default = { };
example = {
personal = {
url = "https://mypeertubeinstance.com";
registrationTokenFile = "/run/secrets/my-peertube-instance-registration-token";
runnerName = "Transcription";
runnerDescription = "Runner for video transcription";
};
};
description = "PeerTube instances to register this runner with.";
};
enabledJobTypes = lib.mkOption {
type = with lib.types; nonEmptyListOf str;
default = [
"vod-web-video-transcoding"
"vod-hls-transcoding"
"vod-audio-merge-transcoding"
"live-rtmp-hls-transcoding"
"video-studio-transcoding"
"video-transcription"
];
example = [ "video-transcription" ];
description = "Job types that this runner will execute.";
};
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = !(cfg.settings ? registeredInstances);
message = ''
`services.peertube-runner.settings.registeredInstances` cannot be used.
Instead, registered instances can be configured with `services.peertube-runner.instancesToRegister`.
'';
}
];
warnings = lib.optional (cfg.instancesToRegister == { }) ''
`services.peertube-runner.instancesToRegister` is empty.
Instances cannot be manually registered using the command line.
'';
services.peertube-runner.settings = {
transcription = lib.mkIf (lib.elem "video-transcription" cfg.enabledJobTypes) {
engine = lib.mkDefault "whisper-ctranslate2";
enginePath = lib.mkDefault (lib.getExe pkgs.whisper-ctranslate2);
};
};
environment.systemPackages = [
(pkgs.writeShellScriptBin "peertube-runner" ''
${lib.concatMapAttrsStringSep "\n" (name: value: ''export ${name}="${toString value}"'') env}
if [[ "$USER" == ${cfg.user} ]]; then
exec ${lib.getExe' cfg.package "peertube-runner"} "$@"
else
echo "This has to be run with the \`${cfg.user}\` user. Ex: \`sudo -u ${cfg.user} peertube-runner\`"
fi
'')
];
systemd.services.peertube-runner = {
description = "peertube-runner daemon";
after = [
"network.target"
(lib.mkIf config.services.peertube.enable "peertube.service")
];
wantedBy = [ "multi-user.target" ];
environment = env;
path = [ pkgs.ffmpeg-headless ];
script = ''
config_dir=$XDG_CONFIG_HOME/peertube-runner-nodejs/default
mkdir -p $config_dir
config_file=$config_dir/config.toml
cp -f --no-preserve=mode,ownership ${configFile} $config_file
${lib.optionalString ((lib.length (lib.attrNames cfg.instancesToRegister)) > 0) ''
# Temp config directory for registration commands
temp_dir=$(mktemp --directory)
temp_config_dir=$temp_dir/peertube-runner-nodejs/default
mkdir -p $temp_config_dir
temp_config_file=$temp_config_dir/config.toml
mkdir -p $STATE_DIRECTORY/runner_tokens
${lib.concatMapAttrsStringSep "\n" (instanceName: instance: ''
runner_token_file=$STATE_DIRECTORY/runner_tokens/${instanceName}
# Register any currenctly unregistered instances.
if [ ! -f $runner_token_file ] || [[ $(cat $runner_token_file) != ptrt-* ]]; then
# Server has to be running for registration.
XDG_CONFIG_HOME=$temp_dir ${lib.getExe' cfg.package "peertube-runner"} server &
XDG_CONFIG_HOME=$temp_dir ${lib.getExe' cfg.package "peertube-runner"} register \
--url ${lib.escapeShellArg instance.url} \
--registration-token "$(cat ${instance.registrationTokenFile})" \
--runner-name ${lib.escapeShellArg instance.runnerName} \
${lib.optionalString (
instance.runnerDescription != null
) ''--runner-description ${lib.escapeShellArg instance.runnerDescription}''}
# Kill the server
kill $!
${lib.getExe pkgs.yq-go} -e ".registeredInstances[0].runnerToken" \
$temp_config_file > $runner_token_file
rm $temp_config_file
fi
echo "
[[registeredInstances]]
url = \"${instance.url}\"
runnerToken = \"$(cat $runner_token_file)\"
runnerName = \"${instance.runnerName}\"
${lib.optionalString (
instance.runnerDescription != null
) ''runnerDescription = \"${instance.runnerDescription}\"''}
" >> $config_file
'') cfg.instancesToRegister}
''}
# Don't allow changes that won't persist.
chmod 440 $config_file
systemd-notify --ready
exec ${lib.getExe' cfg.package "peertube-runner"} server ${
lib.concatMapStringsSep " " (jobType: "--enable-job ${jobType}") cfg.enabledJobTypes
}
'';
serviceConfig = {
Type = "notify";
NotifyAccess = "all"; # for systemd-notify
Restart = "always";
RestartSec = 5;
SyslogIdentifier = "prunner";
User = cfg.user;
Group = cfg.group;
StateDirectory = "peertube-runner";
StateDirectoryMode = "0700";
CacheDirectory = "peertube-runner";
CacheDirectoryMode = "0700";
RuntimeDirectory = "peertube-runner";
RuntimeDirectoryMode = "0700";
ProtectSystem = "full";
NoNewPrivileges = true;
ProtectHome = true;
CapabilityBoundingSet = "~CAP_SYS_ADMIN";
};
};
users.users = lib.mkIf (cfg.user == "prunner") {
${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
};
users.groups = lib.mkIf (cfg.group == "prunner") {
${cfg.group} = { };
};
};
meta.maintainers = lib.teams.ngi.members;
}
nixos/tests/web-apps/peertube.nix
+73 -14
View File
@@ -1,8 +1,15 @@
import ../make-test-python.nix (
{ pkgs, ... }:
{ lib, pkgs, ... }:
let
domain = "peertube.local";
port = 9000;
url = "http://${domain}:${toString port}";
password = "zw4SqYVdcsXUfRX8aaFX";
registrationTokenFile = "/etc/peertube-runner-registration-token";
in
{
name = "peertube";
meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
meta.maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.ngi.members;
nodes = {
database = {
@@ -53,7 +60,7 @@ import ../make-test-python.nix (
environment = {
etc = {
"peertube/password-init-root".text = ''
PT_INITIAL_ROOT_PASSWORD=zw4SqYVdcsXUfRX8aaFX
PT_INITIAL_ROOT_PASSWORD=${password}
'';
"peertube/secrets-peertube".text = ''
063d9c60d519597acef26003d5ecc32729083965d09181ef3949200cbe5f09ee
@@ -77,14 +84,14 @@ import ../make-test-python.nix (
];
};
extraHosts = ''
192.168.2.11 peertube.local
192.168.2.11 ${domain}
'';
firewall.allowedTCPPorts = [ 9000 ];
firewall.allowedTCPPorts = [ port ];
};
services.peertube = {
enable = true;
localDomain = "peertube.local";
localDomain = domain;
enableWebHttps = false;
serviceEnvironmentFile = "/etc/peertube/password-init-root";
@@ -132,9 +139,28 @@ import ../make-test-python.nix (
];
};
extraHosts = ''
192.168.2.11 peertube.local
192.168.2.11 ${domain}
'';
};
services.peertube-runner = {
enable = true;
# Don't pull in unneeded dependencies.
enabledJobTypes = [ "video-studio-transcoding" ];
instancesToRegister = {
testServer1 = {
inherit url registrationTokenFile;
runnerName = "I'm a test!!!";
};
testServer2 = {
inherit url registrationTokenFile;
runnerName = "I'm also a test...";
runnerDescription = "Even more testing?!?!";
};
};
};
# Will be manually started in test script.
systemd.services.peertube-runner.wantedBy = lib.mkForce [ ];
};
};
@@ -149,16 +175,49 @@ import ../make-test-python.nix (
database.wait_for_open_port(31638)
server.wait_for_unit("peertube.service")
server.wait_for_open_port(9000)
server.wait_for_open_port(${toString port})
# Check if PeerTube is running
client.succeed("curl --fail http://peertube.local:9000/api/v1/config/about | jq -r '.instance.name' | grep 'PeerTube\ Test\ Server'")
client.succeed("curl --fail ${url}/api/v1/config/about | jq -r '.instance.name' | grep 'PeerTube Test Server'")
# Check PeerTube CLI version
client.succeed('peertube-cli auth add -u "http://peertube.local:9000" -U "root" --password "zw4SqYVdcsXUfRX8aaFX"')
client.succeed('peertube-cli auth list | grep "http://peertube.local:9000"')
client.succeed('peertube-cli auth del "http://peertube.local:9000"')
client.fail('peertube-cli auth list | grep "http://peertube.local:9000"')
# PeerTube CLI
client.succeed('peertube-cli auth add -u "${url}" -U "root" --password "${password}"')
client.succeed('peertube-cli auth list | grep "${url}"')
client.succeed('peertube-cli auth del "${url}"')
client.fail('peertube-cli auth list | grep "${url}"')
# peertube-runner
access_token = client.succeed(
'peertube-cli get-access-token --url "${url}" --username "root" --password "${password}"'
).strip()
# Generate registration token.
client.succeed(f"curl --fail -X POST -H 'Authorization: Bearer {access_token}' ${url}/api/v1/runners/registration-tokens/generate")
# Get registration token, and put it where `registrationTokenFile` from the
# peertube-runner module points to.
client.succeed(
f"curl --fail -H 'Authorization: Bearer {access_token}' ${url}/api/v1/runners/registration-tokens" \
" | jq --raw-output '.data[0].registrationToken'" \
" > ${registrationTokenFile}"
)
client.systemctl("start peertube-runner.service")
client.wait_for_unit("peertube-runner.service")
runner_command = "sudo -u prunner peertube-runner"
client.succeed(f'{runner_command} list-registered | grep "I\'m a test!!!"')
client.succeed(f'{runner_command} list-registered | grep "I\'m also a test..."')
client.succeed(f'{runner_command} list-registered | grep "Even more testing?!?!"')
# Service should still work once instances are already registered.
client.systemctl("restart peertube-runner.service")
client.wait_for_unit("peertube-runner.service")
# Cleanup
client.shutdown()
server.shutdown()
pkgs/applications/editors/jetbrains/default.nix
+1 -3
View File
@@ -430,8 +430,6 @@ rec {
];
};
plugins = callPackage ./plugins { } // {
__attrsFailEvaluation = true;
};
plugins = callPackage ./plugins { };
}
pkgs/applications/editors/vim/plugins/generated.nix
+546 -547
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+4 -3
View File
@@ -8,19 +8,19 @@
gitMinimal,
}:
let
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
tag = "v${version}";
hash = "sha256-iWM+/lq4HG4Cm+f8JkLee34hnC9119znBOFDXC1Fow0=";
hash = "sha256-IHRYgKcYP+JDGu8Vtawgzlhq25vpROFqb8KmpfVMwCk=";
};
blink-fuzzy-lib = rustPlatform.buildRustPackage {
inherit version src;
pname = "blink-fuzzy-lib";
useFetchCargoVendor = true;
cargoHash = "sha256-pWBOPMUy/gXeujaowlp2I6kqD+Q95h+f9mXl231DN88=";
cargoHash = "sha256-QsVCugYWRri4qu64wHnbJQZBhy4tQrr+gCYbXtRBlqE=";
nativeBuildInputs = [ gitMinimal ];
@@ -58,6 +58,7 @@ vimUtils.buildVimPlugin {
maintainers = with lib.maintainers; [
balssh
redxtech
llakala
];
};
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+138 -116
View File
@@ -43,12 +43,12 @@
};
angular = buildGrammar {
language = "angular";
version = "0.0.0+rev=93bb92f";
version = "0.0.0+rev=d1f24a8";
src = fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "93bb92f1289b7fe765da6cc747c82ccdc0afeb8d";
hash = "sha256-s6RLY8vGNbA3VHyaRbhE/cbe1T1llhaiZNTiYXkBCQc=";
rev = "d1f24a8890462cb740909ff62a3a079cded288bc";
hash = "sha256-vC4v3uuUdHVUcm33egg3pWIqWSCwCkw5LTyD3ouMdiQ=";
};
meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
};
@@ -66,12 +66,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=017696b";
version = "0.0.0+rev=1b1fd5d";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-arduino";
rev = "017696bdf47ca2b10948c5a511f9ab387722d0f3";
hash = "sha256-zIs3ujkxfgCj6VBkNy/mobsAQ2mcxtjDMHxiQEMlWm8=";
rev = "1b1fd5dbd196e80342cf79f6fc5de154232c2829";
hash = "sha256-M+X2ofdy3wPUcDELNpjAFLywUG4rTsONQwZp63uYWfE=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
};
@@ -143,12 +143,12 @@
};
beancount = buildGrammar {
language = "beancount";
version = "0.0.0+rev=9bc460a";
version = "0.0.0+rev=b7a2557";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "9bc460a05b5f096d69568b5fb36105032ff4ff97";
hash = "sha256-MSLM7Or1SZeqj0WzJ26o5cmYa5vWcSbMhDzMkqWRJgE=";
rev = "b7a2557e6c8cf1dc70a52cece1861522ad3903fc";
hash = "sha256-E8FPmskJr1OQ55w52FUi9zub7BTZ6neX3VHypjEyRek=";
};
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
};
@@ -220,12 +220,12 @@
};
brightscript = buildGrammar {
language = "brightscript";
version = "0.0.0+rev=48ce168";
version = "0.0.0+rev=5516826";
src = fetchFromGitHub {
owner = "ajdelcimmuto";
repo = "tree-sitter-brightscript";
rev = "48ce1687125c6dfefcc7a1bef19fa0f0f00426cc";
hash = "sha256-eVHAl8qykIS90SpWHvpT6VEqjKuXCX8zIYlRGlhUm7w=";
rev = "55168264ea174085d2e91377a33f216190df2f51";
hash = "sha256-bZ8zhjfnF47ur2XNEYiGiATqDKAEnONusY/it9jmBBY=";
};
meta.homepage = "https://github.com/ajdelcimmuto/tree-sitter-brightscript";
};
@@ -396,12 +396,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=2871652";
version = "0.0.0+rev=5cb9b69";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "2871652b9893ab19e621628da03e670227a5d9d0";
hash = "sha256-ZeO+Jjw1/UnLLVvdOpwWVWZtVI910gtMCPK5Kh8dM1U=";
rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609";
hash = "sha256-s9/n09EruafAMF3g6xOkfu6L+WXUx83PpcVKn1Tnmg8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@@ -619,12 +619,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=9281e7d";
version = "0.0.0+rev=8ed3658";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "9281e7d8522cc0d06b61f97920e27936fa12be11";
hash = "sha256-HUIJQEWenilzGfxFAekqd6A9SXzU4Fe28gdwCme3X8A=";
rev = "8ed36589b5d0b3ebfdba45e1fd0ebefa01aafaea";
hash = "sha256-qNbkfeQ1MVDXsAW7xomUZ+BIqeuNvWZnhSg/e+3gWLM=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -707,12 +707,12 @@
};
enforce = buildGrammar {
language = "enforce";
version = "0.0.0+rev=8e4c841";
version = "0.0.0+rev=a194046";
src = fetchFromGitHub {
owner = "simonvic";
repo = "tree-sitter-enforce";
rev = "8e4c84144153deaf2b8461def43126cea6790020";
hash = "sha256-63zruBKP7aeyJ6SOTMaic/7xXibxuiETdPVqhj1UlfI=";
rev = "a194046e64bdec2c9e2e1a7caa35326387f78b95";
hash = "sha256-5G60pe/nf+7LZeiyyqc+LA955l7sW/Du/piwABxzSFk=";
};
meta.homepage = "https://github.com/simonvic/tree-sitter-enforce";
};
@@ -751,12 +751,12 @@
};
fennel = buildGrammar {
language = "fennel";
version = "0.0.0+rev=de06b9a";
version = "0.0.0+rev=cf7c000";
src = fetchFromGitHub {
owner = "alexmozaidze";
repo = "tree-sitter-fennel";
rev = "de06b9ad366f0186080056109a8c3be980129538";
hash = "sha256-DLwCJcF+zrBX/cZ8rYU97FpMgZlpVsfqLv1bFdwTj3c=";
rev = "cf7c000d934f2ff0a282a2c276b1f72e7fb2a099";
hash = "sha256-HlkgDX+MLlQq7TWRSFHxYR7LuaUtIjWqi25k+0J7XYQ=";
};
meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel";
};
@@ -972,12 +972,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=21e0e7b";
version = "0.0.0+rev=dae1551";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "21e0e7ba6f4f60ee80934cb368aa13c00d370734";
hash = "sha256-NJBD/IeJ8V2tuJHuUGwAinldubrRgLlA+4MUD7zyjzA=";
rev = "dae1551a9911b24f41d876c23f2ab05ece0a9d4c";
hash = "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -1093,12 +1093,12 @@
};
gosum = buildGrammar {
language = "gosum";
version = "0.0.0+rev=e2ac513";
version = "0.0.0+rev=27816eb";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-go-sum";
rev = "e2ac513b2240c7ff1069ae33b2df29ce90777c11";
hash = "sha256-2foA2sd5PQpmeX8OhXrW/dxoJaEyxDXzPWh+UD0dgzQ=";
rev = "27816eb6b7315746ae9fcf711e4e1396dc1cf237";
hash = "sha256-9tPFT0ad68YVmz/R6ia1bQE5AQRBX9ZoPW4inCZIBo4=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-go-sum";
};
@@ -1126,12 +1126,12 @@
};
gpg = buildGrammar {
language = "gpg";
version = "0.0.0+rev=63e80cf";
version = "0.0.0+rev=50482a3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-gpg-config";
rev = "63e80cfe1302da9f9c7ee8d9df295f47d7d181bf";
hash = "sha256-W8BglyjX/OytZCACpVi9V/k7A0Q4JaVQV+9NcyqtFsc=";
rev = "50482a322cf1fa00dfe327ef8b00e4607eeeaa1d";
hash = "sha256-LHoFNQP3L1yozgOi0YOnOTmbXBc3H1hXsOB7sFDvSDg=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gpg-config";
};
@@ -1168,6 +1168,17 @@
};
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
};
groq = buildGrammar {
language = "groq";
version = "0.0.0+rev=1fa1ab0";
src = fetchFromGitHub {
owner = "ajrussellaudio";
repo = "tree-sitter-groq";
rev = "1fa1ab0eb391a270957e8ad8c731b492e3645649";
hash = "sha256-pKwDiViRuFB+BPfWfOOc/VDPN3qFt9HqMCuLGGSMiOU=";
};
meta.homepage = "https://github.com/ajrussellaudio/tree-sitter-groq";
};
gstlaunch = buildGrammar {
language = "gstlaunch";
version = "0.0.0+rev=549aef2";
@@ -1369,12 +1380,12 @@
};
idl = buildGrammar {
language = "idl";
version = "0.0.0+rev=da50751";
version = "0.0.0+rev=fb1bd48";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-idl";
rev = "da50751d826030fcf8b1424de9f56cec2a274b38";
hash = "sha256-5FAppUTuPNNrRuLdS4zZMh4xeYDT/JOsQS53u/0nT/0=";
rev = "fb1bd480b84a5b75a0c7a44a8fed45c4fe2d9247";
hash = "sha256-XIPIz4awyRwjldb9K6hb08SNN4f+1GPaKT3I/kWuMSA=";
};
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
};
@@ -1446,12 +1457,12 @@
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=e3420bd";
version = "0.0.0+rev=de50fbe";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "e3420bd8b3e6fa996348c4bbcf627b812a8c1422";
hash = "sha256-9c6P3Wt6g14f3egr0pG2FMPj9C/d58Fza0Ga4H8mZIU=";
rev = "de50fbed2cc4c83e5fa2ec2d4231496e06d55e32";
hash = "sha256-NFbeqiK1fii/cR5ySOz6bIHCPFL2oJ+yUFGZVdfCiAg=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
@@ -1468,24 +1479,24 @@
};
jinja = buildGrammar {
language = "jinja";
version = "0.0.0+rev=2511019";
version = "0.0.0+rev=129184f";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "251101981d86ccb2901741eddf3e7cf21567a66d";
hash = "sha256-JbutCmJFKmB1UKIGkEJdiBJOaFmIeea8jK9nhYMkikY=";
rev = "129184fb7bbc2d3e29967002432a869ac3758f2e";
hash = "sha256-+9aVQFi9V4RJtbkL0F48/L+l+myWqE5kM5G5EwHB9G8=";
};
location = "tree-sitter-jinja";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
};
jinja_inline = buildGrammar {
language = "jinja_inline";
version = "0.0.0+rev=2511019";
version = "0.0.0+rev=129184f";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "251101981d86ccb2901741eddf3e7cf21567a66d";
hash = "sha256-JbutCmJFKmB1UKIGkEJdiBJOaFmIeea8jK9nhYMkikY=";
rev = "129184fb7bbc2d3e29967002432a869ac3758f2e";
hash = "sha256-+9aVQFi9V4RJtbkL0F48/L+l+myWqE5kM5G5EwHB9G8=";
};
location = "tree-sitter-jinja_inline";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
@@ -1624,12 +1635,12 @@
};
koto = buildGrammar {
language = "koto";
version = "0.0.0+rev=620ff8a";
version = "0.0.0+rev=2ffc77c";
src = fetchFromGitHub {
owner = "koto-lang";
repo = "tree-sitter-koto";
rev = "620ff8a32143f24f6f8e157bd1836183599d334d";
hash = "sha256-IT9ZgZr2VViD9PyyqZTEmkgLHDD17aYMPx+IznagNAQ=";
rev = "2ffc77c14f0ac1674384ff629bfc207b9c57ed89";
hash = "sha256-uummfcFCsLP73h1ioxNDXQYTVZfZt0RjYCRUJF4cuuI=";
};
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
};
@@ -1713,23 +1724,23 @@
};
liquidsoap = buildGrammar {
language = "liquidsoap";
version = "0.0.0+rev=05a5dbb";
version = "0.0.0+rev=4de01f4";
src = fetchFromGitHub {
owner = "savonet";
repo = "tree-sitter-liquidsoap";
rev = "05a5dbb23addd207a295b904e44dbdd321b3b332";
hash = "sha256-8aKDOe77/nLLkhubCoXr4MMvJr/uhR7T6dk7TpMxTOA=";
rev = "4de01f44de2c051c33832ce523cf44690561320d";
hash = "sha256-ibDpFPqdz0WnRaKN0dP1uAPi9W9EWew+kDybuPz1Bow=";
};
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
};
llvm = buildGrammar {
language = "llvm";
version = "0.0.0+rev=badf46d";
version = "0.0.0+rev=00c5389";
src = fetchFromGitHub {
owner = "benwilliamgraham";
repo = "tree-sitter-llvm";
rev = "badf46daedc7b469f5e849b53f2fb34e881962f1";
hash = "sha256-0rnumtLMKM1g2wcevIowCaawms2ghOQIR96cpRIe5Uc=";
rev = "00c5389a4598e1dce66fbc3b3d34733d308f2751";
hash = "sha256-nRV1DM/UHlVg5bsTeAhwUPX+2DV1sQiusEkC3ncV1xk=";
};
meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
};
@@ -1825,12 +1836,12 @@
};
matlab = buildGrammar {
language = "matlab";
version = "0.0.0+rev=d5fd97c";
version = "0.0.0+rev=dfed7b4";
src = fetchFromGitHub {
owner = "acristoffers";
repo = "tree-sitter-matlab";
rev = "d5fd97c7aec0881d3429642a240ad536c74582b9";
hash = "sha256-5SblRAJXzJSEXxiUFnM9vNiJV18sT5dt/NrOHPAix1c=";
rev = "dfed7b4bc548f2c036837c3e7e09cae7d1835289";
hash = "sha256-gKpfNxJXv7KKXbk++Vf9nETwOvmD9Vqd5YAPbh1Wuas=";
};
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
};
@@ -1869,12 +1880,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=78eb123";
version = "0.0.0+rev=e2818d6";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "78eb123cab8bb0dfaacb6b1ee617ef3fcc29d8b1";
hash = "sha256-H7tMlGt3xB14n2mDksU2K9uh65ioYM1/TU/ce3kNWv0=";
rev = "e2818d616fc43cbbba316723cbd68a53c66a2704";
hash = "sha256-59h3UAk3uWuiMptT+aU8vABn9iVz6ZNscMfy/pwjZ78=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1958,14 +1969,14 @@
};
nix = buildGrammar {
language = "nix";
version = "0.0.0+rev=cfc53fd";
version = "0.0.0+rev=ea1d87f";
src = fetchFromGitHub {
owner = "cstrahan";
owner = "nix-community";
repo = "tree-sitter-nix";
rev = "cfc53fd287d23ab7281440a8526c73542984669b";
hash = "sha256-eqqneqZqA73McjPZfy7GbUi4ccmDYC5O++Ezt9+lqi4=";
rev = "ea1d87f7996be1329ef6555dcacfa63a69bd55c6";
hash = "sha256-VNOPzeyhh/0jHzK0bwEX1kwSIUGoSlCXGhgjHbYvWKk=";
};
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
meta.homepage = "https://github.com/nix-community/tree-sitter-nix";
};
nqc = buildGrammar {
language = "nqc";
@@ -1980,12 +1991,12 @@
};
nu = buildGrammar {
language = "nu";
version = "0.0.0+rev=6810930";
version = "0.0.0+rev=6544c43";
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "6810930d133af12aed8fe4557935b635934ab61a";
hash = "sha256-5LcREDBKFGiFSuziEYQ9RKnHkwR/qKijmW5dSrrxGhA=";
rev = "6544c4383643cf8608d50def2247a7af8314e148";
hash = "sha256-+KsRkfx0WmcfYBP7zxXqL8kPm/HsBjuI56/v910kMFU=";
};
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
};
@@ -2082,12 +2093,12 @@
};
pem = buildGrammar {
language = "pem";
version = "0.0.0+rev=1d16b8e";
version = "0.0.0+rev=7374eab";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-pem";
rev = "1d16b8e063fdf4385e389096c4bc4999eaaef05f";
hash = "sha256-NhiSqaLjzEJHj8JimFdcZBVAR00lKf9O5JLtwIUCKhw=";
rev = "7374eab76f2caae02396721850f87af437b66c06";
hash = "sha256-goD7j8UmWgBBiOMaJ9E1tiwB4CSBoiUo6wKakEerGDI=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pem";
};
@@ -2148,6 +2159,17 @@
};
meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
};
pkl = buildGrammar {
language = "pkl";
version = "0.0.0+rev=4fc94a1";
src = fetchFromGitHub {
owner = "apple";
repo = "tree-sitter-pkl";
rev = "4fc94a102c25ea383d70397dac7e677ca3731f1e";
hash = "sha256-imA4+NuJ3XmVA8qfa7pkrQGBsbrNCgLNSuIFh0DsqmY=";
};
meta.homepage = "https://github.com/apple/tree-sitter-pkl";
};
po = buildGrammar {
language = "po";
version = "0.0.0+rev=bd860a0";
@@ -2205,12 +2227,12 @@
};
printf = buildGrammar {
language = "printf";
version = "0.0.0+rev=df6b699";
version = "0.0.0+rev=ec4e567";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-printf";
rev = "df6b69967db7d74ab338a86a9ab45c0966c5ee3c";
hash = "sha256-54yEvxL6u+Mya4INj1AIb1ldYv1WdQV55z8+wgKdthc=";
rev = "ec4e5674573d5554fccb87a887c97d4aec489da7";
hash = "sha256-JddrO4H7b3f/jrYag1lTAqeCzspf18SiIsVV2EJ25ZY=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-printf";
};
@@ -2262,12 +2284,12 @@
};
properties = buildGrammar {
language = "properties";
version = "0.0.0+rev=579b62f";
version = "0.0.0+rev=6310671";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-properties";
rev = "579b62f5ad8d96c2bb331f07d1408c92767531d9";
hash = "sha256-4WgGbU6fthFH1DcvlQiqNGXucCfxA+hANZ7Y+r8eXHg=";
rev = "6310671b24d4e04b803577b1c675d765cbd5773b";
hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
};
@@ -2340,12 +2362,12 @@
};
pymanifest = buildGrammar {
language = "pymanifest";
version = "0.0.0+rev=be06258";
version = "0.0.0+rev=debbdb8";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-pymanifest";
rev = "be062582956165019d3253794b4d712f66dfeaaa";
hash = "sha256-Kud/E67Sh9F4nc8nzW5UXFHW5+kGftLyFzwLOKLcpL8=";
rev = "debbdb83fe6356adc7261c41c69b45ba49c97294";
hash = "sha256-jaWi0F9ApUSwniN3O7x05VrCceL+0x2+98iJx9+PaZo=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pymanifest";
};
@@ -2716,12 +2738,12 @@
};
slint = buildGrammar {
language = "slint";
version = "0.0.0+rev=03f24aa";
version = "0.0.0+rev=96bc969";
src = fetchFromGitHub {
owner = "slint-ui";
repo = "tree-sitter-slint";
rev = "03f24aa22d6712f79004286df6dd416ca6d2a91d";
hash = "sha256-cMiC5wTKXIxMBbIVChfisM8FTsYL11kQ6fpryDjFlIs=";
rev = "96bc969d20ff347030519184ea2467f4046a524d";
hash = "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=";
};
meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
};
@@ -2894,12 +2916,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=0b9bd0e";
version = "0.0.0+rev=a67317f";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "0b9bd0e8fd6284c0cfca85f7997535fe7f051046";
hash = "sha256-LydAGMEcUhT87SvD5WtmMMHtQG+x6dVoWmHJnat3jzw=";
rev = "a67317fb81afe76cc04e6d92124cfc20a903cee7";
hash = "sha256-Timo86R0nIktTThut1AlNzawnb5r3rddxY1VObdVSVE=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2973,23 +2995,23 @@
};
systemverilog = buildGrammar {
language = "systemverilog";
version = "0.0.0+rev=0dc5d86";
version = "0.0.0+rev=140a6d9";
src = fetchFromGitHub {
owner = "gmlarumbe";
repo = "tree-sitter-systemverilog";
rev = "0dc5d86af86120094d9f1268613b529142212ddd";
hash = "sha256-tFj6khM98KQ8022S/YA6i4hDYrAbsEBuKF7M3mjfcGg=";
rev = "140a6d96aa753f550d01c0d6c95dbf7c0cfae3fb";
hash = "sha256-YR5drmlt7+6D9jc6k0xIC04Y8ap3X51+AA6RIEfYIZw=";
};
meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=412cf98";
version = "0.0.0+rev=335e553";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "412cf98b2784dfe9c95ce0d7de840605c6953417";
hash = "sha256-BzKKBZyg/ezg2AauxNbvPP4LGtoeyKQdRbHRDldLDWc=";
rev = "335e5533de72a4ac8c6763958df1befbdc855a30";
hash = "sha256-6GO3B5Llr/89bQs9Vv7JA5xo7Gbw72PHqlxZonx8MU0=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";
};
@@ -3051,12 +3073,12 @@
};
tera = buildGrammar {
language = "tera";
version = "0.0.0+rev=53ca910";
version = "0.0.0+rev=692937d";
src = fetchFromGitHub {
owner = "uncenter";
repo = "tree-sitter-tera";
rev = "53ca9100f231b72474225d98c9e53d1a4275046d";
hash = "sha256-9D/isIoLE4Fis3ry2zbj7OvceMvNDXVd6pw0pn12hJI=";
rev = "692937d52c8dfd91ce0dde722b9b4febbc9bc712";
hash = "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=";
};
meta.homepage = "https://github.com/uncenter/tree-sitter-tera";
};
@@ -3186,12 +3208,12 @@
};
twig = buildGrammar {
language = "twig";
version = "0.0.0+rev=085648e";
version = "0.0.0+rev=7195ee5";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-twig";
rev = "085648e01d1422163a1702a44e72303b4e2a0bd1";
hash = "sha256-87jFYAAnblTeEdlXqTjyiiNee/OgasPam1b2xyKQIHY=";
rev = "7195ee573ab5c3b3bb0e91b042e6f83ac1b11104";
hash = "sha256-wQ5pHFU35wqT3UxHIZ/cP8RPPX+mpGQCoBr9ilRfc4w=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
};
@@ -3242,12 +3264,12 @@
};
udev = buildGrammar {
language = "udev";
version = "0.0.0+rev=18a1d18";
version = "0.0.0+rev=2fcb563";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-udev";
rev = "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc";
hash = "sha256-ySo+vS+il1tmTPZ6OJMduyJxsjjI3eIkYSMYs10Bcnk=";
rev = "2fcb563a4d56a6b8e8c129252325fc6335e4acbf";
hash = "sha256-EZwYyhMOPlQoeIRCbHOIfMaO5WEK6eKIVeC1NQgm+is=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-udev";
};
@@ -3332,12 +3354,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=eacafa5";
version = "0.0.0+rev=73ff9d3";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "eacafa5d612fdea1d12332fe0f83e089e5571cf3";
hash = "sha256-vASRBGtcsqH8LqmSh/UVTsyr6ndpVQQhLn1tnIQxTAw=";
rev = "73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7";
hash = "sha256-8Fp/x3TC+bq4nJdbeVdBrnz7QnBSD1sc5CC0TRh0mGc=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3354,12 +3376,12 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=a93e834";
version = "0.0.0+rev=3dd4747";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-vim";
rev = "a93e834bea0975ec0ccb3f6d18540e9bd8170a4d";
hash = "sha256-LMQhbSScd9uFRmVun/c3hatmbDgXurDmRfMNgSQu7xI=";
rev = "3dd4747082d1b717b8978211c06ef7b6cd16125b";
hash = "sha256-HOf35dd+zcpXHxFuWjJ6ju/5UZzALe0fUPPuAWXUIHM=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim";
};
@@ -3442,12 +3464,12 @@
};
xcompose = buildGrammar {
language = "xcompose";
version = "0.0.0+rev=fff3e72";
version = "0.0.0+rev=a51d636";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xcompose";
rev = "fff3e72242aa110ebba6441946ea4d12d200fa68";
hash = "sha256-PNg1z+7CuvpQdksKJOCQ59dZrv4PORdYo6CSw3GrBtk=";
rev = "a51d6366f041dbefec4da39a7eb3168a9b1cbc0e";
hash = "sha256-3V+elXkVBk2aZnDy5Q/MDpBWEWb/mvjh2t2pnjnzgA0=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xcompose";
};
@@ -3465,12 +3487,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=db9bf1a";
version = "0.0.0+rev=b0822f2";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "db9bf1aeca3e54dd390ae1d3994c665ca7ef5fa2";
hash = "sha256-tp14NEo4KhiBTIgGGVNxhlwXuspi0bH9EaRzj9xfG2s=";
rev = "b0822f2ea47600c6e11ee64b2dec8353c9684e8d";
hash = "sha256-fO0MtUEg3he+DbJcdZQpkdvRcBOmiHw5d+4Cn5E5erA=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -3531,12 +3553,12 @@
};
ziggy = buildGrammar {
language = "ziggy";
version = "0.0.0+rev=eeb21ac";
version = "0.0.0+rev=de70337";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "eeb21acc0a369dca503167fe963f4f5a7eda2659";
hash = "sha256-5gW1hpJcnayA6veLWCiksGpfZBZX3UsQmYC4XlZRaEo=";
rev = "de703372b2da6fd2c25a8a3c424663ff6bece4ac";
hash = "sha256-O4IV9V+Xn1DL/gZ7UoAKZTtlv/QToRsmJizQwQZZRqc=";
};
location = "tree-sitter-ziggy";
meta.homepage = "https://github.com/kristoff-it/ziggy";
pkgs/applications/editors/vim/plugins/overrides.nix
+19 -3
View File
@@ -2823,6 +2823,13 @@ in
otter-nvim = super.otter-nvim.overrideAttrs {
dependencies = [ self.nvim-lspconfig ];
nvimSkipModules = [
# requires config setup
"otter.keeper"
"otter.lsp.handlers"
"otter.lsp.init"
"otter.diagnostics"
];
};
outline-nvim = super.outline-nvim.overrideAttrs {
@@ -2949,6 +2956,15 @@ in
];
};
python-mode = super.python-mode.overrideAttrs {
postPatch = ''
# NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/
# https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360
rm -f pymode/libs/pytoolconfig
ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig
'';
};
pywal-nvim = super.pywal-nvim.overrideAttrs {
# Optional feline integration
nvimSkipModules = "pywal.feline";
@@ -2977,9 +2993,9 @@ in
nvim-lspconfig
otter-nvim
];
};
quicker-nvim = super.quicker-nvim.overrideAttrs {
nvimSkipModules = [
"quarto.runner.init"
];
};
range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
pkgs/applications/editors/vscode/extensions/default.nix
+4 -4
View File
@@ -4288,8 +4288,8 @@ let
mktplcRef = {
publisher = "shopify";
name = "ruby-lsp";
version = "0.9.29";
hash = "sha256-jxgEB8juWRZmBAmmBBDHu3sOKylsqSuSrnWsfOYPBmI=";
version = "0.9.30";
hash = "sha256-3V6So2ulRTk1Ityd4ajzx/Vd+qzvqZMzUyTFMgWNztA=";
};
meta = {
description = "VS Code plugin for connecting with the Ruby LSP";
@@ -4576,8 +4576,8 @@ let
mktplcRef = {
name = "svelte-vscode";
publisher = "svelte";
version = "109.9.0";
hash = "sha256-OgcFFYoJOtFVlOM12gYBG0AkliniawG6GdRtrFsjDIg=";
version = "109.10.0";
hash = "sha256-Rpzcf0ioM7faDWG1xcEuz6GNzU1lHZsGxGgaKwC8SKk=";
};
meta = {
changelog = "https://github.com/sveltejs/language-tools/releases";
pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-dev";
publisher = "saoudrizwan";
version = "3.19.5";
hash = "sha256-XosGlr1DanF0Z6Tt39Qud3VxJXEL4lez8eGcBPckuls=";
version = "3.20.1";
hash = "sha256-2IX6EdzNpJapgVSwQ9hyby7CdURI5uaQJpGh4pcEuaQ=";
};
meta = {
pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "code-spell-checker-german";
publisher = "streetsidesoftware";
version = "2.3.3";
hash = "sha256-sEdr8SQDFWgCq77flvbReILgWtT/ao8cJjrgC7RKO80=";
version = "2.3.4";
hash = "sha256-zc0cv4AOswvYcC4xJOq2JEPMQ5qTj9Dad5HhxtNETEs=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-german/changelog";
pkgs/applications/editors/vscode/vscodium.nix
+6 -6
View File
@@ -26,11 +26,11 @@ let
hash =
{
x86_64-linux = "sha256-W1y/YOt4IP0XvsY5hDVY1u8yV8t5pLdayrvhYDIOylE=";
x86_64-darwin = "sha256-pGnOYDkuQUiYuu+bO8Mo/g0IFKrIxtdQMGDxRbmnDYQ=";
aarch64-linux = "sha256-SoA7LGgl0qw7bqVwSBN+cGLTVLTPweRJHqZEiPmdnRQ=";
aarch64-darwin = "sha256-ne1I80FxW9nwQcGipQPNpJcnpSiLA3CzCckb2lxEl70=";
armv7l-linux = "sha256-fN6VponkxBzCH+Xx4bwJSNsqv+/ZilBLZvFLgSKve3A=";
x86_64-linux = "sha256-ihRG4CNWFJ9E+F4cVm9ZWLyssY24POgAePf91cFaj6U=";
x86_64-darwin = "sha256-TDbTxuyMLK2z3jn+jDjofX/58gaiGdSWlpXUIZv9U1w=";
aarch64-linux = "sha256-NwcDwUc8ZtSXMsURIQjH5eWVzxXMFE4SEX6fi9UoUsc=";
aarch64-darwin = "sha256-OupASVZeXIWjnMTUv9la7WMGhCtOoUFIYsTFMHGyEfE=";
armv7l-linux = "sha256-kh76i3hxq588to2CNMJWzMB6WZa543phSrbbMxUGnSA=";
}
.${system} or throwSystem;
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.102.14746";
version = "1.102.24914";
pname = "vscodium";
executableName = "codium";
pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-pce-fast";
version = "0-unstable-2025-06-27";
version = "0-unstable-2025-07-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-pce-fast-libretro";
rev = "04a6f2e85c7b4e79bb1bb402a8ea7d8f55132ad3";
hash = "sha256-xA2owDEe9o0+roxZ+GBM4LD7sBDGC9ZY5atwWVA8HC8=";
rev = "71675959c7df0f4235a90e6eeb271bf7c1bde019";
hash = "sha256-4pHPNRc34IEj+4YkKsXuUWK5yZri3+AJasn0aSOpfYY=";
};
makefile = "Makefile";
pkgs/applications/networking/cluster/terraform-providers/providers.json
+14 -14
View File
@@ -207,11 +207,11 @@
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
},
"btp": {
"hash": "sha256-FYheCO1Ch/NFiWvdLm0mAuheer9XcL9AhMYZ13Ag8Cs=",
"hash": "sha256-vXe8nD8x0p3krddfPzEso7KSkO+nPVC1eUP1CYN8WOk=",
"homepage": "https://registry.terraform.io/providers/SAP/btp",
"owner": "SAP",
"repo": "terraform-provider-btp",
"rev": "v1.14.0",
"rev": "v1.15.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-r4Q7b7ZzK+ZDXhIabTSgP7HY5Q51Hz5ErnW+nV+ZIqA="
},
@@ -525,13 +525,13 @@
"vendorHash": "sha256-s5tShmcGeY/PivF2soP0PWZp9MlqYt9yvsjrNArqYGk="
},
"google-beta": {
"hash": "sha256-FmVPRx7EWPUT38IKKnmPf96FJGHj8FUzNzfYzCm2UeA=",
"hash": "sha256-O+rAH2VzDEr+uwyAAg74oS/HeytPLOm+1LTC7aswhIA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v6.43.0",
"rev": "v6.45.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-dvmv7tOY89Gft0qdb33mX90gD7WX/hhPkUSBogMevPA="
"vendorHash": "sha256-QQI1BfUgDRYwlqOC2+e/EMcDsEbZV8cAUnscnW8xVLk="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -759,13 +759,13 @@
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
},
"linode": {
"hash": "sha256-3EBaRDf1ChC92iaYowJEpCIn/br/MxeQGqd47/xuEHo=",
"hash": "sha256-rpF/R2wYYwMp+p57NUXFuEw9UpjJUoGFqTbnuGi3j7E=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v3.0.0",
"rev": "v3.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-o4C58i+/IhMQSziF6Ldb8P+3ojTYyXx9CS65/9ExLpE="
"vendorHash": "sha256-n+CNvbY02Z9mYSrnm3qfP6hLXqD+If00mM7m0Aq8608="
},
"linuxbox": {
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
@@ -867,13 +867,13 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-5AzPNH29tO2AwFz09R+ciBLYBlwESBBc6ZqROvz1Alc=",
"hash": "sha256-6IA7p+VCGvMmIVTPswOorToeYRE1eDszVMFPPZdZ4y0=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.63.0",
"rev": "v3.64.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Sf/nBJQtfzP2+QWhH6rauSam7PpLU01quedUvrJz6fA="
"vendorHash": "sha256-ZWtk6FuELMEyUr7YpkCfsTae3eJqoEpit8/vJgoN/gU="
},
"nexus": {
"hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
@@ -967,13 +967,13 @@
"vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
},
"openstack": {
"hash": "sha256-N5PhTfFNA6jU12uDxSQpOriDOK6okOTh1aFZo3isA7E=",
"hash": "sha256-vACjj5wo2zqNls0VgKeylEW5rrsNv1jz5iKoEywBAEc=",
"homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack",
"owner": "terraform-provider-openstack",
"repo": "terraform-provider-openstack",
"rev": "v3.3.1",
"rev": "v3.3.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ke7Dd3I/6Mja8SzrDy/f4GGgcB3C9xpCT4KiCr0PNZw="
"vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE="
},
"opentelekomcloud": {
"hash": "sha256-HbtNk5UAr+q09mOICkKzh9wIP0HM9MFVVR6gEIBdnvs=",
pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
+1 -6
View File
@@ -18,12 +18,7 @@ lib.makeScope newScope (
plugins = [ ];
};
# Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here.
pidginPackages = self // {
pidginPackages = self.pidginPackages // {
__attrsFailEvaluation = true;
};
};
pidginPackages = self;
pidgin-indicator = callPackage ./pidgin-indicator { };
pkgs/applications/science/math/R/default.nix
-4
View File
@@ -27,7 +27,6 @@
icu,
pkg-config,
bison,
imake,
which,
jdk,
blas,
@@ -63,11 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
"tex"
];
dontUseImakeConfigure = true;
nativeBuildInputs = [
bison
imake
perl
pkg-config
tzdata
pkgs/applications/version-management/sublime-merge/default.nix
+3 -3
View File
@@ -11,9 +11,9 @@ in
} { };
sublime-merge-dev = common {
buildVersion = "2108";
buildVersion = "2109";
dev = true;
aarch64sha256 = "v81Xvp0tsXfbBkf8W53iC1YIcT5XJUYmXl6CWNdz6Hw=";
x64sha256 = "nIwJIWMecBZgfaCFs0/iFHJG9k/3lAqsliCsfvnhpKY=";
aarch64sha256 = "kkXt+CdmU2C6VJHKvp5M4VzzxhhgSqeFVyORWMQnVTc=";
x64sha256 = "O1pY4M98mfBY8VaOYYOTRCNTNeUQYmHlB0h1A0GTpe8=";
} { };
}
pkgs/applications/video/mpv/scripts/manga-reader.nix
+3 -3
View File
@@ -8,12 +8,12 @@
buildLua {
pname = "manga-reader";
version = "0-unstable-2025-05-01";
version = "0-unstable-2025-07-15";
src = fetchFromGitHub {
owner = "Dudemanguy";
repo = "mpv-manga-reader";
rev = "01312a1bf84ff2de48483760b7c9d638ebe08e20";
hash = "sha256-j2uLB2pZiCKvMJBebXoXom9J5jJYMCA2Gz0QUI2yCQQ=";
rev = "bb4ec1208feb440ce430f0963373ab2db5b7d743";
hash = "sha256-Zz2rPnnQHz2BqCM3jEJD/FuFLKtiNGWvAZpiH7jyLmo=";
};
passthru.updateScript = unstableGitUpdater { };
pkgs/build-support/fetchgit/default.nix
+13
View File
@@ -157,6 +157,19 @@ lib.makeOverridable (
"GIT_PROXY_COMMAND"
"NIX_GIT_SSL_CAINFO"
"SOCKS_SERVER"
# This is a parameter intended to be set by setup hooks or preFetch
# scripts that want per-URL control over HTTP proxies used by Git
# (if per-URL control isn't needed, `http_proxy` etc. will
# suffice). It must be a whitespace-separated (with backslash as an
# escape character) list of pairs like this:
#
# http://domain1/path1 proxy1 https://domain2/path2 proxy2
#
# where the URLs are as documented in the `git-config` manual page
# under `http.<url>.*`, and the proxies are as documented on the
# same page under `http.proxy`.
"FETCHGIT_HTTP_PROXIES"
];
inherit preferLocalBuild meta allowedRequisites;
pkgs/build-support/fetchgit/nix-prefetch-git
+5
View File
@@ -126,6 +126,11 @@ init_remote(){
echo "$sparseCheckout" | git sparse-checkout set --stdin ${nonConeMode:+--no-cone}
fi
( [ -n "$http_proxy" ] && clean_git config --global http.proxy "$http_proxy" ) || true
local proxy_pairs i
read -a proxy_pairs <<< "${FETCHGIT_HTTP_PROXIES:-}"
for ((i = 1; i < ${#proxy_pairs[@]}; i += 2)); do
clean_git config --global "http.${proxy_pairs[$i - 1]}.proxy" "${proxy_pairs[$i]}"
done
}
# Return the reference of an hash if it exists on the remote repository.
pkgs/by-name/_3/_389-ds-base/package.nix
+3 -3
View File
@@ -40,20 +40,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "389-ds-base";
version = "3.1.2";
version = "3.1.3";
src = fetchFromGitHub {
owner = "389ds";
repo = "389-ds-base";
rev = "389-ds-base-${finalAttrs.version}";
hash = "sha256-FIx+ZW3K5KevU+wAiwPbDAQ6q7rPFEHFa+5eKqtgzpQ=";
hash = "sha256-hRTK9xBu8v8+SGa/3IB8Alh/aGUiRRn2LmYOvXy0Yd4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/src";
name = "389-ds-base-${finalAttrs.version}";
hash = "sha256-8A2xnJI22mjupX5FVsvRa5RfWyOE+VLH2aJwBHjDOME=";
hash = "sha256-pNzMQjeBpmzFg6oWCxhLDmKGUKIW6jGmZQWai5Yunjc=";
};
nativeBuildInputs = [
pkgs/by-name/ad/adios2/package.nix
+7 -3
View File
@@ -22,6 +22,7 @@
zfp,
zlib,
ucx,
libffi,
yaml-cpp,
nlohmann_json,
llvmPackages,
@@ -94,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
pugixml
sqlite
zeromq
zfp
zlib
yaml-cpp
nlohmann_json
@@ -104,8 +104,12 @@ stdenv.mkDerivation (finalAttrs: {
# mgard
]
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx
++ lib.optional (stdenv.hostPlatform.isLoongArch64) libffi
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform zfp) zfp
# openmp required by zfp
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
++ lib.optional (
lib.meta.availableOn stdenv.hostPlatform zfp && stdenv.cc.isClang
) llvmPackages.openmp;
propagatedBuildInputs =
lib.optional mpiSupport mpi
@@ -122,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ADIOS2_USE_EXTERNAL_DEPENDENCIES" true)
(lib.cmakeBool "ADIOS2_USE_Blosc2" true)
(lib.cmakeBool "ADIOS2_USE_BZip2" true)
(lib.cmakeBool "ADIOS2_USE_ZFP" true)
(lib.cmakeBool "ADIOS2_USE_ZFP" (lib.meta.availableOn stdenv.hostPlatform zfp))
(lib.cmakeBool "ADIOS2_USE_SZ" false)
(lib.cmakeBool "ADIOS2_USE_LIBPRESSIO" false)
(lib.cmakeBool "ADIOS2_USE_MGARD" false)
pkgs/by-name/al/aliyun-cli/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.290";
version = "3.0.291";
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-cli";
tag = "v${version}";
hash = "sha256-mYWG3L2qFNd2QqYiHiNPl2TgvGKJlFkPP6GEurkmSB8=";
hash = "sha256-/nrspG9pB8pOnkTpnY3/4872sfe1Wg14MnKftEz4YX0=";
fetchSubmodules = true;
};
pkgs/by-name/al/alsa-firmware/package.nix
+12 -7
View File
@@ -5,14 +5,15 @@
autoreconfHook,
fetchurl,
fetchpatch,
directoryListingUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-firmware";
version = "1.2.4";
src = fetchurl {
url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2";
url = "mirror://alsa/firmware/alsa-firmware-${finalAttrs.version}.tar.bz2";
hash = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
};
@@ -47,11 +48,15 @@ stdenv.mkDerivation rec {
rm -rf $out/bin
'';
meta = with lib; {
passthru.updateScript = directoryListingUpdater {
url = "https://alsa-project.org/files/pub/firmware/";
};
meta = {
homepage = "http://www.alsa-project.org/";
description = "Soundcard firmwares from the alsa project";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ l-as ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ l-as ];
};
}
})
pkgs/by-name/al/alsa-lib/package.nix
+11 -5
View File
@@ -5,6 +5,7 @@
alsa-topology-conf,
alsa-ucm-conf,
testers,
directoryListingUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -36,9 +37,14 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = directoryListingUpdater {
url = "https://www.alsa-project.org/files/pub/lib/";
};
};
meta = with lib; {
meta = {
homepage = "http://www.alsa-project.org/";
description = "ALSA, the Advanced Linux Sound Architecture libraries";
mainProgram = "aserver";
@@ -48,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
MIDI functionality to the Linux-based operating system.
'';
license = licenses.lgpl21Plus;
license = lib.licenses.lgpl21Plus;
pkgConfigModules = [
"alsa"
"alsa-topology"
];
platforms = platforms.linux ++ platforms.freebsd;
maintainers = with maintainers; [ l-as ];
platforms = with lib.platforms; linux ++ freebsd;
maintainers = with lib.maintainers; [ l-as ];
};
})
pkgs/by-name/al/alsa-plugins/package.nix
+18 -7
View File
@@ -9,14 +9,15 @@
libogg,
libpulseaudio,
speexdsp,
directoryListingUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-plugins";
version = "1.2.12";
src = fetchurl {
url = "mirror://alsa/plugins/alsa-plugins-${version}.tar.bz2";
url = "mirror://alsa/plugins/alsa-plugins-${finalAttrs.version}.tar.bz2";
hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI=";
};
@@ -31,11 +32,21 @@ stdenv.mkDerivation rec {
speexdsp
];
meta = with lib; {
passthru.updateScript = directoryListingUpdater {
url = "https://alsa-project.org/files/pub/plugins/";
};
meta = {
description = "Various plugins for ALSA";
homepage = "http://alsa-project.org/";
license = licenses.lgpl21;
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux;
license = with lib.licenses; [
lgpl21Plus
lgpl2Plus # maemo plugin
gpl2Plus # attributes.m4 & usb_stream.h
];
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/an/anubis/package.nix
+3 -3
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "anubis";
version = "1.21.0";
version = "1.21.3";
src = fetchFromGitHub {
owner = "TecharoHQ";
repo = "anubis";
tag = "v${finalAttrs.version}";
hash = "sha256-FKX8E32unAKK8e/Nlrj24FU1amc7AJw28hzmZDbIcIc=";
hash = "sha256-CMFd9che+D1ot1Iqk0VcJmna0xIqHlRIvNnzYo+q+RU=";
};
vendorHash = "sha256-cWkC3Bqut5h3hHh5tPIPeHMnkwoqKMnG1x40uCtUIwI=";
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
pname = "anubis-xess";
inherit (finalAttrs) version src;
npmDepsHash = "sha256-jvYmAbbMRy8fK2Y0YC0UJGhNRLzk1kjzGvRbqhWFzS4=";
npmDepsHash = "sha256-NJMUXGXcaY8l1WIbvCn+aIknVuagR7X8gRkme9xpYQ0=";
buildPhase = ''
runHook preBuild
pkgs/by-name/ap/api-linter/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "api-linter";
version = "1.70.0";
version = "1.70.1";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
tag = "v${version}";
hash = "sha256-1OBsNuQuCxm+79K29NBwJ0Mj+kLiSEQSZk6Ovrh5sQY=";
hash = "sha256-Jztu8xQWLeJVSk+yx3julu0wkQNpgQtzZvrKP71T7Eg=";
};
vendorHash = "sha256-WfSr70YA6klj3iNQl1mLzpzJGGvybfFPkxaB4jBdsTg=";
vendorHash = "sha256-wIZdL393uPVqz0rJV5NU6SHm8RU5orrHREhKbjBHTYU=";
subPackages = [ "cmd/api-linter" ];
pkgs/by-name/as/ast-grep/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ast-grep";
version = "0.38.7";
version = "0.39.1";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
tag = finalAttrs.version;
hash = "sha256-3ZjXHmPBI40rXrEUerlvmozBYEu8NDvy0Fj3wopA7D8=";
hash = "sha256-LZ83PlIEC1Is5Fo7GMglLgYg0+acJcFc1yeaF2Yrs1I=";
};
# error: linker `aarch64-linux-gnu-gcc` not found
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-VoVSI6pg+V4lz/K5ASM8bwMo3G3+ZzK8/Yko33zsCNk=";
cargoHash = "sha256-HXuU+B25+Cy8cLM2cNhwqcm/Wt3JS3aGKIKgGpttek8=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/au/audacious-plugins/package.nix
+2 -2
View File
@@ -45,13 +45,13 @@
stdenv.mkDerivation rec {
pname = "audacious-plugins";
version = "4.4.2";
version = "4.5";
src = fetchFromGitHub {
owner = "audacious-media-player";
repo = "audacious-plugins";
rev = "${pname}-${version}";
hash = "sha256-fA7xB04WLlleLIBDEZOVqDQguKAXtTsJoedQ9A/ZHQg=";
hash = "sha256-2GsNIkvrjZ1EOXi6H5jagdawxXp0kVg7C4FaEZkMHwM=";
};
patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
pkgs/by-name/au/audiobookshelf/source.json
+5 -5
View File
@@ -1,9 +1,9 @@
{
"owner": "advplyr",
"repo": "audiobookshelf",
"rev": "878f0787ba39ff82f9d5b6b5b5bb397ec667f010",
"hash": "sha256-XZVPLNnG+CRafRKeqFILKfmELEyt1RrIB1ssBO5nb/I=",
"version": "2.26.2",
"depsHash": "sha256-S++Q/sVFZX0qqWSjzMxzYR8ImjUVoNP5pGTqIkCGqVE=",
"clientDepsHash": "sha256-+DcweA3g8kdzDqHFencOnaMMx4BRZ+MTZg5BwQNzK2k="
"rev": "a7a3a565098791a8157ed54b46b5258bb97c141d",
"hash": "sha256-AnPHwb3ad6TvgQ9DJdOYwQ+RwE5+iMA7tDAPnviQ9YM=",
"version": "2.26.3",
"depsHash": "sha256-+UbOYtS0lumYajQklm0izgW6oNb0QcxvDKYtRSFICj8=",
"clientDepsHash": "sha256-5BHutO2aCvVWvN/LySMtgPPl9HQLsu8Tjj/k7FIiAr8="
}
pkgs/by-name/au/automatic-timezoned/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "2.0.82";
version = "2.0.83";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = "automatic-timezoned";
rev = "v${version}";
sha256 = "sha256-qUpPeuFfdj0rIygSo9C7LGdFi7l1erfz4XYTuxLgL7M=";
sha256 = "sha256-jrRuQXzx1dBIjXswVFq5szydj2GNEBPgpGj7K1vvQkE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-7QkrKeF1WY1ewe4GsdpZ/Na7hd9AGq+ixepeB473bDQ=";
cargoHash = "sha256-itZPo0GuTdWr2NYBluvf5/jQlwGVDZsPurIfftL94gk=";
meta = {
description = "Automatically update system timezone based on location";
pkgs/by-name/az/azure-cli/extensions-manual.nix
+3 -3
View File
@@ -26,9 +26,9 @@
azure-devops = mkAzExtension rec {
pname = "azure-devops";
version = "1.0.1";
url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl";
hash = "sha256-ZYooVNjID4dPk4LUIfpFq/ajjQAzRzfdoAb43sZM9wo=";
version = "1.0.2";
url = "https://github.com/Azure/azure-cli-extensions/releases/download/azure-devops-${version}/azure_devops-${version}-py2.py3-none-any.whl";
hash = "sha256-4rDeAqOnRRKMP26MJxG4u9vBuos6/SQIoVgfNbBpulk=";
description = "Tools for managing Azure DevOps";
propagatedBuildInputs = with python3Packages; [ distro ];
meta.maintainers = with lib.maintainers; [ katexochen ];
pkgs/by-name/ba/bant/package.nix
+2 -2
View File
@@ -20,13 +20,13 @@ let
in
buildBazelPackage rec {
pname = "bant";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "hzeller";
repo = "bant";
rev = "v${version}";
hash = "sha256-Qq35WhRFpmQwWPupcjnUo/SEFRSRynVIx+PiHEsGED8=";
hash = "sha256-xiTi4GrCeoI8hIEgYMAdzUPvJzYvXrvbo6MBq9my5Cw=";
};
bazelFlags = [
pkgs/by-name/ba/bazel-remote/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "bazel-remote";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "buchgr";
repo = "bazel-remote";
rev = "v${version}";
hash = "sha256-PjhLybiZoq7Uies2bWdlLKAbKcG3+AQZ55Qp706u7hc=";
hash = "sha256-qsNIfl3Y+2MaflTCL+uKV1T6tMe1AFIt+fOz/bB3EEQ=";
};
vendorHash = "sha256-okXGqPN/Do7Ht3zW8jVWo+8YquUEqNhirr9pPqMelmk=";
vendorHash = "sha256-cZe1jFJZnZy960lyV3nMO0+ZotwjMn1tSyeFj05tZao=";
subPackages = [ "." ];
pkgs/by-name/bc/bcc/package.nix
+3 -3
View File
@@ -104,12 +104,12 @@ python3Packages.buildPythonApplication rec {
ln -s $f $bin
fi
substituteInPlace "$f" \
--replace '$(dirname $0)/lib' "$out/share/bcc/tools/lib"
--replace-quiet '$(dirname $0)/lib' "$out/share/bcc/tools/lib"
done
sed -i -e "s!lib=.*!lib=$out/bin!" $out/bin/{java,ruby,node,python}gc
'';
pythonImportsCheck = [ "bcc" ];
postFixup = ''
wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath"
'';
pkgs/by-name/bl/bloodhound/package.nix
+4 -4
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "4.3.1";
src = fetchzip {
url = "https://github.com/BloodHoundAD/BloodHound/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip";
url = "https://github.com/SpecterOps/BloodHound-Legacy/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip";
hash = "sha256-gGfZ5Mj8rmz3dwKyOitRExkgOmSVDOqKpPxvGlE4izw=";
};
@@ -119,10 +119,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Active Directory reconnaissance and attack path management tool";
homepage = "https://github.com/BloodHoundAD/BloodHound";
homepage = "https://github.com/SpecterOps/BloodHound-Legacy";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
changelog = "https://github.com/BloodHoundAD/BloodHound/releases/tag/v${finalAttrs.version}";
downloadPage = "https://github.com/BloodHoundAD/BloodHound/releases";
changelog = "https://github.com/SpecterOps/BloodHound-Legacy/releases/tag/v${finalAttrs.version}";
downloadPage = "https://github.com/SpecterOps/BloodHound-Legacy/releases";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ akechishiro ];
platforms = [ "x86_64-linux" ];
pkgs/by-name/bm/bmake/package.nix
+2 -2
View File
@@ -4,7 +4,7 @@
fetchurl,
getopt,
ksh,
pkgsMusl,
pkgsMusl ? { },
stdenv,
tzdata,
}:
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
tests = {
bmakeMusl = pkgsMusl.bmake;
bmakeMusl = pkgsMusl.bmake or null;
};
};
pkgs/by-name/bo/bolt-launcher/package.nix
+3 -2
View File
@@ -38,14 +38,14 @@ in
let
bolt = stdenv.mkDerivation (finalAttrs: {
pname = "bolt-launcher";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "AdamCake";
repo = "bolt";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-RlWJcxSCKTbj6MNeQwweu20rPBQGzumEk42MtTAhGRU=";
hash = "sha256-S9SZ9UfohEHfwmXmHsTeSW45BHTJA4wPdFQXsX3Pk34=";
};
nativeBuildInputs = [
@@ -114,6 +114,7 @@ buildFHSEnv {
xorg.libSM
xorg.libXxf86vm
xorg.libX11
xorg.libXi
xorg.libXext
glib
pango
pkgs/by-name/bo/bootc/package.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "bootc";
version = "1.5.0";
version = "1.5.1";
useFetchCargoVendor = true;
cargoHash = "sha256-3/Ngq6ZHPoE9BMychv+Jg0LhtJrY8GPrFYu7lRvX1+k=";
cargoHash = "sha256-+FxydTK0Dmcj+doHMSoTgiues7Rrwxv/D+BOq4siKCk=";
doInstallCheck = true;
src = fetchFromGitHub {
owner = "bootc-dev";
repo = "bootc";
rev = "v${version}";
hash = "sha256-1u4pBiySYzudFVf4bayQ7FbXf4EjA4v1+AOX9E+tjyA=";
hash = "sha256-LmhgCiVFbhrePV/A/FaNjD7VytUZqSm9VDU+1z0O98U=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/br/bruno/package.nix
+3 -3
View File
@@ -19,20 +19,20 @@
buildNpmPackage rec {
pname = "bruno";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
tag = "v${version}";
hash = "sha256-qNZCLd4FixJ+I5xaIIQ9EIKfCXnPOZFGbXHkgagBbFE=";
hash = "sha256-1Xg3AaEmg4mAcK2EytQdWqkLoYWPQMZzLWDjceXcnSA=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-osdjtn9jn6T1YizQM7I9cfiHvIkrZ8HRDNjsR+FS/DE=";
npmDepsHash = "sha256-+ecdxq5YwZdWRATl1Jc3BaDfyVW5n4T4flCLqzFoVIQ=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs = [
pkgs/by-name/bu/bump/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "bump";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "mroth";
repo = "bump";
rev = "v${version}";
sha256 = "sha256-a+vmpmWb/jICNdErkvCQKNIdaKtSrIJZ3BApLvKG/hg=";
sha256 = "sha256-OD/ZAVLhezhmFSaWyka5kKwEU5FXH3KuzS91eAteR8Y=";
};
vendorHash = "sha256-VHVChqQXmCcw2ymTJbQLDtzBycTeXkuHPz52vuKen0w=";
vendorHash = "sha256-mEeuTyNjyuCdRlvJkMPVSplbNL9KXPgX+F1FNdKTvQU=";
doCheck = false;
pkgs/by-name/ca/cargo-expand/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.113";
version = "1.0.114";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cargo-expand";
rev = version;
hash = "sha256-u5AQR0kMTNb6x1x7rvtF1jCne9Nqbkl7oiD9rkwhdRE=";
hash = "sha256-blq/5ObzHxYjNx0TPiuF1OuDPHNDBV7jBkt1r+ISnVE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-TdzccMtXp5/KeYiO+vdukMO3hllBNeZAtO66eAUdbgA=";
cargoHash = "sha256-HNmmu9TF7p94bRF/IsStIE5XPdcUM6d505G+wbFNTls=";
meta = {
description = "Cargo subcommand to show result of macro expansion";
pkgs/by-name/ca/cargo-lambda/package.nix
+3 -3
View File
@@ -14,17 +14,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-lambda";
version = "1.8.5";
version = "1.8.6";
src = fetchFromGitHub {
owner = "cargo-lambda";
repo = "cargo-lambda";
tag = "v${version}";
hash = "sha256-iYfm7/XbLThtEo+zSW8sn7T6XEhzyiVKy6/cisshc+Y=";
hash = "sha256-ocFD2FK1nlEJ8xXhDSxpSKYU8oZk/QwfojveypVt1GU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-mCD3Szbl5BXknTWJhm2xlcIV0aKczsEi8yRDA4erTYc=";
cargoHash = "sha256-yE0pr7RZb015d51QtwVNfqXd8yEETvDdKJ5M7Oqc4Ds=";
nativeCheckInputs = [ cacert ];
pkgs/by-name/ca/cargo-tauri/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "tauri";
version = "2.7.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
tag = "tauri-cli-v${version}";
hash = "sha256-nEt4xoVHozqxWnyrXTn7XDgH2HYCzrfqBgt71+goYms=";
hash = "sha256-0J55AvAvvqTVls4474GcgLPBtSC+rh8cXVKluMjAVBE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-av5UF0MgKnTwEX4dHhekvj2tz/BOZyUbs1YqLwx28Cw=";
cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/cd/cdncheck/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.1.27";
version = "1.1.28";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-8TLsotEUnZyyeaJaAHjJT+Sk3GFztnJei3I9QHJ8raM=";
hash = "sha256-DifV+AvVzC8wm3yjfWorAk8E0a7++Aq38UXxBQbHAPM=";
};
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -25,14 +25,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.451";
version = "3.2.452";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-omTsb7H6EGzFDZmYX0ZEHW/kDivzE64jVZbxWRSY5Nk=";
hash = "sha256-pTSI0aqxcCP0pBraBw3p20hpt9jSpAWkatLPCrc4u90=";
};
pythonRelaxDeps = [
pkgs/by-name/cl/clash-verge-rev/package.nix
+1 -2
View File
@@ -64,8 +64,7 @@ let
license = lib.licenses.gpl3Only;
mainProgram = "clash-verge";
maintainers = with lib.maintainers; [
Guanran928
bot-wxt1221
hhr2020
];
platforms = lib.platforms.linux;
};
pkgs/by-name/cl/claude-code/package-lock.json
Generated
+4 -4
View File
@@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.58"
"@anthropic-ai/claude-code": "^1.0.60"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.58",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.58.tgz",
"integrity": "sha512-XcfqklHSCuBRpVV9vZaAGvdJFAyVKb/UHz2VG9osvn1pRqY7e+HhIOU9X7LeI+c116QhmjglGwe+qz4jOC83CQ==",
"version": "1.0.60",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.60.tgz",
"integrity": "sha512-CH6DmwrN8AOVzbtT7tOv6iXR+Ka9QnkqBjuMRCAap78feC4ZDRo7hCOB4OYktNovVw011a1V5fRILdS9UTnPiQ==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
pkgs/by-name/cl/claude-code/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.58";
version = "1.0.60";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-Mp3S269iifNGSEz83IF6bqbgdy6Im1bQjR8oaaL3W8c=";
hash = "sha256-ygeitenu4z9ACbezO53I2Xnk6NtE1fWVzCi3mZS7wF8=";
};
npmDepsHash = "sha256-iAckljEIJFVtlySHjS414HUFg6XVSlPr8azYqTo1py8=";
npmDepsHash = "sha256-F4wAjwTSs5jYoVgJoCrrI1dHlBmxxfWF/KGvuu5Gl30=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
pkgs/by-name/cl/cloak-pt/package.nix
+3 -3
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
}:
let
version = "2.11.0";
version = "2.12.0";
in
buildGoModule {
pname = "Cloak";
@@ -14,10 +14,10 @@ buildGoModule {
owner = "cbeuw";
repo = "Cloak";
rev = "v${version}";
hash = "sha256-afFOWjJiqlMeo8M8D2RsW572c2qTthMNbQvxEf7edHE=";
hash = "sha256-789UyTJmIhujsg0OlCy8GqUxgHDjzkGUi5kHD5sytwQ=";
};
vendorHash = "sha256-P3/fB1vJjEMETyFxH9XNQySCEDQWrbZdaf0V4qFucbI=";
vendorHash = "sha256-LOXPs/3qkP3GJZZ7W4rPOfAjmvNh1mowRuQ1tlV1uC4=";
doCheck = false;
pkgs/by-name/cl/cloneit/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
rustPlatform.buildRustPackage {
pname = "cloneit";
version = "0-unstable-2024-06-28";
version = "1.0.0-unstable-2025-07-22";
src = fetchFromGitHub {
owner = "alok8bb";
repo = "cloneit";
rev = "6198556e810d964cc5938c446ef42fc21b55fe0b";
sha256 = "sha256-RP0/kquAlSwRMeB6cjvS5JB9qfdkT8IKLVxaxrmzJ+0=";
rev = "58e9213ba5af457e76a7ea55696eb77f6d0d9025";
sha256 = "sha256-rvhUArJR8ipMRIWpzUY9NUBwqj9TWjX6qtBJp/v3p+Q=";
};
useFetchCargoVendor = true;
pkgs/by-name/cl/cloudflared/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2025.6.1";
version = "2025.7.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
tag = version;
hash = "sha256-eCNGNEoKljIKCvEU220/OUIxc+i4I+4wVJEjjmWROew=";
hash = "sha256-GAmSWdyFQYtGQ5Ml+10Xy7OpKc1bXuAc3hy7Ly6+yC8=";
};
vendorHash = null;
pkgs/by-name/cn/cnquery/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "11.60.0";
version = "11.64.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-Vu7UfTinjuyc49Kb5GW8uXrP5/bszGt9ktxilGDqY0M=";
hash = "sha256-olfkzuAgXjlxDQCaLqnu6V9tenFjBBYvIzxuo2phtns=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-5vNLaOG4vYgetiQLRIzFkrlFgH6Dwa/VHCv0HWWow30=";
vendorHash = "sha256-b+E8thljWxRwbBca2TdTINQERnOvfQncSEJ0+Nxuk8M=";
ldflags = [
"-w"
pkgs/by-name/co/codebuff/package-lock.json
Generated
+4 -4
View File
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
"codebuff": "^1.0.424"
"codebuff": "^1.0.436"
}
},
"node_modules/chownr": {
@@ -18,9 +18,9 @@
}
},
"node_modules/codebuff": {
"version": "1.0.424",
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.424.tgz",
"integrity": "sha512-o0x7ZNYqFSM6R6dysWOgJW+MsQFTDF76T0QsLYQXMtLPDU3wkTWRfh026QUUX1hYlFjmQyM0t7ukZVcJLotPWw==",
"version": "1.0.436",
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.436.tgz",
"integrity": "sha512-Xz1VjODWaG0K5pgsEm1HvjpjJjHilNubow6mx4ber+HqPdufN7r4fk3ZsPjO+GoJavcxG8z7OdPY8CLIouZ4gA==",
"cpu": [
"x64",
"arm64"
pkgs/by-name/co/codebuff/package.nix
+3 -3
View File
@@ -6,14 +6,14 @@
buildNpmPackage rec {
pname = "codebuff";
version = "1.0.424";
version = "1.0.436";
src = fetchzip {
url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
hash = "sha256-SyPW9msVhy3c5wARyDCl/rsfrhLFhZ8iAKkO47s0bYE=";
hash = "sha256-eMoF+YrZttplzN+S9rEuHEBPSbGQnwWOFuZ+vVFrpik=";
};
npmDepsHash = "sha256-LRg4dBVcGQptjC2JNwQfCM33pcI20qwrowof48s5Gzk=";
npmDepsHash = "sha256-VTThvsHSiKSHmE7PYBUb5yZW2SKhLB7O5VjV8RhO9ZU=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
pkgs/by-name/co/coldsnap/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "coldsnap";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "coldsnap";
rev = "v${version}";
hash = "sha256-tlQ4PDrYnnbsxXRbrIoF08aSy7VP+iXgTKf0A8MITpo=";
hash = "sha256-ZN+gSoWrmGmN1jYxKLO06hRVyTM5WUXRjsfkcKcdXfM=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Z4UbMdu35m/myiqrFFpvlmVfCD0MlSTQRvs2uhnxBAI=";
cargoHash = "sha256-ZWJa/J5sfBA/F28TkXyspygN1ZkNz2TIEKTsusN4SOc=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/co/comma/package.nix
+26 -12
View File
@@ -3,37 +3,51 @@
fetchFromGitHub,
fzy,
lib,
makeBinaryWrapper,
nix-index-unwrapped,
nix,
rustPlatform,
testers,
}:
rustPlatform.buildRustPackage rec {
pname = "comma";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "comma";
rev = "v${version}";
hash = "sha256-mhSX2yx+/xDwCtLVb+aSFFxP2TOJek/ZX/28khvetwE=";
hash = "sha256-JogC9NIS71GyimpqmX2/dhBX1IucK395iWZVVabZxiE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-6BsRgxcUtVuN1gp3VVXkNQzqb9hD5rWWctieJvFdyrQ=";
cargoHash = "sha256-Cd4WaOG+OkCM4Q1K9qVzMYOjSi9U8W82JypqUN20x9w=";
nativeBuildInputs = [ makeBinaryWrapper ];
postPatch = ''
substituteInPlace ./src/main.rs \
--replace-fail '"nix-locate"' '"${lib.getExe' nix-index-unwrapped "nix-locate"}"' \
--replace-fail '"nix"' '"${lib.getExe nix}"' \
--replace-fail '"nix-env"' '"${lib.getExe' nix "nix-env"}"' \
--replace-fail '"fzy"' '"${lib.getExe fzy}"'
'';
postInstall = ''
wrapProgram $out/bin/comma \
--prefix PATH : ${
lib.makeBinPath [
fzy
nix-index-unwrapped
]
}
ln -s $out/bin/comma $out/bin/,
mkdir -p $out/etc/profile.d
mkdir -p $out/etc/nushell
mkdir -p $out/etc/fish/functions
cp $src/etc/comma-command-not-found.sh $out/etc/profile.d
cp $src/etc/comma-command-not-found.nu $out/etc/nushell
cp $src/etc/comma-command-not-found.fish $out/etc/fish/functions
patchShebangs $out/etc/profile.d/comma-command-not-found.sh
substituteInPlace \
"$out/etc/profile.d/comma-command-not-found.sh" \
"$out/etc/nushell/comma-command-not-found.nu" \
"$out/etc/fish/functions/comma-command-not-found.fish" \
--replace-fail "comma --ask" "$out/bin/comma --ask"
'';
passthru.tests = {
pkgs/by-name/co/consul-template/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "consul-template";
version = "0.41.0";
version = "0.41.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "consul-template";
rev = "v${version}";
hash = "sha256-rPr69/U7+TZ7snzK8dvyd+5/O9/sqKMY/sIPOGkORs4=";
hash = "sha256-lQTI3eTKggzNnN0KCu+ZcdqtDT06OfyIWPQg2qfaxro=";
};
vendorHash = "sha256-VUqRNK6OwSVydVbmxDe75JnI16JpnGT+wyAItqz781Q=";
vendorHash = "sha256-Tz80n37NBqKX+h3OE6RBufPQ7OteWpZaa5br2WFIvOs=";
# consul-template tests depend on vault and consul services running to
# execute tests so we skip them here
pkgs/by-name/co/consul/package.nix
+3 -3
View File
@@ -8,7 +8,7 @@
buildGoModule rec {
pname = "consul";
version = "1.21.2";
version = "1.21.3";
# Note: Currently only release tags are supported, because they have the Consul UI
# vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = "consul";
tag = "v${version}";
hash = "sha256-ejslKLoZFxNKQiV9AH+djRIN1lUC4WvUBkaVOENsHwM=";
hash = "sha256-mWwDAlHbG0L/9xNAmUxAj2S5dDaWZaah/OWPndBRRWE=";
};
# This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
"connect/certgen"
];
vendorHash = "sha256-Bmuc/nNNztd0wZqpLrFv4FZ/1CZ2lN1Bhob+grJJC8w=";
vendorHash = "sha256-jb/oUcqMHNBlDgqYNDai2Q9ChA98JGXwFHWNxnrMpaU=";
doCheck = false;
pkgs/by-name/da/darkhttpd/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "darkhttpd";
version = "1.16";
version = "1.17";
src = fetchFromGitHub {
owner = "emikulic";
repo = "darkhttpd";
rev = "v${version}";
sha256 = "sha256-dcNoGU08tu950PlwSghoZwGSaSbP8NJ5qhWUi3bAtZY=";
sha256 = "sha256-d5pDUY1EbVjykb4in4hhbgbjIXJtj133nRAQ84ASicQ=";
};
enableParallelBuilding = true;
pkgs/by-name/dd/ddns-go/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "ddns-go";
version = "6.11.3";
version = "6.12.0";
src = fetchFromGitHub {
owner = "jeessy2";
repo = "ddns-go";
rev = "v${version}";
hash = "sha256-65j1hZqnpSRpDmkzjb8ciJoVGHbV2xuOwBLcsW65eOE=";
hash = "sha256-6syI3XQNiERqxHUWmquNGHyKHymVkVgD8Yh2iZoek4g=";
};
vendorHash = "sha256-oHiREhvqu14z5StjzD4PgtFasYQ0X435eMCRMiWUzg0=";
vendorHash = "sha256-0HH5KkMVQzD/xyaue9Sh6CE5dI/aZJMwei7ynhzp9dc=";
ldflags = [
"-X main.version=${version}"
pkgs/by-name/de/debian-devscripts/package.nix
+15 -9
View File
@@ -18,6 +18,7 @@
pkg-config,
bash-completion,
help2man,
nix-update-script,
sendmailPath ? "/run/wrappers/bin/sendmail",
}:
@@ -29,14 +30,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "debian-devscripts";
version = "2.25.15";
version = "2.25.16";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "devscripts";
tag = "v${finalAttrs.version}";
hash = "sha256-s2QSfJyHsFr1eiia/yFj3jsS5k38xNewEe/g5PFpqag=";
hash = "sha256-cbaG7yNZt+205fa6HGEjLOjLsW3HloLQHvcGGjmnXDM=";
};
patches = [
@@ -51,10 +52,13 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace scripts/debrebuild.pl \
--replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
patchShebangs scripts
''
+
# Remove man7 target to avoid missing *.7 file error
substituteInPlace doc/Makefile \
--replace-fail " install_man7" ""
'';
''
substituteInPlace doc/Makefile \
--replace-fail " install_man7" ""
'';
nativeBuildInputs = [
makeWrapper
@@ -95,11 +99,11 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p "$tgtpy"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
find lib po4a scripts -type f -exec sed -r \
-e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \
-e "s@/usr/bin/gpg(2|)@${lib.getExe' gnupg "gpg"}@g" \
-e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
-e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
-e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \
-e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \
-e "s@/usr/bin/diff@${lib.getExe' diffutils "diff"}@g" \
-e "s@/usr/bin/gpgv(2|)@${lib.getExe' gnupg "gpgv"}@g" \
-e "s@(command -v|/usr/bin/)curl@${lib.getExe curl}@g" \
-e "s@sensible-editor@${sensible-editor}@g" \
-e "s@(^|\W)/bin/bash@\1${stdenv.shell}@g" \
-i {} +
@@ -131,6 +135,8 @@ stdenv.mkDerivation (finalAttrs: {
ln -s pts-subscribe $out/bin/pts-unsubscribe
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Debian package maintenance scripts";
license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
pkgs/by-name/di/di-tui/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "di-tui";
version = "1.11.1";
version = "1.11.2";
src = fetchFromGitHub {
owner = "acaloiaro";
repo = "di-tui";
rev = "v${version}";
hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew=";
hash = "sha256-YXTVJN8t58MS0Q4kKbasFNkmB/Jz4ctebBnbKqOP2is=";
};
vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";
pkgs/by-name/en/envoy-bin/package.nix
+3 -3
View File
@@ -8,7 +8,7 @@
versionCheckHook,
}:
let
version = "1.34.3";
version = "1.35.0";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "envoy-bin is not available for ${system}.";
@@ -21,8 +21,8 @@ let
hash =
{
aarch64-linux = "sha256-LsNkrFJ59MUiKIF0Dcuq2Lhn3LnAW0Mwlx4kIx78KfQ=";
x86_64-linux = "sha256-04vGgR8U0qiNBvmiim0aKa6Ug2acR31F5H4biSWkrag=";
aarch64-linux = "sha256-PLlFrs65Z+mV5V2OoW+bb/91DC5V9Ss2HnERccIunWY=";
x86_64-linux = "sha256-0l12MVwCNrUPjn9t6hOpuUscP6EQQHNLd0kG4YjhEeY=";
}
.${system} or throwSystem;
in
pkgs/by-name/ex/exploitdb/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "exploitdb";
version = "2025-07-17";
version = "2025-07-23";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
tag = finalAttrs.version;
hash = "sha256-RxK983lsfEHKCG9lG7EBVgpS3XJ3NC0LjsgDF8dVcn8=";
hash = "sha256-wnYqtWtqvy5SsgHSDIzxNpnhXMT4WIVwWh2woW4eLhw=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/ex/extism-cli/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "extism-cli";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "extism";
repo = "cli";
tag = "v${version}";
hash = "sha256-VxQ8qj/prGecssbggSKhj0vkZ75/GD73u/g21hUVkSs=";
hash = "sha256-ioH2s9546/i12jCmE/4km9YqLhiHkj6WLBwmNAAZFUA=";
};
vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M=";
pkgs/by-name/fa/faudio/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "faudio";
version = "25.06";
version = "25.07";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
tag = finalAttrs.version;
hash = "sha256-wIFUOOpI/kUeXjodHwt1KZ30ooSYEGrZ8XSW0zOm3xk=";
hash = "sha256-ZMU3ntvnUHbeWQ5k5ZSnSLBABGm/F/rSAUM4blorpts=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/fl/flow-control/build.zig.zon.nix
+93 -75
View File
@@ -16,15 +16,11 @@ with lib;
let
unpackZigArtifact =
{ name, artifact }:
runCommandLocal name
{
nativeBuildInputs = [ zig ];
}
''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig =
{
@@ -42,13 +38,12 @@ let
name,
url,
hash,
rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
}:
let
parts = splitString "#" url;
url_base = elemAt parts 0;
url_without_query = elemAt (splitString "?" url_base) 0;
rev_base = elemAt parts 1;
rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
in
fetchgit {
inherit name rev hash;
@@ -61,20 +56,25 @@ let
name,
url,
hash,
}:
...
}@args:
let
parts = splitString "://" url;
proto = elemAt parts 0;
path = elemAt parts 1;
fetcher = {
"git+http" = fetchGitZig {
inherit name hash;
url = "http://${path}";
};
"git+https" = fetchGitZig {
inherit name hash;
url = "https://${path}";
};
"git+http" = fetchGitZig (
args
// {
url = "http://${path}";
}
);
"git+https" = fetchGitZig (
args
// {
url = "https://${path}";
}
);
http = fetchZig {
inherit name hash;
url = "http://${path}";
@@ -89,31 +89,31 @@ let
in
linkFarm name [
{
name = "1220930a42f8da3fb7f723e3ad3f6dcc6db76327dd8d26274566423192d53e91b2bb";
name = "N-V-__8AANMzUiemOR2eNnrtlMmAGHFqij6VYtDUiaFfn6Dw";
path = fetchZigArtifact {
name = "tree_sitter";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-1c3ad59bd98ee430b166054030dac4c46d641e39/source.tar.gz";
hash = "sha256-pIgKBT8RUAS4oeaSot9Rvy4FpYVHeG3oeaBM0rsJg+k=";
};
}
{
name = "cbor-1.0.0-RcQE_HvqAACcrLH7t3IDZOshgY2xqJA_UX330MvwSepb";
path = fetchZigArtifact {
name = "cbor";
url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz";
hash = "sha256-c0wlwa+jdqC2b2CfbLsb/l3vXVBnK7WkzUH7F49xqic=";
};
}
{
name = "flags-0.8.0-AAAAAJV0AACuGBBnpUnHqZzAhoGTp4ibFROBQQQZGRqx";
path = fetchZigArtifact {
name = "flags";
url = "https://github.com/n0s4/flags/archive/b3905aa990719ff567f1c5a2f89e6dd3292d8533.tar.gz";
hash = "sha256-2lN2goQgjU5Hf18tvDV/csS83A20nA9Iu2/fKXtpZok=";
url = "https://github.com/n0s4/flags/archive/372501d1576b5723829bcba98e41361132c7b618.tar.gz";
hash = "sha256-PBwUqM4wTYwKyY584K0MPo5aorYflYrYi1dJm8zwI2Y=";
};
}
{
name = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f";
path = fetchZigArtifact {
name = "tracy";
url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz";
hash = "sha256-otvs9tKc8zMRFng0VJDn5iNf7lvbozjrtH0q8IFnP0w=";
};
}
{
name = "122051b30656170b4628580e571d98b1fe45d7c0d581bc2d45e894c75c6376294ede";
path = fetchZigArtifact {
name = "tracy_src";
url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz";
hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I=";
};
}
{
name = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362";
name = "dizzy-1.0.0-AAAAAM1wAAAiDbx_6RwcVEOBk8p2XOu8t9WPNc3K7kBK";
path = fetchZigArtifact {
name = "dizzy";
url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz";
@@ -121,83 +121,101 @@ linkFarm name [
};
}
{
name = "1220bbfd147f41fa49d2e5406096f3529c62e9335f4d2a89ae381e679a76ce398f1f";
name = "thespian-0.0.1-owFOjlgaBgCqc3FCnB4Xyg8-9jyIDWgHSJMGx_nt5Kcc";
path = fetchZigArtifact {
name = "thespian";
url = "https://github.com/neurocyte/thespian/archive/db3ad5f45e707a04eaa51aa657995abe43ce967a.tar.gz";
hash = "sha256-La5pv08xPAnkNxBHjpTmLpKxrcifRFWcqm8NYp92iRA=";
url = "https://github.com/neurocyte/thespian/archive/ccdcbbff09f945eec063ebf889581db3e1312107.tar.gz";
hash = "sha256-qY/9CVgD6btprY4alo5/21EBJ9ORIivlcKY8wPPHa4k=";
};
}
{
name = "1220c85e0d9438ec518849c84e3ea66633a0e191e49c4ae4bbb3bc46626cd8dfad75";
name = "cbor-1.0.0-RcQE_GDyAABovyRXoYFX8zD_NVOLGDc9l5g09-W-svMR";
path = fetchZigArtifact {
name = "cbor";
url = "https://github.com/neurocyte/cbor/archive/5ea4b7319146f29bb1aa9acf65982feaba9edc3d.tar.gz";
hash = "sha256-0QN34UG28U3lnlb9sVWV6otrpHBN2Kv2GZwZ3BYz2GQ=";
};
}
{
name = "asio-1.30.2-tLhDdyKA4QBqQFDrsuK_hO1HfqX-DQMl-Sku7yy4vUfM";
path = fetchZigArtifact {
name = "asio";
url = "https://github.com/neurocyte/asio/archive/b9c9c23ef2e6f11b6123535ec33e5a23ed0c59da.tar.gz";
hash = "sha256-tD9lxE6RRAptBE9suZA4ANpT5x/B3e4YINay9Se78XY=";
url = "https://github.com/neurocyte/asio/archive/24d28864ec5aae6146d88a172288e3bf3f099734.tar.gz";
hash = "sha256-CPU+Ka5V+2ooaY8kfKM9q1AjJ11rujHFFnCjyn5hZFo=";
};
}
{
name = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b";
name = "zig_tracy-0.0.3-5-cp3JZ2AAC6j-gWFhPKXyF6WASJpCzQeNy7Bi712t1a";
path = fetchZigArtifact {
name = "tracy";
url = "https://github.com/neurocyte/zig-tracy/archive/82f18a661af17089198fb7c489ef253f02b939b5.tar.gz";
hash = "sha256-87iK+rmBvZY70c8ypqgtRgw5YWoahZ0ss+0HDzdQgaM=";
};
}
{
name = "N-V-__8AAO2QjgFRswZWFwtGKFgOVx2Ysf5F18DVgbwtReiU";
path = fetchZigArtifact {
name = "tracy_src";
url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz";
hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I=";
};
}
{
name = "N-V-__8AAJiAIgDMVIi8CRb_xko9_qVQ-UiQzd5FTBBr0aPa";
path = fetchZigArtifact {
name = "themes";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz";
hash = "sha256-xy0cTVc85U6JpI+oca2XKXE7GAs0EId21DeQCDa8+n0=";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-952f9f630ea9544088fd30293666ee0650b7a690/flow-themes.tar.gz";
hash = "sha256-yFgIYMmdYoqnysAZ4MaawFAtAJk0ktXXD0IR287LTYw=";
};
}
{
name = "122019f077d09686b1ec47928ca2b4bf264422f3a27afc5b49dafb0129a4ceca0d01";
name = "fuzzig-0.1.1-AAAAALNIAQBmbHr-MPalGuR393Vem2pTQXI7_LXeNJgX";
path = fetchZigArtifact {
name = "fuzzig";
url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz";
hash = "sha256-XVOKqHX2X8HvRDJgnqVEPN/A0hFvCk8Fgsss0CKInYQ=";
url = "https://github.com/fjebaker/fuzzig/archive/44c04733c7c0fee3db83672aaaaf4ed03e943156.tar.gz";
hash = "sha256-wGcJpiW0unNSgX5i9sNuUyqKVFDECcadN7dgbx/SKVg=";
};
}
{
name = "12207e33747072d878fce61f587c133124dc95f4ae8aab7d2b3f467699586af07c77";
name = "vaxis-0.1.0-BWNV_HwOCQCw5wTV63hQGSc1QJzsNcytH6sGf1GBc0hP";
path = fetchZigArtifact {
name = "vaxis";
url = "https://github.com/neurocyte/libvaxis/archive/d899244bc0a3775b59c18e90eb41acee11675f96.tar.gz";
hash = "sha256-8bK0zM6rD/mqTaHDZKMgS3+qV1VviImM9jr9D0lkPdw=";
url = "https://github.com/neurocyte/libvaxis/archive/6137cb4c44a7350996f0946a069739e5075d1f23.tar.gz";
hash = "sha256-EVvjwYTIw6SKeqqGHNMm9zRVgpo+TRjtrUl1Mg8tJ8M=";
};
}
{
name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
name = "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj";
path = fetchZigArtifact {
name = "zigimg";
url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e";
hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
url = "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d";
hash = "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0=";
rev = "31268548fe3276c0e95f318a6c0d2ab10565b58d";
};
}
{
name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
name = "zg-0.14.0-oGqU3KEFswIffnDu8eAE2XlhzwcfgjwtM6akIc5L7cEV";
path = fetchZigArtifact {
name = "zg";
url = "https://github.com/neurocyte/zg/archive/refs/tags/v0.13.2.tar.gz";
hash = "sha256-Hd8HlYEkkA/2BLW+4d/0Ibw7r7U533us3n2QR+XG/PQ=";
url = "git+https://codeberg.org/atman/zg#0b05141b033043c5f7bcd72048a48eef6531ea6c";
hash = "sha256-PLntlktC5RI4CN88oo5+0CliUu4b4O65Ubf6jr8U9xY=";
rev = "0b05141b033043c5f7bcd72048a48eef6531ea6c";
};
}
{
name = "1220755ea2a5aa6bb3713437aaafefd44812169fe43f1da755c3ee6101b85940f441";
name = "zeit-0.0.0-AAAAACVbAgAiIzg1rccZU1qOfO_dKQKme7-37xmEQcqc";
path = fetchZigArtifact {
name = "zeit";
url = "https://github.com/rockorager/zeit/archive/9cca8ec620a54c3b07cd249f25e5bcb3153d03d7.tar.gz";
hash = "sha256-4bxyQKbVUtYzZixUq2d+iiSPGkcwg+dG4WLaDYYQzn8=";
url = "https://github.com/rockorager/zeit/archive/8fd203f85f597f16e0a525c1f1ca1e0bffded809.tar.gz";
hash = "sha256-2UIdeG6QTZoLL6NkUQIvaO+O6xpoy9nWhua/5Qyv4To=";
};
}
{
name = "1220925614447b54ccc9894bbba8b202c6a8b750267890edab7732064867e46f3217";
name = "zigwin32-25.0.28-preview-AAAAAEEl_AMhnKSs-lgEyjmUX5JVTpNQewd8A2Bbekwc";
path = fetchZigArtifact {
name = "win32";
url = "https://github.com/marlersoft/zigwin32/archive/259b6f353a48968d7e3171573db4fd898b046188.tar.gz";
hash = "sha256-N9Jp2vmq1+xPWByb+VZkbS2lm9FCrUW4UBAPhSP+dUw=";
};
}
{
name = "1220f9702ca6257f5464b31e576b1e92b0f441bf0e61733c4a2fbf95b7c0c55a3e22";
path = fetchZigArtifact {
name = "tree-sitter";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-69775ce3ba8a5e331bba9feb760d1ba31394eea7/source.tar.gz";
hash = "sha256-0ZLcPuhUV6Z3EsXfU7gXRrG/nRP9zuLRSL00Q5OGnus=";
url = "https://github.com/marlersoft/zigwin32/archive/e8739b32a33ce48a3286aba31918b26a9dfc6ef0.tar.gz";
hash = "sha256-WSN9jOkey4dzLnhT68tOJyfnws/Ki7fnb4W+LDrPLwc=";
};
}
]
pkgs/by-name/fl/flow-control/package.nix
+5 -5
View File
@@ -2,30 +2,30 @@
lib,
fetchFromGitHub,
stdenv,
zig_0_13,
zig_0_14,
callPackage,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "flow-control";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "neurocyte";
repo = "flow";
tag = "v${finalAttrs.version}";
hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
hash = "sha256-I7wty82zyuwZjzhfUBPd+7sx20cmRpQt1V6eCK7o0oQ=";
};
postPatch = ''
ln -s ${
callPackage ./build.zig.zon.nix {
zig = zig_0_13;
zig = zig_0_14;
}
} $ZIG_GLOBAL_CACHE_DIR/p
'';
nativeBuildInputs = [
zig_0_13.hook
zig_0_14.hook
];
passthru.updateScript = ./update.sh;
pkgs/by-name/fl/flow-control/update.sh
+6 -5
View File
@@ -1,19 +1,20 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash common-updater-scripts gnused
#!nix-shell -i bash -p bash wget common-updater-scripts gnused
latest_tag=$(list-git-tags --url=https://github.com/neurocyte/flow | sed 's/^v//' | tail -n 1)
update-source-version flow-editor "$latest_tag"
update-source-version flow-control "$latest_tag"
mkdir -p src/syntax
wget "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/build.zig.zon"
wget -P src/syntax "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/src/syntax/build.zig.zon"
nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/fl/flow-editor/build.zig.zon.nix
nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon
mv build.zig.zon.nix pkgs/by-name/fl/flow-control/build.zig.zon.nix
# strip file protocol
sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-editor/build.zig.zon.nix
nixfmt pkgs/by-name/fl/flow-editor/build.zig.zon.nix
sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-control/build.zig.zon.nix
nixfmt pkgs/by-name/fl/flow-control/build.zig.zon.nix
rm -rf build.zig.zon build.zig.zon2json-lock src/
pkgs/by-name/fn/fna3d/package.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = "https://fna-xna.github.io/";
license = lib.licenses.mspl;
platforms = lib.platforms.linux;
mainProgram = pname;
mainProgram = "fna3d";
maintainers = with lib.maintainers; [ mrtnvgr ];
};
}
pkgs/by-name/fo/forgejo/package.nix
+2 -2
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "12.0.0";
hash = "sha256-8cokjK9fbxd9lm+5oDoMll9f7ejiVzMNuDgC0Pk1pbM=";
version = "12.0.1";
hash = "sha256-MBk5QHjnyMXmQDIbMuehjcGN/PUN1ViRtIi1pJGHlW0=";
npmDepsHash = "sha256-kq2AV1D0xA4Csm8XUTU5D0iCmyuajcnwlLdPjJ/mj1g=";
vendorHash = "sha256-B9menPCDUOYHPCS0B5KpxuE03FdFXmA8XqkiYEAxs5Y=";
lts = false;
pkgs/by-name/fr/frr/package.nix
+1 -1
View File
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "FRRouting";
repo = "frr";
rev = "frr-${finalAttrs.version}";
hash = "sha256-62+WTabM+gx8CJDAb7LnTG45B1jcpWTTEouiQW3q468=";
hash = "sha256-p+pjWsWk/x1pdyp1zbT0GQUKnW1DprHcJLpg7t746Lc=";
};
# Without the std explicitly set, we may run into abseil-cpp
pkgs/by-name/fu/fuc/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fuc";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "SUPERCILEX";
repo = "fuc";
tag = finalAttrs.version;
hash = "sha256-VHIR/hw++Zv1IWzx45B7PTK0Jyzt1QqzM+Bj6CBAh1A=";
hash = "sha256-fDSAqsKEx+th4tiJ3VlROqF4hhHzusqiw9enAmnOPlQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-xYpxrg8RWDW3RBvHRafrSh7gEB6qGGGxl/QRM1rtZJY=";
cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc=";
RUSTC_BOOTSTRAP = 1;
pkgs/by-name/fx/fx/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "fx";
version = "37.0.1";
version = "38.0.0";
src = fetchFromGitHub {
owner = "antonmedv";
repo = "fx";
tag = finalAttrs.version;
hash = "sha256-n2Jaw8ffRnMQ89OsV5HhRGkjD3n8p49N2jYyx3SUrjU=";
hash = "sha256-9g9xtnmM3ANsvfxqE8pMTxiiUj+uQadhBooRQYKQpTg=";
};
vendorHash = "sha256-yVAoswClpf5+1nwLyrLKLYFt9Noh2HRemif1e1nWm7M=";
pkgs/by-name/ga/gale/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gale";
version = "1.8.6";
version = "1.9.1";
src = fetchFromGitHub {
owner = "Kesomannen";
repo = "gale";
tag = finalAttrs.version;
hash = "sha256-5xUBW9Owyeet8Jyc+7TQr6XQTbkopbJLeyI5c35iqr0=";
hash = "sha256-43vp2y+cZFIh9SDWFr0ndOLBsdGDiwW1qn77G+/JWpo=";
};
postPatch = ''
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-6yWRl9WAPJoqoXm0kLfZhEf7AYD6J//FlOmDxzeknFo=";
cargoHash = "sha256-1kIPNLoM4HYir2o04u+xkmKJTOEle2WTUm2446n2wiE=";
nativeBuildInputs = [
jq
pkgs/by-name/ga/gatekeeper/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.19.3";
version = "3.20.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
tag = "v${version}";
hash = "sha256-FQ5Q9S/YvJQaa2mUWXv8huTK89SZ31UaFbBCEduGsyg=";
hash = "sha256-7DJWqm51eRGYTES2x05D2JSJwaaHiXgH4uq31nOIXIs=";
};
vendorHash = null;
pkgs/by-name/ge/geesefs/package.nix
+2 -2
View File
@@ -5,7 +5,7 @@
}:
let
version = "0.43.0";
version = "0.43.1";
in
buildGoModule {
pname = "geesefs";
@@ -15,7 +15,7 @@ buildGoModule {
owner = "yandex-cloud";
repo = "geesefs";
rev = "v${version}";
hash = "sha256-KkKdqSev6xpYfEjDSLVs/gKc3NCvLrzukNEQT2Wuk+A=";
hash = "sha256-BJOhQRIvURz0UL/InSZwU/kdq/Ha0Idsqa0UZGf9aTU=";
};
# hashes differ per architecture otherwise.
pkgs/by-name/gh/ghost-cli/package.nix
+3 -3
View File
@@ -11,18 +11,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ghost-cli";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "TryGhost";
repo = "Ghost-CLI";
tag = "v${finalAttrs.version}";
hash = "sha256-xOchKEktagamLJQONI9SJsv5vypVpBOAy/SWGdSzjLc=";
hash = "sha256-ka+fqfUw6SSixrSHV2rbFsAqEM2f/yTQNcGONJKTRMc=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-Dgy+Ab0OaapjuuuRMcfHtzpsrfI5uPItXDY4XE9iK3A=";
hash = "sha256-SaekfV1QZw6PIJm8GtyjZmCSNIc0aXolz1mEyTwVERM=";
};
nativeBuildInputs = [
pkgs/by-name/gi/git-spice/package.nix
+12 -3
View File
@@ -10,13 +10,13 @@
buildGo124Module rec {
pname = "git-spice";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
tag = "v${version}";
hash = "sha256-mx34JGgY6qKhPdZVs1Z9gVO/VhHnFrl6TThq5dEz/zc=";
hash = "sha256-vpBQdkP5jC3glGykLCd3/df4Lhi0MeU0XLnlTNDp1bM=";
};
vendorHash = "sha256-uh4GUkfWo12pYQD/Mpw+EWwmukHUpxOii7DTu6C84zo=";
@@ -37,7 +37,16 @@ buildGo124Module rec {
__darwinAllowLocalNetworking = true;
preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
preCheck = ''
# timeout on both aarch64-darwin and x86_64-linux
rm testdata/script/issue725_pre_push_hook_worktree.txt
# failing on both aarch64-darwin and x86_64-linux
# TODO: check if this still fails after next release
rm testdata/script/branch_restack_conflict_no_edit.txt
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
# timeout
rm testdata/script/branch_submit_remote_prompt.txt
rm testdata/script/branch_submit_multiple_pr_templates.txt
pkgs/by-name/gn/gnome-notes/package.nix
+9 -2
View File
@@ -19,7 +19,7 @@
libuuid,
curl,
libhandy,
webkitgtk_4_0,
webkitgtk_4_1,
gnome,
adwaita-icon-theme,
libxml2,
@@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch";
hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4=";
})
# build: Depend on webkit2gtk-4.1
# https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/200
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/0791507873c96d0463cd0c83108415541f854edd.patch";
hash = "sha256-TwCi9sDudeiOjrH2VevAynxvy/WTmwB2HrWqhviPg8o=";
})
];
doCheck = true;
@@ -71,7 +78,7 @@ stdenv.mkDerivation rec {
libuuid
curl
libhandy
webkitgtk_4_0
webkitgtk_4_1
tinysparql
gnome-online-accounts
gsettings-desktop-schemas
pkgs/by-name/gn/gnucash/package.nix
+23 -8
View File
@@ -10,6 +10,7 @@
gettext,
glib,
glibcLocales,
gobject-introspection,
gtest,
guile,
gwenhywfar,
@@ -24,12 +25,17 @@
perlPackages,
pkg-config,
swig,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
python3,
replaceVars,
}:
let
py = python3.withPackages (
ps: with ps; [
pygobject3.out
]
);
in
stdenv.mkDerivation rec {
pname = "gnucash";
version = "5.11";
@@ -43,6 +49,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
gettext
gobject-introspection
makeWrapper
wrapGAppsHook3
pkg-config
@@ -69,8 +76,8 @@ stdenv.mkDerivation rec {
libxml2
libxslt
swig
webkitgtk_4_0
python3
webkitgtk_4_1
py
]
++ (with perlPackages; [
JSONParse
@@ -151,11 +158,16 @@ stdenv.mkDerivation rec {
# Perl wrapping
dontWrapGApps = true;
# gnucash is wrapped using the args constructed for wrapGAppsHook3.
# We could not find the python entrypoint and somehow it is used from PATH,
# so force to use the one with all dependencies
# gnc-fq-* are cli utils written in Perl hence the extra wrapping
postFixup = ''
wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}"
wrapProgram $out/bin/gnucash-cli "''${gappsWrapperArgs[@]}"
wrapProgram $out/bin/gnucash \
--prefix PATH : ${lib.makeBinPath [ py ]} \
"''${gappsWrapperArgs[@]}"
wrapProgram $out/bin/gnucash-cli \
--prefix PATH : ${lib.makeBinPath [ py ]} \
"''${gappsWrapperArgs[@]}"
wrapProgram $out/bin/finance-quote-wrapper \
--prefix PERL5LIB : "${
@@ -165,6 +177,9 @@ stdenv.mkDerivation rec {
FinanceQuote
]
}"
chmod +x $out/share/gnucash/python/pycons/*.py
patchShebangs $out/share/gnucash/python/pycons/*.py
'';
passthru.updateScript = ./update.sh;

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