movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-03-27 12:07:01 +00:00 • committed by GitHub
commit 9f7eb43375
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
127 changed files with 1811 additions and 1740 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/release-notes/rl-2505.section.md
View file

@ -54,6 +54,11 @@
- Default ICU version updated from 74 to 76
- Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates
entirely without Apache ZooKeeper support, and all clusters need to be migrated to KRaft mode. See
the [release announcement](https://kafka.apache.org/blog#apache_kafka_400_release_announcement)
for more details.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}

6
maintainers/maintainer-list.nix
View file

@ -6695,6 +6695,12 @@
githubId = 424946;
name = "James Earl Douglas";
};
EarthGman = {
email = "earthgman@protonmail.com";
name = "EarthGman";
github = "EarthGman";
githubId = 117403037;
};
EBADBEEF = {
name = "EBADBEEF";
email = "errno@ebadf.com";

8
nixos/modules/config/xdg/portals/lxqt.nix
View file

@ -27,10 +27,10 @@ in
default = [ ];
example = lib.literalExpression ''
[
pkgs.libsForQt5.qtstyleplugin-kvantum
pkgs.breeze-qt5
pkgs.qtcurve
];
pkgs.libsForQt5.qtstyleplugin-kvantum
pkgs.breeze-qt5
pkgs.qtcurve
];
'';
description = ''
Extra Qt styles that will be available to the

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

@ -509,7 +509,7 @@ in {
guacamole-server = handleTest ./guacamole-server.nix {};
guix = handleTest ./guix {};
gvisor = handleTest ./gvisor.nix {};
h2o = discoverTests (import ./web-servers/h2o { inherit handleTestOn; });
h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; };
hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };
hadoop_3_3 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_3; };
hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; };

12
nixos/tests/kafka.nix
View file

@ -6,7 +6,7 @@
with pkgs.lib;
let
makeKafkaTest = name: { kafkaPackage, mode ? "zookeeper" }: (import ./make-test-python.nix ({
makeKafkaTest = name: { kafkaPackage, mode ? "kraft" }: (import ./make-test-python.nix ({
inherit name;
meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
@ -92,7 +92,7 @@ let
kafka.succeed(
"echo 'test 1' | "
+ "${kafkaPackage}/bin/kafka-console-producer.sh "
+ "--broker-list localhost:9092 --topic testtopic"
+ "--bootstrap-server localhost:9092 --topic testtopic"
)
assert "test 1" in kafka.succeed(
"${kafkaPackage}/bin/kafka-console-consumer.sh "
@ -103,9 +103,9 @@ let
}) { inherit system; });
in with pkgs; {
kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; };
kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; };
kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; };
kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; mode = "zookeeper"; };
kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; mode = "zookeeper"; };
kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; mode = "zookeeper"; };
kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; };
kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };
kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; };
}

227
nixos/tests/web-servers/h2o/basic.nix
View file

@ -1,137 +1,142 @@
import ../../make-test-python.nix (
{ lib, pkgs, ... }:
{ hostPkgs, lib, ... }:
# Tests basics such as TLS, creating a mime-type & serving Unicode characters.
# Tests basics such as TLS, creating a mime-type & serving Unicode characters.
let
domain = {
HTTP = "h2o.local";
TLS = "acme.test";
};
let
domain = {
HTTP = "h2o.local";
TLS = "acme.test";
};
port = {
HTTP = 8080;
TLS = 8443;
};
port = {
HTTP = 8080;
TLS = 8443;
};
sawatdi_chao_lok = "สวัสดีชาวโลก";
sawatdi_chao_lok = "สวัสดีชาวโลก";
hello_world_txt = pkgs.writeTextFile {
name = "/hello_world.txt";
text = sawatdi_chao_lok;
};
hello_world_txt = hostPkgs.writeTextFile {
name = "/hello_world.txt";
text = sawatdi_chao_lok;
};
hello_world_rst = pkgs.writeTextFile {
name = "/hello_world.rst";
text = # rst
''
====================
Thaiger Sprint 2025‼
====================
hello_world_rst = hostPkgs.writeTextFile {
name = "/hello_world.rst";
text = # rst
''
====================
Thaiger Sprint 2025‼
====================
${sawatdi_chao_lok}
'';
};
in
{
name = "h2o-basic";
${sawatdi_chao_lok}
'';
};
in
{
name = "h2o-basic";
meta = {
maintainers = with lib.maintainers; [ toastal ];
};
meta = {
maintainers = with lib.maintainers; [ toastal ];
};
nodes = {
server =
{ pkgs, ... }:
{
services.h2o = {
enable = true;
defaultHTTPListenPort = port.HTTP;
defaultTLSListenPort = port.TLS;
hosts = {
"${domain.HTTP}" = {
settings = {
paths = {
"/hello_world.txt" = {
"file.file" = "${hello_world_txt}";
};
};
};
};
"${domain.TLS}" = {
tls = {
policy = "force";
identity = [
{
key-file = ../../common/acme/server/acme.test.key.pem;
certificate-file = ../../common/acme/server/acme.test.cert.pem;
}
];
extraSettings = {
minimum-version = "TLSv1.3";
};
};
settings = {
paths = {
"/hello_world.rst" = {
"file.file" = "${hello_world_rst}";
};
nodes = {
server =
{ pkgs, ... }:
{
services.h2o = {
enable = true;
defaultHTTPListenPort = port.HTTP;
defaultTLSListenPort = port.TLS;
hosts = {
"${domain.HTTP}" = {
settings = {
paths = {
"/hello_world.txt" = {
"file.file" = "${hello_world_txt}";
};
};
};
};
settings = {
compress = "ON";
compress-minimum-size = 32;
"file.mime.addtypes" = {
"text/x-rst" = {
extensions = [ ".rst" ];
is_compressible = "YES";
"${domain.TLS}" = {
tls = {
policy = "force";
identity = [
{
key-file = ../../common/acme/server/acme.test.key.pem;
certificate-file = ../../common/acme/server/acme.test.cert.pem;
}
];
extraSettings = {
minimum-version = "TLSv1.3";
};
};
settings = {
paths = {
"/hello_world.rst" = {
"file.file" = "${hello_world_rst}";
};
};
};
ssl-offload = "kernel";
};
};
security.pki.certificates = [
(builtins.readFile ../../common/acme/server/ca.cert.pem)
];
networking = {
firewall.allowedTCPPorts = with port; [
HTTP
TLS
];
extraHosts = ''
127.0.0.1 ${domain.HTTP}
127.0.0.1 ${domain.TLS}
'';
settings = {
compress = "ON";
compress-minimum-size = 32;
"file.mime.addtypes" = {
"text/x-rst" = {
extensions = [ ".rst" ];
is_compressible = "YES";
};
};
ssl-offload = "kernel";
};
};
};
testScript = # python
''
server.wait_for_unit("h2o.service")
security.pki.certificates = [
(builtins.readFile ../../common/acme/server/ca.cert.pem)
];
http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${builtins.toString port.HTTP}/hello_world.txt'")
assert "${sawatdi_chao_lok}" in http_hello_world_body
networking = {
firewall.allowedTCPPorts = with port; [
HTTP
TLS
];
extraHosts = ''
127.0.0.1 ${domain.HTTP}
127.0.0.1 ${domain.TLS}
'';
};
};
};
tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'").lower()
assert "http/2 200" in tls_hello_world_head
assert "server: h2o" in tls_hello_world_head
assert "content-type: text/x-rst" in tls_hello_world_head
testScript =
let
portStrHTTP = builtins.toString port.HTTP;
portStrTLS = builtins.toString port.TLS;
in
# python
''
server.wait_for_unit("h2o.service")
server.wait_for_open_port(${portStrHTTP})
server.wait_for_open_port(${portStrTLS})
tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'")
assert "${sawatdi_chao_lok}" in tls_hello_world_body
http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${portStrHTTP}/hello_world.txt'")
assert "${sawatdi_chao_lok}" in http_hello_world_body
tls_hello_world_head_redirected = server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'").lower()
assert "redirected" in tls_hello_world_head_redirected
tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower()
assert "http/2 200" in tls_hello_world_head
assert "server: h2o" in tls_hello_world_head
assert "content-type: text/x-rst" in tls_hello_world_head
server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'")
tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'")
assert "${sawatdi_chao_lok}" in tls_hello_world_body
tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'")
assert "${sawatdi_chao_lok}" in tls_hello_world_body_redirected
'';
}
)
tls_hello_world_head_redirected = server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'").lower()
assert "redirected" in tls_hello_world_head_redirected
server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'")
assert "${sawatdi_chao_lok}" in tls_hello_world_body_redirected
'';
}

20
nixos/tests/web-servers/h2o/default.nix
View file

@ -1,17 +1,7 @@
{
system ? builtins.currentSystem,
handleTestOn,
}:
{ recurseIntoAttrs, runTest }:
let
supportedSystems = [
"x86_64-linux"
"i686-linux"
"aarch64-linux"
];
in
{
basic = handleTestOn supportedSystems ./basic.nix { inherit system; };
mruby = handleTestOn supportedSystems ./mruby.nix { inherit system; };
tls-recommendations = handleTestOn supportedSystems ./tls-recommendations.nix { inherit system; };
recurseIntoAttrs {
basic = runTest ./basic.nix;
mruby = runTest ./mruby.nix;
tls-recommendations = runTest ./tls-recommendations.nix;
}

103
nixos/tests/web-servers/h2o/mruby.nix
View file

@ -1,64 +1,67 @@
import ../../make-test-python.nix (
{ lib, pkgs, ... }:
{ lib, ... }:
let
domain = "h2o.local";
let
domain = "h2o.local";
port = 8080;
port = 8080;
sawatdi_chao_lok = "สวัสดีชาวโลก";
in
{
name = "h2o-mruby";
sawatdi_chao_lok = "สวัสดีชาวโลก";
in
{
name = "h2o-mruby";
meta = {
maintainers = with lib.maintainers; [ toastal ];
};
meta = {
maintainers = with lib.maintainers; [ toastal ];
};
nodes = {
server =
{ pkgs, ... }:
{
services.h2o = {
enable = true;
package = pkgs.h2o.override { withMruby = true; };
settings = {
listen = port;
hosts = {
"${domain}" = {
paths = {
"/hello_world" = {
"mruby.handler" = # ruby
''
Proc.new do |env|
[200, {'content-type' => 'text/plain'}, ["${sawatdi_chao_lok}"]]
end
'';
};
"/file_handler" = {
"mruby.handler-file" = ./file_handler.rb;
};
nodes = {
server =
{ pkgs, ... }:
{
services.h2o = {
enable = true;
package = pkgs.h2o.override { withMruby = true; };
settings = {
listen = port;
hosts = {
"${domain}" = {
paths = {
"/hello_world" = {
"mruby.handler" = # ruby
''
Proc.new do |env|
[200, {'content-type' => 'text/plain'}, ["${sawatdi_chao_lok}"]]
end
'';
};
"/file_handler" = {
"mruby.handler-file" = ./file_handler.rb;
};
};
};
};
};
networking.extraHosts = ''
127.0.0.1 ${domain}
'';
};
};
testScript = # python
''
server.wait_for_unit("h2o.service")
networking.extraHosts = ''
127.0.0.1 ${domain}
'';
};
};
hello_world = server.succeed("curl --fail-with-body http://${domain}:${builtins.toString port}/hello_world")
assert "${sawatdi_chao_lok}" in hello_world
testScript =
let
portStr = builtins.toString port;
in
# python
''
server.wait_for_unit("h2o.service")
server.wait_for_open_port(${portStr})
file_handler = server.succeed("curl --fail-with-body http://${domain}:${builtins.toString port}/file_handler")
assert "FILE_HANDLER" in file_handler
'';
}
)
hello_world = server.succeed("curl --fail-with-body http://${domain}:${portStr}/hello_world")
assert "${sawatdi_chao_lok}" in hello_world
file_handler = server.succeed("curl --fail-with-body http://${domain}:${portStr}/file_handler")
assert "FILE_HANDLER" in file_handler
'';
}

201
nixos/tests/web-servers/h2o/tls-recommendations.nix
View file

@ -1,115 +1,116 @@
import ../../make-test-python.nix (
{ lib, pkgs, ... }:
{ hostPkgs, lib, ... }:
let
domain = "acme.test";
port = 8443;
let
domain = "acme.test";
port = 8443;
hello_txt =
name:
pkgs.writeTextFile {
name = "/hello_${name}.txt";
text = "Hello, ${name}!";
};
hello_txt =
name:
hostPkgs.writeTextFile {
name = "/hello_${name}.txt";
text = "Hello, ${name}!";
};
mkH2OServer =
recommendations:
{ pkgs, lib, ... }:
{
services.h2o = {
enable = true;
package = pkgs.h2o.override (
lib.optionalAttrs
(builtins.elem recommendations [
"intermediate"
"old"
])
{
openssl = pkgs.openssl_legacy;
}
);
defaultTLSRecommendations = "modern"; # prove overridden
hosts = {
"${domain}" = {
tls = {
inherit port recommendations;
policy = "force";
identity = [
{
key-file = ../../common/acme/server/acme.test.key.pem;
certificate-file = ../../common/acme/server/acme.test.cert.pem;
}
];
};
settings = {
paths."/"."file.file" = "${hello_txt recommendations}";
};
mkH2OServer =
recommendations:
{ pkgs, lib, ... }:
{
services.h2o = {
enable = true;
package = pkgs.h2o.override (
lib.optionalAttrs
(builtins.elem recommendations [
"intermediate"
"old"
])
{
openssl = pkgs.openssl_legacy;
}
);
defaultTLSRecommendations = "modern"; # prove overridden
hosts = {
"${domain}" = {
tls = {
inherit port recommendations;
policy = "force";
identity = [
{
key-file = ../../common/acme/server/acme.test.key.pem;
certificate-file = ../../common/acme/server/acme.test.cert.pem;
}
];
};
settings = {
paths."/"."file.file" = "${hello_txt recommendations}";
};
};
settings = {
ssl-offload = "kernel";
};
};
security.pki.certificates = [
(builtins.readFile ../../common/acme/server/ca.cert.pem)
];
networking = {
firewall.allowedTCPPorts = [ port ];
extraHosts = "127.0.0.1 ${domain}";
settings = {
ssl-offload = "kernel";
};
};
in
{
name = "h2o-tls-recommendations";
meta = {
maintainers = with lib.maintainers; [ toastal ];
security.pki.certificates = [
(builtins.readFile ../../common/acme/server/ca.cert.pem)
];
networking = {
firewall.allowedTCPPorts = [ port ];
extraHosts = "127.0.0.1 ${domain}";
};
};
in
{
name = "h2o-tls-recommendations";
nodes = {
server_modern = mkH2OServer "modern";
server_intermediate = mkH2OServer "intermediate";
server_old = mkH2OServer "old";
};
meta = {
maintainers = with lib.maintainers; [ toastal ];
};
testScript =
let
portStr = builtins.toString port;
in
# python
''
curl_basic = "curl -v --tlsv1.3 --http2 'https://${domain}:${portStr}/'"
curl_head = "curl -v --head 'https://${domain}:${portStr}/'"
curl_max_tls1_2 ="curl -v --tlsv1.0 --tls-max 1.2 'https://${domain}:${portStr}/'"
curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:${portStr}/'"
curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:${portStr}/'"
nodes = {
server_modern = mkH2OServer "modern";
server_intermediate = mkH2OServer "intermediate";
server_old = mkH2OServer "old";
};
server_modern.wait_for_unit("h2o.service")
modern_response = server_modern.succeed(curl_basic)
assert "Hello, modern!" in modern_response
modern_head = server_modern.succeed(curl_head)
assert "strict-transport-security" in modern_head
server_modern.fail(curl_max_tls1_2)
testScript =
let
portStr = builtins.toString port;
in
# python
''
curl_basic = "curl -v --tlsv1.3 --http2 'https://${domain}:${portStr}/'"
curl_head = "curl -v --head 'https://${domain}:${portStr}/'"
curl_max_tls1_2 ="curl -v --tlsv1.0 --tls-max 1.2 'https://${domain}:${portStr}/'"
curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:${portStr}/'"
curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:${portStr}/'"
server_intermediate.wait_for_unit("h2o.service")
intermediate_response = server_intermediate.succeed(curl_basic)
assert "Hello, intermediate!" in intermediate_response
intermediate_head = server_modern.succeed(curl_head)
assert "strict-transport-security" in intermediate_head
server_intermediate.succeed(curl_max_tls1_2)
server_intermediate.succeed(curl_max_tls1_2_intermediate_cipher)
server_intermediate.fail(curl_max_tls1_2_old_cipher)
server_modern.wait_for_unit("h2o.service")
server_modern.wait_for_open_port(${portStr})
modern_response = server_modern.succeed(curl_basic)
assert "Hello, modern!" in modern_response
modern_head = server_modern.succeed(curl_head)
assert "strict-transport-security" in modern_head
server_modern.fail(curl_max_tls1_2)
server_old.wait_for_unit("h2o.service")
old_response = server_old.succeed(curl_basic)
assert "Hello, old!" in old_response
old_head = server_modern.succeed(curl_head)
assert "strict-transport-security" in old_head
server_old.succeed(curl_max_tls1_2)
server_old.succeed(curl_max_tls1_2_intermediate_cipher)
server_old.succeed(curl_max_tls1_2_old_cipher)
'';
}
)
server_intermediate.wait_for_unit("h2o.service")
server_intermediate.wait_for_open_port(${portStr})
intermediate_response = server_intermediate.succeed(curl_basic)
assert "Hello, intermediate!" in intermediate_response
intermediate_head = server_modern.succeed(curl_head)
assert "strict-transport-security" in intermediate_head
server_intermediate.succeed(curl_max_tls1_2)
server_intermediate.succeed(curl_max_tls1_2_intermediate_cipher)
server_intermediate.fail(curl_max_tls1_2_old_cipher)
server_old.wait_for_unit("h2o.service")
server_old.wait_for_open_port(${portStr})
old_response = server_old.succeed(curl_basic)
assert "Hello, old!" in old_response
old_head = server_modern.succeed(curl_head)
assert "strict-transport-security" in old_head
server_old.succeed(curl_max_tls1_2)
server_old.succeed(curl_max_tls1_2_intermediate_cipher)
server_old.succeed(curl_max_tls1_2_old_cipher)
'';
}

2
pkgs/applications/editors/retext/default.nix
View file

@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication rec {
cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
--replace-fail "Exec=ReText-${version}.data/scripts/retext %F" "Exec=retext %F" \
--replace-fail "Exec=retext-${version}.data/scripts/retext %F" "Exec=retext %F" \
--replace-fail "Icon=./ReText/icons/retext.svg" "Icon=retext"
'';

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

File diff suppressed because it is too large Load diff

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

@ -27,12 +27,12 @@
};
angular = buildGrammar {
language = "angular";
version = "0.0.0+rev=cba2889";
version = "0.0.0+rev=be53f25";
src = fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "cba288924f4832abb619c627539f111004ff22e5";
hash = "sha256-ZYBmTu6wNDBMBE/nFrNZdNX2o4uG+4wFIA1XBT4rgCA=";
rev = "be53f2597dded40c90b5f53ed9f4521422f6b6b3";
hash = "sha256-gs28MvuPz9hYUSeyObj1QE7n5CDa1+T1+CsDdE8xZLM=";
};
meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
};
@ -224,6 +224,17 @@
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
caddy = buildGrammar {
language = "caddy";
version = "0.0.0+rev=2686186";
src = fetchFromGitHub {
owner = "opa-oz";
repo = "tree-sitter-caddy";
rev = "2686186edb61be47960431c93a204fb249681360";
hash = "sha256-pKKx2qCqP/8JLhNebTogM24qzxh6bdX5i4mqGzTJKkw=";
};
meta.homepage = "https://github.com/opa-oz/tree-sitter-caddy";
};
cairo = buildGrammar {
language = "cairo";
version = "0.0.0+rev=6238f60";
@ -923,12 +934,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=e01c884";
version = "0.0.0+rev=99ec410";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "e01c88449b53e2ee5dad222d4020cc7006c5b700";
hash = "sha256-clkf5DxLvvDJDcNYQgAPLQYw+hz05UBdOmPK8kjlVDA=";
rev = "99ec4101504452c488b7c835fb65cfef75b090b7";
hash = "sha256-FEecjw1nYYO8U+qLjOK28qTMCO1pJkwdUDzlDvmle4c=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@ -945,23 +956,23 @@
};
glimmer_javascript = buildGrammar {
language = "glimmer_javascript";
version = "0.0.0+rev=4801ac4";
version = "0.0.0+rev=babba3f";
src = fetchFromGitHub {
owner = "NullVoxPopuli";
repo = "tree-sitter-glimmer-javascript";
rev = "4801ac4d0a611502001035f45d1cba5cb57d272f";
hash = "sha256-wK8buxg2Yil6eS4u+m/iursdx9GHcj6CTCRz1nhdCNs=";
rev = "babba3fc0c822a633261ce9e96a4d7986050eb0c";
hash = "sha256-dz0vDnOrC41URJs7OqgwaKu7MLe6dffTB66Izv25Asw=";
};
meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
};
glimmer_typescript = buildGrammar {
language = "glimmer_typescript";
version = "0.0.0+rev=c011b05";
version = "0.0.0+rev=48c6029";
src = fetchFromGitHub {
owner = "NullVoxPopuli";
repo = "tree-sitter-glimmer-typescript";
rev = "c011b053626f27a0fe5cc99eeae4185399a572f9";
hash = "sha256-vRxR86NmIVv5iO1C5xb/n8k3qaILaUnnWne5Hnszgyk=";
rev = "48c60295f1ee34ea4ed6e5177102be6d24bfc9d0";
hash = "sha256-lW0R/PMCeM5kuNJE9pyj/Gksi90jHyJ6/D49FTqMCSI=";
};
meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
};
@ -1221,12 +1232,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=b309425";
version = "0.0.0+rev=bab9111";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "b309425a7ab4456605cfe78774b80f7e275ca87d";
hash = "sha256-o8y2jZUn15kLQ9k1rftxepeyRfx4dP6Vk2Vv4MUxcOQ=";
rev = "bab9111922d53d43668fabb61869bec51bbcb915";
hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -1406,6 +1417,17 @@
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=db9589e";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "db9589e9c61cff7d7fcc207744c711b10b60a7a3";
hash = "sha256-yW2gtK7rG0bmyJL6emp4YyfKO0UEgOHLFbjAP+rmQZg=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
javascript = buildGrammar {
language = "javascript";
version = "0.0.0+rev=6fbef40";
@ -1575,12 +1597,12 @@
};
koto = buildGrammar {
language = "koto";
version = "0.0.0+rev=329b0e8";
version = "0.0.0+rev=6735114";
src = fetchFromGitHub {
owner = "koto-lang";
repo = "tree-sitter-koto";
rev = "329b0e84ef6cc6950665de4accd0bdda1601a2f1";
hash = "sha256-2TfRbqmUQlRGVRieffKg0fMzKBXzLkiHHHXQ9iZiRcs=";
rev = "673511402dfef07b25cfa43991693b8442695fc7";
hash = "sha256-PKaG5VKMP+O0QC5Wp2hxA6Q/YEbYzfw2a2L7s37yKuY=";
};
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
};
@ -1597,12 +1619,12 @@
};
lalrpop = buildGrammar {
language = "lalrpop";
version = "0.0.0+rev=a7f5ea2";
version = "0.0.0+rev=8d38e97";
src = fetchFromGitHub {
owner = "traxys";
repo = "tree-sitter-lalrpop";
rev = "a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b";
hash = "sha256-R3hGTS8g+QzpsXN+7IpqDR1fi/git8Af/OBo0S0wrW8=";
rev = "8d38e9755c05d37df8a24dadb0fc64f6588ac188";
hash = "sha256-rqJ0Zr9zxPkqux+DCSaUszqijFpc35fUB6sAPdGdt/0=";
};
meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop";
};
@ -1686,12 +1708,12 @@
};
lua = buildGrammar {
language = "lua";
version = "0.0.0+rev=68d29aa";
version = "0.0.0+rev=db16e76";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "tree-sitter-lua";
rev = "68d29aa745b68ae22cbbdb5dcb68c20232521ff6";
hash = "sha256-mE84uI5AKbLvX5CM7NvA59Z8Ux+QFdqVjZf4hi06NAM=";
rev = "db16e76558122e834ee214c8dc755b4a3edc82a9";
hash = "sha256-uJdXqlDn8F8mjh/NukpkQA6jdd7YjYOBbugzIrBb6GA=";
};
meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
};
@ -1752,24 +1774,24 @@
};
markdown = buildGrammar {
language = "markdown";
version = "0.0.0+rev=192407a";
version = "0.0.0+rev=4132852";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "192407ab5a24bfc24f13332979b5e7967518754a";
hash = "sha256-R5y1kMVXzzl/pX6FUcLc1n6Z8eG+npMRwdJMoWtHs/U=";
rev = "413285231ce8fa8b11e7074bbe265b48aa7277f9";
hash = "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "0.0.0+rev=192407a";
version = "0.0.0+rev=4132852";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "192407ab5a24bfc24f13332979b5e7967518754a";
hash = "sha256-R5y1kMVXzzl/pX6FUcLc1n6Z8eG+npMRwdJMoWtHs/U=";
rev = "413285231ce8fa8b11e7074bbe265b48aa7277f9";
hash = "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@ -1820,12 +1842,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=c7c62f3";
version = "0.0.0+rev=922cbb9";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "c7c62f37a8612a897d25906d93363fec36c1591c";
hash = "sha256-SFMJoAjofemUqPy+Spu4mibGXLShXPqDvpl7gJeZQJg=";
rev = "922cbb97f3d20044e6b4362b3d7af5e530ed8f34";
hash = "sha256-b36hctcSJoWSCZmuQNoNqZWJ3w28ejyEfmFqdmiwuLc=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@ -2189,24 +2211,24 @@
};
problog = buildGrammar {
language = "problog";
version = "0.0.0+rev=93c69d2";
version = "0.0.0+rev=d8d415f";
src = fetchFromGitHub {
owner = "foxyseta";
repo = "tree-sitter-prolog";
rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8";
hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY=";
rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
};
location = "grammars/problog";
meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
};
prolog = buildGrammar {
language = "prolog";
version = "0.0.0+rev=93c69d2";
version = "0.0.0+rev=d8d415f";
src = fetchFromGitHub {
owner = "foxyseta";
repo = "tree-sitter-prolog";
rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8";
hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY=";
rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
};
location = "grammars/prolog";
meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
@ -2533,12 +2555,12 @@
};
roc = buildGrammar {
language = "roc";
version = "0.0.0+rev=32e20cb";
version = "0.0.0+rev=0b1afe8";
src = fetchFromGitHub {
owner = "faldor20";
repo = "tree-sitter-roc";
rev = "32e20cb1133a5a189f986c3b5df47ac730fbee3d";
hash = "sha256-kBuVTL2elBM398Il6t8WuzUu4MrL9md+NEtVy7EGkdE=";
rev = "0b1afe88161cbd81f5ddea1bb4fa786314ed49a7";
hash = "sha256-DO0c6xRpJvj35qifh9/sfj5Op9CPsKA+4X6A7FBTGLI=";
};
meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
};
@ -2599,12 +2621,12 @@
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=041dea1";
version = "0.0.0+rev=42a1542";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "041dea1ca8b25f20fa564854922ac6a99c050ec6";
hash = "sha256-hK4/FeB11H2x1c2rbYH2IoejgDSyrvlnObgeN3TVASU=";
rev = "42a1542248ff611ba2091fe76c6dbf42551ebef8";
hash = "sha256-FRX8uaSB408fOWaQSLjOqurVaWQYysoSQCI3vI4d63E=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@ -2901,12 +2923,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=6b1ebb8";
version = "0.0.0+rev=aca5a52";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "6b1ebb86c97fca00835e7fce4a95c5069172145e";
hash = "sha256-VR6GmMWueFa/4PXRtnTNWeI0N19vD1qd5XBM+e9HalM=";
rev = "aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9";
hash = "sha256-F0Fijad6Yry71Xc5b92EiqgtEkvVqRM8WKRt6U07TxY=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -3316,12 +3338,12 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=f3cd62d";
version = "0.0.0+rev=11b688a";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vim";
rev = "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7";
hash = "sha256-KVaTJKU7r7zk57Fn9zl5s34oq8tsLkSRV3VHM6Q6F+s=";
rev = "11b688a1f0e97c0c4e3dbabf4a38016335f4d237";
hash = "sha256-UvH/k0gWEhrgxG1HnrdmaLHzygkaKk4hx2gK/6TZYNM=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vim";
};

24
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -1768,6 +1768,7 @@ in
checkInputs = [
# optional cmp integration
self.nvim-cmp
self.lualine-nvim
];
dependencies = with self; [ plenary-nvim ];
nvimSkipModule = [
@ -2107,6 +2108,9 @@ in
plenary-nvim
nui-nvim
];
nvimSkipModule = [
"neo-tree.types.fixes.compat-0.10"
];
};
netman-nvim = super.netman-nvim.overrideAttrs {
@ -2248,6 +2252,10 @@ in
doInstallCheck = true;
};
nvim-dap-view = super.nvim-dap-view.overrideAttrs {
dependencies = [ self.nvim-dap ];
};
nvim-dap-virtual-text = super.nvim-dap-virtual-text.overrideAttrs {
dependencies = [ self.nvim-dap ];
};
@ -2274,7 +2282,12 @@ in
nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
# Test module
nvimSkipModule = [ "nvim-highlight-colors.color.converters_spec" ];
nvimSkipModule = [
"nvim-highlight-colors.buffer_utils_spec"
"nvim-highlight-colors.color.converters_spec"
"nvim-highlight-colors.color.patterns_spec"
"nvim-highlight-colors.color.utils_spec"
];
};
nvim-java = super.nvim-java.overrideAttrs {
@ -2316,6 +2329,15 @@ in
dependencies = [ self.nvim-java-core ];
};
nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs {
nvimSkipModule = [
# Option not set immediately
"nvls.errors.lilypond-book"
"nvls.tex"
"nvls.texinfo"
];
};
nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
dependencies = [ self.plenary-nvim ];
};

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

@ -769,6 +769,7 @@ https://github.com/mfussenegger/nvim-dap-python/,HEAD,
https://github.com/rinx/nvim-dap-rego/,HEAD,
https://github.com/jonboh/nvim-dap-rr/,HEAD,
https://github.com/rcarriga/nvim-dap-ui/,,
https://github.com/igorlfs/nvim-dap-view/,HEAD,
https://github.com/theHamsta/nvim-dap-virtual-text/,,
https://github.com/amrbashir/nvim-docs-view/,HEAD,
https://github.com/allendang/nvim-expand-expr/,,

6
pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
version = "0-unstable-2025-03-13";
version = "0-unstable-2025-03-18";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
rev = "8af2dee6d8efb406067c5120d7fb175eddfefcb9";
hash = "sha256-mBSm25ABAvjc0s4YTAViGtzgGSpq0EXYt5q+7agHc6M=";
rev = "619c575db6f81d1911e36f1ecd618c9dead86859";
hash = "sha256-Pp3OP69KKrznOl1cY5yiKxMJRA7REe4S51zGDHG883c=";
};
hardeningDisable = [ "format" ];

6
pkgs/applications/emulators/libretro/cores/fbneo.nix
View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2025-03-11";
version = "0-unstable-2025-03-26";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "0bf8e4482caf9c18fcd74b3ddd2d7eaaf32ff8ef";
hash = "sha256-vIC1S57z+agpuaY7wb5bVAppsZkxCQGEnQteiHu0Y34=";
rev = "ad3b6536f57ec189defabc8aa0fe9d854d167d67";
hash = "sha256-Nyzzr6XFQmtRVWxATIIONn3tnwwS6jLbbwHxoYXUDGU=";
};
makefile = "Makefile";

6
pkgs/applications/emulators/libretro/cores/flycast.nix
View file

@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2025-03-14";
version = "0-unstable-2025-03-22";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "44f77408e47d2f2873e1dec4705cd6b6071784fb";
hash = "sha256-3UrMup7V6K630p5DvsGweqg9TaRTtL1TU0wC9Xt7hp8=";
rev = "305cae496fe009a523e1a43cc6a11141531626ef";
hash = "sha256-L91RS+GzNA0IpVh1ANkS7V2wWJqdXyioxJuCP+f5SEA=";
fetchSubmodules = true;
};

6
pkgs/applications/emulators/libretro/cores/mame.nix
View file

@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
version = "0-unstable-2025-01-04";
version = "0-unstable-2025-03-06";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
rev = "20db0f242e4e11a476b548dd57d2ef9cc3e84f03";
hash = "sha256-+xShU96m+KCHrFleEy55fBD5vCM+hsYMqIvRZQtzsr8=";
rev = "40edadab2e445bfda9d206def9508b43b11fb96a";
hash = "sha256-TrDx77VCdtLuihwhlz+sYkUvegTxsG8eAn3h6KYO3z0=";
fetchSubmodules = true;
};

6
pkgs/applications/emulators/libretro/cores/nestopia.nix
View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "nestopia";
version = "0-unstable-2025-02-22";
version = "0-unstable-2025-03-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "nestopia";
rev = "72003d06eb9fbc2191f5a7a874abc039bde3157f";
hash = "sha256-fo9ZNqgMDt9s/18WDhD+7kGb9O8LF47Xk5yuIP3trqY=";
rev = "83d4f6227d14c817c8c75d2b6ad69514acb8fc4b";
hash = "sha256-3BTQbtascDymbJK1ECjaoE9z1fVMnmvcdO+c4aCWuFE=";
};
makefile = "Makefile";

6
pkgs/applications/emulators/libretro/cores/pcsx2.nix
View file

@ -11,13 +11,13 @@
}:
mkLibretroCore {
core = "pcsx2";
version = "0-unstable-2025-01-12";
version = "0-unstable-2025-03-15";
src = fetchFromGitHub {
owner = "libretro";
repo = "ps2";
rev = "3fda2d1bb58564e2c814289036a7e4b10bf53357";
hash = "sha256-06cbF/Mhq2Gf87EQBiptHzqayOm0BA1c2dx6fu795RI=";
rev = "6cc162de2162a0ffe92a4e0470141b9c7c095bf3";
hash = "sha256-hzM4nt7Cp7l2fLtG60YmqVchuFskqVDyaZPHIO0E6Ws=";
fetchSubmodules = true;
};

6
pkgs/applications/emulators/libretro/cores/ppsspp.nix
View file

@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2025-03-15";
version = "0-unstable-2025-03-26";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "60a2dd12bc6eebb9e7885bf77f91835d6ff07307";
hash = "sha256-I9v01nXxaE1JboJ3a4hxIi1Qw78mOaLWdSVikF1vv1I=";
rev = "e4a492b6a2d72582e0d32ffd05b7f37d3312657c";
hash = "sha256-2WuKxfOmlNcPIbwVjCbGfvWIwd5/WYb7pFGMnzg3fZQ=";
fetchSubmodules = true;
};

6
pkgs/applications/emulators/libretro/cores/stella.nix
View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "stella";
version = "0-unstable-2025-02-16";
version = "0-unstable-2025-03-17";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = "dccefede9b9e0c1f08cb645ac4c1b922579b93fa";
hash = "sha256-J9/6plYOa44ZeVWilJWSR5ZQF0bzZ8w5v272iIAOMxM=";
rev = "aaa6c154750119905190da49569fa9e2de7bb97b";
hash = "sha256-QephycS6p6KCAR5ryc8Nhx8jnFGHaY7kObT13RNU42Q=";
};
makefile = "Makefile";

6
pkgs/applications/misc/survex/default.nix
View file

@ -56,10 +56,16 @@ stdenv.mkDerivation rec {
libX11
];
strictDeps = true;
postPatch = ''
patchShebangs .
'';
configureFlags = [
"WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
];
enableParallelBuilding = true;
doCheck = (!stdenv.hostPlatform.isDarwin); # times out
enableParallelChecking = false;

4
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
View file

@ -46,14 +46,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop-unwrapped";
version = "5.12.3";
version = "5.13.1";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-foXIxFAE2a9AsHbqJKnqswW5EYSYu54DATKp//ixcVU=";
hash = "sha256-E9d5jWw4HeCO4sqDB0tXXgxM91kg1Gixi9B0xZQYe14=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''

4
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View file

@ -85,8 +85,8 @@ rec {
thunderbird = thunderbird-latest;
thunderbird-latest = common {
version = "136.0";
sha512 = "37c94258b49a7e87b24b4cffaa6eae81698356ddc3f0f49ea675b885dea2c56a3ca758dac2ddb2720beaf2f34faa15a9ab9b5eda0b352c0c8f14167c01838714";
version = "136.0.1";
sha512 = "cc217f3e07620442714337ea396a7146d9d80cc973de862990a9fac7c4343e900419b71ff8c6575e563deda6daff90bec5809a9a94376cbf1019c834f4e1b1e7";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-latest";

243
pkgs/applications/networking/remote/freerdp/default.nix
View file

@ -1,243 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
docbook-xsl-nons,
libxslt,
pkg-config,
alsa-lib,
faac,
faad2,
fetchpatch,
ffmpeg,
glib,
openh264,
openssl,
pcre2,
zlib,
libX11,
libXcursor,
libXdamage,
libXdmcp,
libXext,
libXi,
libXinerama,
libXrandr,
libXrender,
libXtst,
libXv,
libxkbcommon,
libxkbfile,
wayland,
wayland-scanner,
gstreamer,
gst-plugins-base,
gst-plugins-good,
libunwind,
orc,
cairo,
libusb1,
libpulseaudio,
cups,
pcsclite,
systemd,
libjpeg_turbo,
buildServer ? true,
nocaps ? false,
AudioToolbox,
AVFoundation,
Carbon,
Cocoa,
CoreMedia,
withUnfree ? false,
# tries to compile and run generate_argument_docbook.c
withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
buildPackages,
}:
let
cmFlag = flag: if flag then "ON" else "OFF";
disabledTests =
[
# this one is probably due to our sandbox
{
dir = "libfreerdp/crypto/test";
file = "Test_x509_cert_info.c";
}
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
{
dir = "winpr/libwinpr/sysinfo/test";
file = "TestGetComputerName.c";
}
];
inherit (lib) optionals;
in
stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.11.7";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";
};
patches = [
# GCC 14 compatibility
(fetchpatch {
url = "https://github.com/FreeRDP/FreeRDP/commit/5b14b7cbdd36414f1838047f21502654bd32ebb1.patch";
hash = "sha256-EWLfmjGJGWA/sY2E2DnFKhPbzhOVbXZPCrV8i1XuSeY=";
})
(fetchpatch {
url = "https://github.com/FreeRDP/FreeRDP/commit/efa899d3deb8595a29fabb2a2251722f9d7e0d7f.patch";
hash = "sha256-hjqNexYq+3iO2L2L9wT2tWbHz0BEtl/y7jgQT4kpNIM=";
})
(fetchpatch {
url = "https://github.com/FreeRDP/FreeRDP/commit/0c20fac8f1deeeca3df93a6619542e5d9176f0f0.patch";
hash = "sha256-cEzNPteucoI5KoGEM3C6mg2kW9uWImPebZEV6nssexY=";
})
];
postPatch =
''
export HOME=$TMP
# skip NIB file generation on darwin
sed -z 's/NIB file generation.*//' -i client/Mac{,/cli}/CMakeLists.txt
# failing test(s)
${lib.concatMapStringsSep "\n" (e: ''
substituteInPlace ${e.dir}/CMakeLists.txt \
--replace ${e.file} ""
rm ${e.dir}/${e.file}
'') disabledTests}
substituteInPlace "libfreerdp/freerdp.pc.in" \
--replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
''
+ lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
''
+ lib.optionalString nocaps ''
substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
'';
buildInputs =
[
cairo
cups
faad2
ffmpeg
glib
gst-plugins-base
gst-plugins-good
gstreamer
libX11
libXcursor
libXdamage
libXdmcp
libXext
libXi
libXinerama
libXrandr
libXrender
libXtst
libXv
libjpeg_turbo
libpulseaudio
libunwind
libusb1
libxkbcommon
libxkbfile
openh264
openssl
orc
pcre2
pcsclite
zlib
]
++ optionals stdenv.hostPlatform.isLinux [
alsa-lib
systemd
wayland
]
++ optionals stdenv.hostPlatform.isDarwin [
AudioToolbox
AVFoundation
Carbon
Cocoa
CoreMedia
]
++ optionals withUnfree [
faac
];
nativeBuildInputs = [
cmake
libxslt
docbook-xsl-nons
pkg-config
wayland-scanner
];
doCheck = true;
# https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
cmakeFlags =
[
"-Wno-dev"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
]
++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
BUILD_TESTING = false; # false is recommended by upstream
WITH_CAIRO = (cairo != null);
WITH_CUPS = (cups != null);
WITH_FAAC = (withUnfree && faac != null);
WITH_FAAD2 = (faad2 != null);
WITH_JPEG = (libjpeg_turbo != null);
WITH_OPENH264 = (openh264 != null);
WITH_OSS = false;
WITH_MANPAGES = withManPages;
WITH_PCSC = (pcsclite != null);
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
WITH_VAAPI = false; # false is recommended by upstream
WITH_X11 = true;
};
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.hostPlatform.isDarwin [
"-include AudioToolbox/AudioToolbox.h"
]
++ lib.optionals stdenv.cc.isClang [
"-Wno-error=incompatible-function-pointer-types"
]
);
NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [
"-framework AudioToolbox"
];
meta = with lib; {
description = "Remote Desktop Protocol Client";
longDescription = ''
FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
following the Microsoft Open Specifications.
'';
homepage = "https://www.freerdp.com/";
changelog = "https://github.com/FreeRDP/FreeRDP/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
};
}

4
pkgs/applications/networking/remote/remmina/default.nix
View file

@ -15,7 +15,7 @@
libxkbfile,
libX11,
python3,
freerdp3,
freerdp,
libssh,
libgcrypt,
gnutls,
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
gettext
libxkbfile
libX11
freerdp3
freerdp
libssh
libgcrypt
gnutls

4
pkgs/applications/networking/syncplay/default.nix
View file

@ -14,7 +14,7 @@
buildPythonApplication rec {
pname = "syncplay";
version = "1.7.3";
version = "1.7.4";
format = "other";
@ -22,7 +22,7 @@ buildPythonApplication rec {
owner = "Syncplay";
repo = "syncplay";
tag = "v${version}";
sha256 = "sha256-ipo027XyN4BpMkxzXznbnaufsaG/YkHxFJYo+XWzbyE=";
sha256 = "sha256-23OTj+KUmYtrhzIS4A9Gq/tClOLwaeo50+Fcm1tn47M=";
};
patches = [

2
pkgs/applications/science/logic/rocq-core/default.nix
View file

@ -12,7 +12,7 @@
, version, rocq-version ? null
}@args:
let
lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; };
lib = import ../../../../build-support/rocq/extra-lib.nix { inherit (args) lib; };
release = {
"9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";

209
pkgs/build-support/coq/extra-lib.nix
View file

@ -1,212 +1,7 @@
{ lib }:
let
inherit (lib)
all
concatStringsSep
findFirst
flip
getAttr
head
isFunction
length
recursiveUpdate
splitVersion
tail
take
versionAtLeast
versionOlder
zipListsWith
;
in
recursiveUpdate lib (rec {
versions =
let
truncate = n: v: concatStringsSep "." (take n (splitVersion v));
opTruncate =
op: v0: v:
let
n = length (splitVersion v0);
in
op (truncate n v) (truncate n v0);
in
rec {
/*
Get string of the first n parts of a version string.
Example:
- truncate 2 "1.2.3-stuff"
=> "1.2"
- truncate 4 "1.2.3-stuff"
=> "1.2.3.stuff"
*/
inherit truncate;
/*
Get string of the first three parts (major, minor and patch)
of a version string.
Example:
majorMinorPatch "1.2.3-stuff"
=> "1.2.3"
*/
majorMinorPatch = truncate 3;
/*
Version comparison predicates,
- isGe v0 v <-> v is greater or equal than v0 [*]
- isLe v0 v <-> v is lesser or equal than v0 [*]
- isGt v0 v <-> v is strictly greater than v0 [*]
- isLt v0 v <-> v is strictly lesser than v0 [*]
- isEq v0 v <-> v is equal to v0 [*]
- range low high v <-> v is between low and high [**]
[*] truncating v to the same number of digits as v0
[**] truncating v to low for the lower bound and high for the upper bound
Examples:
- isGe "8.10" "8.10.1"
=> true
- isLe "8.10" "8.10.1"
=> true
- isGt "8.10" "8.10.1"
=> false
- isGt "8.10.0" "8.10.1"
=> true
- isEq "8.10" "8.10.1"
=> true
- range "8.10" "8.11" "8.11.1"
=> true
- range "8.10" "8.11+" "8.11.0"
=> false
- range "8.10" "8.11+" "8.11+beta1"
=> false
*/
isGe = opTruncate versionAtLeast;
isGt = opTruncate (flip versionOlder);
isLe = opTruncate (flip versionAtLeast);
isLt = opTruncate versionOlder;
isEq = opTruncate pred.equal;
range = low: high: pred.inter (versions.isGe low) (versions.isLe high);
};
/*
Returns a list of list, splitting it using a predicate.
This is analogous to builtins.split sep list,
with a predicate as a separator and a list instead of a string.
Type: splitList :: (a -> bool) -> [a] -> [[a]]
Example:
splitList (x: x == "x") [ "y" "x" "z" "t" ]
=> [ [ "y" ] "x" [ "z" "t" ] ]
*/
splitList =
pred: l: # put in file lists
let
loop = (
vv: v: l:
if l == [ ] then
vv ++ [ v ]
else
let
hd = head l;
tl = tail l;
in
if pred hd then
loop (
vv
++ [
v
hd
]
) [ ] tl
else
loop vv (v ++ [ hd ]) tl
);
in
loop [ ] [ ] l;
pred = {
# Predicate intersection, union, and complement
inter =
p: q: x:
p x && q x;
union =
p: q: x:
p x || q x;
compl = p: x: !p x;
true = p: true;
false = p: false;
# predicate "being equal to y"
equal = y: x: x == y;
};
/*
Emulate a "switch - case" construct,
instead of relying on `if then else if ...`
*/
/*
Usage:
```nix
switch-if [
if-clause-1
..
if-clause-k
] default-out
```
where a if-clause has the form `{ cond = b; out = r; }`
the first branch such as `b` is true
*/
switch-if = c: d: (findFirst (getAttr "cond") { } c).out or d;
/*
Usage:
```nix
switch x [
simple-clause-1
..
simple-clause-k
] default-out
```
where a simple-clause has the form `{ case = p; out = r; }`
the first branch such as `p x` is true
or
```nix
switch [ x1 .. xn ] [
complex-clause-1
..
complex-clause-k
] default-out
```
where a complex-clause is either a simple-clause
or has the form { cases = [ p1 .. pn ]; out = r; }
in which case the first branch such as all `pi x` are true
if the variables p are not functions,
they are converted to a equal p
if out is missing the default-out is taken
*/
switch =
var: clauses: default:
with pred;
let
compare = f: if isFunction f then f else equal f;
combine =
cl: var:
if cl ? case then compare cl.case var else all (equal true) (zipListsWith compare cl.cases var);
in
switch-if (map (cl: {
cond = combine cl var;
inherit (cl) out;
}) clauses) default;
lib.recursiveUpdate lib (
import ../rocq/extra-lib-common.nix { inherit lib; } // {
/*
Override arguments to mkCoqDerivation for a Coq library.

2
pkgs/build-support/rocq/default.nix
View file

@ -9,7 +9,7 @@
}@args:
let
lib = import ../coq/extra-lib.nix {
lib = import ./extra-lib.nix {
inherit (args) lib;
};

210
pkgs/build-support/rocq/extra-lib-common.nix Normal file
View file

@ -0,0 +1,210 @@
{ lib }:
let
inherit (lib)
all
concatStringsSep
findFirst
flip
getAttr
head
isFunction
length
recursiveUpdate
splitVersion
tail
take
versionAtLeast
versionOlder
zipListsWith
;
in
rec {
versions =
let
truncate = n: v: concatStringsSep "." (take n (splitVersion v));
opTruncate =
op: v0: v:
let
n = length (splitVersion v0);
in
op (truncate n v) (truncate n v0);
in
rec {
/*
Get string of the first n parts of a version string.
Example:
- truncate 2 "1.2.3-stuff"
=> "1.2"
- truncate 4 "1.2.3-stuff"
=> "1.2.3.stuff"
*/
inherit truncate;
/*
Get string of the first three parts (major, minor and patch)
of a version string.
Example:
majorMinorPatch "1.2.3-stuff"
=> "1.2.3"
*/
majorMinorPatch = truncate 3;
/*
Version comparison predicates,
- isGe v0 v <-> v is greater or equal than v0 [*]
- isLe v0 v <-> v is lesser or equal than v0 [*]
- isGt v0 v <-> v is strictly greater than v0 [*]
- isLt v0 v <-> v is strictly lesser than v0 [*]
- isEq v0 v <-> v is equal to v0 [*]
- range low high v <-> v is between low and high [**]
[*] truncating v to the same number of digits as v0
[**] truncating v to low for the lower bound and high for the upper bound
Examples:
- isGe "8.10" "8.10.1"
=> true
- isLe "8.10" "8.10.1"
=> true
- isGt "8.10" "8.10.1"
=> false
- isGt "8.10.0" "8.10.1"
=> true
- isEq "8.10" "8.10.1"
=> true
- range "8.10" "8.11" "8.11.1"
=> true
- range "8.10" "8.11+" "8.11.0"
=> false
- range "8.10" "8.11+" "8.11+beta1"
=> false
*/
isGe = opTruncate versionAtLeast;
isGt = opTruncate (flip versionOlder);
isLe = opTruncate (flip versionAtLeast);
isLt = opTruncate versionOlder;
isEq = opTruncate pred.equal;
range = low: high: pred.inter (versions.isGe low) (versions.isLe high);
};
/*
Returns a list of list, splitting it using a predicate.
This is analogous to builtins.split sep list,
with a predicate as a separator and a list instead of a string.
Type: splitList :: (a -> bool) -> [a] -> [[a]]
Example:
splitList (x: x == "x") [ "y" "x" "z" "t" ]
=> [ [ "y" ] "x" [ "z" "t" ] ]
*/
splitList =
pred: l: # put in file lists
let
loop = (
vv: v: l:
if l == [ ] then
vv ++ [ v ]
else
let
hd = head l;
tl = tail l;
in
if pred hd then
loop (
vv
++ [
v
hd
]
) [ ] tl
else
loop vv (v ++ [ hd ]) tl
);
in
loop [ ] [ ] l;
pred = {
# Predicate intersection, union, and complement
inter =
p: q: x:
p x && q x;
union =
p: q: x:
p x || q x;
compl = p: x: !p x;
true = p: true;
false = p: false;
# predicate "being equal to y"
equal = y: x: x == y;
};
/*
Emulate a "switch - case" construct,
instead of relying on `if then else if ...`
*/
/*
Usage:
```nix
switch-if [
if-clause-1
..
if-clause-k
] default-out
```
where a if-clause has the form `{ cond = b; out = r; }`
the first branch such as `b` is true
*/
switch-if = c: d: (findFirst (getAttr "cond") { } c).out or d;
/*
Usage:
```nix
switch x [
simple-clause-1
..
simple-clause-k
] default-out
```
where a simple-clause has the form `{ case = p; out = r; }`
the first branch such as `p x` is true
or
```nix
switch [ x1 .. xn ] [
complex-clause-1
..
complex-clause-k
] default-out
```
where a complex-clause is either a simple-clause
or has the form { cases = [ p1 .. pn ]; out = r; }
in which case the first branch such as all `pi x` are true
if the variables p are not functions,
they are converted to a equal p
if out is missing the default-out is taken
*/
switch =
var: clauses: default:
with pred;
let
compare = f: if isFunction f then f else equal f;
combine =
cl: var:
if cl ? case then compare cl.case var else all (equal true) (zipListsWith compare cl.cases var);
in
switch-if (map (cl: {
cond = combine cl var;
inherit (cl) out;
}) clauses) default;
}

56
pkgs/build-support/rocq/extra-lib.nix Normal file
View file

@ -0,0 +1,56 @@
{ lib }:
lib.recursiveUpdate lib (
import ./extra-lib-common.nix { inherit lib; } // {
/*
Override arguments to mkRocqDerivation for a Rocq library.
This function allows you to easily override arguments to mkRocqDerivation,
even when they are not exposed by the Rocq library directly.
Type: overrideRocqDerivation :: AttrSet -> RocqLibraryDerivation -> RocqLibraryDerivation
Example:
```nix
rocqPackages.lib.overrideRocqDerivation
{
defaultVersion = "9999";
release."9999".hash = "sha256-fDoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM=";
}
rocqPackages.QuickChick;
```
This example overrides the `defaultVersion` and `release` arguments that
are passed to `mkRocqDerivation` in the QuickChick derivation.
Note that there is a difference between using `.override` on a Rocq
library vs this `overrideRocqDerivation` function. `.override` allows you
to modify arguments to the derivation itself, for instance by passing
different versions of dependencies:
```nix
rocqPackages.QuickChick.override { ssreflect = my-cool-ssreflect; }
```
whereas `overrideRocqDerivation` allows you to override arguments to the
call to `mkRocqDerivation` in the Rocq library.
Note that all Rocq libraries in Nixpkgs have a `version` argument for
easily using a different version. So if all you want to do is use a
different version, and the derivation for the Rocq library already has
support for the version you want, you likely only need to update the
`version` argument on the library derivation. This is done with
`.override`:
```nix
rocqPackages.QuickChick.override { version = "1.4.0"; }
```
*/
overrideRocqDerivation =
f: drv:
(drv.override (args: {
mkRocqDerivation = drv_: (args.mkRocqDerivation drv_).override f;
}));
})

6
pkgs/by-name/al/alistral/package.nix
View file

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "alistral";
version = "0.5.2";
version = "0.5.5";
src = fetchFromGitHub {
owner = "RustyNova016";
repo = "Alistral";
tag = "v${finalAttrs.version}";
hash = "sha256-bt0WCmnk/DAEuQeEvBe5Vdk/AxpfRAafPiEJ7v8HK8Y=";
hash = "sha256-DrHoVAIPD/F6pY04QXVilXiwD/nWzeVquuHzRiq2sRY=";
};
# remove if updating to rust 1.85
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-BxJmoJbnGfsA+YCvzUvgnkoHl/ClrwHoE3NjlctjCxA=";
cargoHash = "sha256-Jyus5L0z0Z6Qf9vBcO6/h+py0JNKG1FS6qXONUM26BM=";
env.RUSTC_BOOTSTRAP = 1;

4
pkgs/by-name/ar/armadillo/package.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "14.4.0";
version = "14.4.1";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
hash = "sha256-AjJC/VkHHZjHX7AV/TKTySETLcOb9G0iHUsFmq6NefQ=";
hash = "sha256-Js4nK/3IJGwnjm+M+lN3eh77FO8ZbogIL+4F2hpGNJE=";
};
nativeBuildInputs = [ cmake ];

8
pkgs/by-name/cl/claude-code/package-lock.json generated
View file

@ -5,13 +5,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^0.2.53"
"@anthropic-ai/claude-code": "^0.2.54"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "0.2.53",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.53.tgz",
"integrity": "sha512-DKXGjSsu2+rc1GaAdOjRqD7fMLvyQgwi/sqf6lLHWQAarwYxR/ahbSheu7h1Ub0wm0htnuIqgNnmNZUM43w/3Q==",
"version": "0.2.54",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.54.tgz",
"integrity": "sha512-kl/g4oBg+FBQHRQv3INaiDuNWoYIUm4BbIk4qd5YbesFQVMPGtblh0Avst61FUo9ZCm64iBPWupPe5aaiJ6Y9Q==",
"hasInstallScript": true,
"license": "SEE LICENSE IN README.md",
"bin": {

14
pkgs/by-name/cl/claude-code/package.nix
View file

@ -6,14 +6,14 @@
buildNpmPackage rec {
pname = "claude-code";
version = "0.2.53";
version = "0.2.54";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-oWXtIGJwVe/LwAlIWfpA5Jn9zZWQtjw03DkyQ/Sg08c=";
hash = "sha256-zeHaEqcUcxvF0xu2ZViL0m3v8v0UFB/xvBsEWR03F9I=";
};
npmDepsHash = "sha256-3igDt1N77LJu5Dq9uK3bd90sfYZkjBOt5ArvoRibFeo=";
npmDepsHash = "sha256-e0vVEtJC1QIlGS6XQA0eMLdd7wFYWRuyC0Ynpu/Iw88=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
@ -23,6 +23,14 @@ buildNpmPackage rec {
AUTHORIZED = "1";
# `claude-code` tries to auto-update by default, this disables that functionality.
# Note that the `DISABLE_AUTOUPDATER` environment variable is not documented, so this trick may
# not continue to work.
postInstall = ''
wrapProgram $out/bin/claude \
--set DISABLE_AUTOUPDATER 1
'';
passthru.updateScript = ./update.sh;
meta = {

6
pkgs/by-name/db/db-rest/package.nix
View file

@ -8,7 +8,7 @@
}:
buildNpmPackage rec {
pname = "db-rest";
version = "6.0.6";
version = "6.1.0";
nodejs = nodejs_18;
@ -16,10 +16,10 @@ buildNpmPackage rec {
owner = "derhuerst";
repo = "db-rest";
rev = version;
hash = "sha256-Rwy36hi5p/EDLBbfi1M0DEKD+2/eiJsqo0r2Et/3Oa4=";
hash = "sha256-1iJ26l6C6GevNkoDVMztPHiH3YsutJa3xWAsfYvgR9U=";
};
npmDepsHash = "sha256-Drwmnu23PvrT/cw42hl+mu/S/Dn5nzybWGCDCUF7+R8=";
npmDepsHash = "sha256-ELVVsysNjkXuX4i6i5P3irn6twVDu6YiPYqy2hbIlIs=";
preConfigure = ''
patchShebangs ./build/index.js

4
pkgs/by-name/di/dita-ot/package.nix
View file

@ -9,14 +9,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dita-ot";
version = "4.3";
version = "4.3.1";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ openjdk17 ];
src = fetchzip {
url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
hash = "sha256-/qWu9lUfK/3gp/IO4WOO8g8LuZlXErEU5sPt9qZep1I=";
hash = "sha256-MwE6HnOrVtoT23wF0Tyje8T52au8kD6waY9tsrLQVck=";
};
installPhase = ''

28
pkgs/by-name/di/dive/package.nix
View file

@ -3,25 +3,23 @@
stdenv,
buildGoModule,
fetchFromGitHub,
fetchpatch,
pkg-config,
btrfs-progs,
gpgme,
lvm2,
}:
buildGoModule rec {
pname = "dive";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "wagoodman";
repo = "dive";
rev = "v${version}";
hash = "sha256-CuVRFybsn7PVPgz3fz5ghpjOEOsTYTv6uUAgRgFewFw=";
hash = "sha256-kVFXidcvSlYi+aD+3yEPYy1Esm0bl02ioX1DmO0L1Hs=";
};
vendorHash = "sha256-uzzawa/Doo6j/Fh9dJMzGKbpp24UTLAo9VGmuQ80IZE=";
vendorHash = "sha256-9lNtKpfGDVE3U0ZX0QcaCJrqCxoubvWqR26IvSKkImM=";
nativeBuildInputs = [ pkg-config ];
@ -31,26 +29,6 @@ buildGoModule rec {
lvm2
];
patches = [
# fix scrolling
# See https://github.com/wagoodman/dive/pull/447
(fetchpatch {
name = "fix-scrolling.patch";
url = "https://github.com/wagoodman/dive/pull/473/commits/a885fa6e68b3763d52de20603ee1b9cd8949276f.patch";
hash = "sha256-6gTWfyvK19xDqc7Ah33ewgz/WQRcQHLYwerrwUtRpJc=";
})
(fetchpatch {
name = "add-scrolling-layers.patch";
url = "https://github.com/wagoodman/dive/pull/473/commits/840653158e235bdd59b4c4621cf282ce6499c714.patch";
hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc=";
})
(fetchpatch {
name = "fix-render-update.patch";
url = "https://github.com/wagoodman/dive/pull/473/commits/36177a9154eebe9e3ae9461a9e6f6b368f7974e1.patch";
hash = "sha256-rSeEYxUaYlEZGv+NWYK+nATBYS4P2swqjC3HimHyqNI=";
})
];
ldflags = [
"-s"
"-w"

6
pkgs/by-name/ew/eww/package.nix
View file

@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec {
pname = "eww";
version = "0.6.0-unstable-2025-02-16";
version = "0.6.0-unstable-2025-03-25";
src = fetchFromGitHub {
owner = "elkowar";
repo = "eww";
rev = "5b4cc3e7a8055afb758421f4a114ef4032806e39";
hash = "sha256-iA/OTtsymhuCMRDC0IJE7YXuCeFJbkuMwPaj7tAVbQw=";
rev = "a9aa0f96892f20e4741e94f4cd46ca31106e492c";
hash = "sha256-T9OZ8jke2T73Zeqt8VekH82ar23AV7llA7ta8b7HP2o=";
};
useFetchCargoVendor = true;

4
pkgs/by-name/ex/exim/package.nix
View file

@ -39,11 +39,11 @@ let
in
stdenv.mkDerivation rec {
pname = "exim";
version = "4.98.1";
version = "4.98.2";
src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
hash = "sha256-2Fi3WtLMa/cckHG6JqVbPqmt0mYHvYMt88tU+CIhws4=";
hash = "sha256-iLjopnwdtswLHRSBYao25mL0yi/vJdW282lNSQ5C3K4=";
};
enableParallelBuilding = true;

0
pkgs/applications/networking/remote/freerdp/3.nix → pkgs/by-name/fr/freerdp/package.nix
View file

4
pkgs/by-name/gh/ghdl/package.nix
View file

@ -21,13 +21,13 @@ assert backend == "mcode" || backend == "llvm" || backend == "gcc";
stdenv.mkDerivation (finalAttrs: {
pname = "ghdl-${backend}";
version = "4.1.0";
version = "5.0.1";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl";
rev = "v${finalAttrs.version}";
hash = "sha256-tPSHer3qdtEZoPh9BsEyuTOrXgyENFUyJqnUS3UYAvM=";
hash = "sha256-v3wl+tn92Bks0VnW80Q1KwHwUtUxlbeMSI3WWvgDky4=";
};
LIBRARY_PATH = "${stdenv.cc.libc}/lib";

4
pkgs/by-name/gi/git-town/package.nix
View file

@ -12,13 +12,13 @@
buildGoModule rec {
pname = "git-town";
version = "18.0.0";
version = "18.1.0";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
tag = "v${version}";
hash = "sha256-vn0Cq53gqe0HGrtYMUHCFsE13CpaBJqC4LxrkJSel1Y=";
hash = "sha256-dx19gzHhCCcdlI80CYhbfKHRS0AQB0DnHphV2mqmI/Y=";
};
vendorHash = null;

4
pkgs/by-name/gi/gitlab-release-cli/package.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gitlab-release-cli";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "release-cli";
rev = "v${version}";
hash = "sha256-LFzZLg6AaYyvB/YOe8EATHs1t0m9Y2tYzRaS2CQ7WpY=";
hash = "sha256-J+9BbzZYLR4Ie01NtjZRCcL/HtR78BiTEqFimfni/ps=";
};
vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU=";

4
pkgs/by-name/gl/glaze/package.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation (final: {
pname = "glaze";
version = "5.0.0";
version = "5.0.1";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
rev = "v${final.version}";
hash = "sha256-NjR/MsjnnLH2jVHrQXyWnyWOvsDQYbP/V9mWSII8mnc=";
hash = "sha256-9ru8T0xUmkKBg6rNg+myzU8bjqWkQGG2B0APPHjyAAE=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/by-name/gn/gnome-remote-desktop/package.nix
View file

@ -21,7 +21,7 @@
libopus,
libxkbcommon,
gdk-pixbuf,
freerdp3,
freerdp,
fdk_aac,
tpm2-tss,
fuse3,
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo
freerdp3
freerdp
fdk_aac
tpm2-tss
fuse3
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
"-Dsystemd_tmpfiles_dir=${placeholder "out"}/lib/tmpfiles.d"
"-Dtests=false" # Too deep of a rabbit hole.
# TODO: investigate who should be fixed here.
"-Dc_args=-I${freerdp3}/include/winpr3"
"-Dc_args=-I${freerdp}/include/winpr3"
];
passthru = {

3
pkgs/by-name/go/golangci-lint-langserver/package.nix
View file

@ -21,6 +21,9 @@ buildGoModule rec {
subPackages = [ "." ];
# renable after https://github.com/nametake/golangci-lint-langserver/pull/52
doCheck = false;
nativeCheckInputs = [
golangci-lint
writableTmpDirAsHomeHook

4
pkgs/by-name/go/got/package.nix
View file

@ -25,11 +25,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "got";
version = "0.109";
version = "0.110";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
hash = "sha256-ItLdVOFbxj+g5Vsom01YekPbM2ckFCE8LvcYxTMsaoE=";
hash = "sha256-NjXkEgXn+FI2pudv94XT2JlxMc81PIzfb20lwDFmHSk=";
};
nativeBuildInputs = [

4
pkgs/by-name/gt/gtk-frdp/package.nix
View file

@ -9,7 +9,7 @@
gobject-introspection,
glib,
gtk3,
freerdp3,
freerdp,
fuse3,
unstableGitUpdater,
}:
@ -37,7 +37,7 @@ stdenv.mkDerivation {
buildInputs = [
glib
gtk3
freerdp3
freerdp
fuse3
];

6
pkgs/by-name/in/inferno/package.nix
View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "inferno";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "jonhoo";
repo = "inferno";
rev = "v${version}";
hash = "sha256-lnNS3+2VZ+DgbmaM8/9X79vhqoxw3G8M9macLILX//w=";
hash = "sha256-NDxgWHTMyntNtUb/+7bvrR64PNRPcovQd/IIgcLo5JQ=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-hm10LAyvlrME2lYSRs/ji2Tt+Z5f8MTFSL3h7Aulaas=";
cargoHash = "sha256-xtWNIbWvYSSuvmq+IYADnpnBHuVeXBolRqc9JrIoiis=";
# skip flaky tests
checkFlags = [

4
pkgs/by-name/ko/koboldcpp/package.nix
View file

@ -40,13 +40,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.85";
version = "1.86.2";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
tag = "v${finalAttrs.version}";
hash = "sha256-ahmZmCnIjbFDVkAX0JtEJerhb9qzEhh+X/dxrB72HjI=";
hash = "sha256-zB/X4tfygpf3ZrQ9FtQCd3sxN11Ewlxz1+YCiw7iUZU=";
};
enableParallelBuilding = true;

8
pkgs/by-name/le/leptosfmt/package.nix
View file

@ -6,18 +6,18 @@
rustPlatform.buildRustPackage rec {
pname = "leptosfmt";
version = "0.1.30";
version = "0.1.33";
src = fetchFromGitHub {
owner = "bram209";
repo = "leptosfmt";
rev = "85b06b9a8bb0616b6a03ba43517245c79e1dd4cf";
hash = "sha256-PiVPnni7W8SIhO6L9698RSMTD4VVTB+klLrqMzEtWWo=";
rev = version;
hash = "sha256-+trLQFU8oP45xHQ3DsEESQzQX2WpvQcfpgGC9o5ITcY=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-u0PtqWcQdt3vjoarqyiLZa8g5I+GWXPuHW6a/EtbB7o=";
cargoHash = "sha256-m9426zuxp9GfbYoljW49BVgetLTqqcqGHCb7I+Yw+bc=";
meta = with lib; {
description = "Formatter for the leptos view! macro";

7
pkgs/by-name/li/libblake3/package.nix
View file

@ -3,7 +3,7 @@
stdenv,
cmake,
fetchFromGitHub,
tbb_2022_0,
tbb_2021_11,
useTBB ? true,
}:
@ -22,7 +22,10 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals useTBB [ tbb_2022_0 ];
buildInputs = lib.optionals useTBB [
# 2022.0 crashes on macOS at the moment
tbb_2021_11
];
cmakeFlags = [
(lib.cmakeBool "BLAKE3_USE_TBB" useTBB)

21
pkgs/by-name/lm/lmstudio/linux.nix
View file

@ -6,11 +6,12 @@
hash,
pname,
meta,
stdenv,
lib,
patchelf,
}:
let
src = fetchurl {
inherit url hash;
};
src = fetchurl { inherit url hash; };
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
@ -28,7 +29,19 @@ appimageTools.wrapType2 {
mkdir -p $out/share/applications
cp -r ${appimageContents}/usr/share/icons $out/share
install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
# Rename the main executable from lmstudio to lm-studio
mv $out/bin/lmstudio $out/bin/lm-studio
substituteInPlace $out/share/applications/lm-studio.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lm-studio'
# lms cli tool
install -m 755 ${appimageContents}/resources/app/.webpack/lms $out/bin/
patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \
--set-rpath "${lib.getLib stdenv.cc.cc}/lib:${lib.getLib stdenv.cc.cc}/lib64:$out/lib:${
lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]
}" $out/bin/lms
'';
}

31
pkgs/by-name/lm/lmstudio/package.nix
View file

@ -2,22 +2,19 @@
lib,
stdenv,
callPackage,
version ? "0.3.11",
rev ? "1",
version ? "0.3.14",
rev ? "3",
...
}@args:
let
pname = "lmstudio";
packageVersion = "${version}-${rev}"; # Combine version and rev
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
homepage = "https://lmstudio.ai/";
license = lib.licenses.unfree;
mainProgram = "lmstudio";
maintainers = with lib.maintainers; [
cig0
eeedean
crertel
];
mainProgram = "lm-studio";
maintainers = with lib.maintainers; [ crertel ];
platforms = [
"x86_64-linux"
"aarch64-darwin"
@ -28,25 +25,19 @@ let
in
if stdenv.hostPlatform.isDarwin then
callPackage ./darwin.nix {
inherit
pname
version
meta
;
inherit pname meta;
version = packageVersion;
url =
args.url
or "https://installers.lmstudio.ai/darwin/arm64/${version}-${rev}/LM-Studio-${version}-${rev}-arm64.dmg";
hash = args.hash or "sha256-kXH3tAazEtl019IBxuavEI9QUamEH3b6UFYRYAO3Fxs=";
hash = args.hash or "sha256-doAhCbWFwDWlBQ+4YfJz6p7I4NZJxIOtdLYTr3mOGds=";
}
else
callPackage ./linux.nix {
inherit
pname
version
meta
;
inherit pname meta;
version = packageVersion;
url =
args.url
or "https://installers.lmstudio.ai/linux/x64/${version}-${rev}/LM-Studio-${version}-${rev}-x64.AppImage";
hash = args.hash or "sha256-T8j0l2ZP53Zc0hgb2EyFeR0mH5YrNlz4UfzN0rO7bKU=";
hash = args.hash or "sha256-IIJMk0cfLQdrx0nTSbpsbqOvD+f/qrH+rGdYN4mygaw=";
}

4
pkgs/by-name/ms/msieve/package.nix
View file

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
hash = "sha256-6ErVn4pYPMG5VFjOQURLsHNpN0pGdp55+rjY8988onU=";
};
patches = [ ./savefile_t-pointer-type.patch ];
buildInputs = [
zlib
gmp
@ -31,6 +33,8 @@ stdenv.mkDerivation rec {
"all"
];
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out/bin/
cp msieve $out/bin/

31
pkgs/by-name/ms/msieve/savefile_t-pointer-type.patch Normal file
View file

@ -0,0 +1,31 @@
Index: include/msieve.h
===================================================================
--- a/include/msieve.h
+++ b/include/msieve.h
@@ -100,9 +100,9 @@
HANDLE file_handle;
uint32 read_size;
uint32 eof;
#else
- gzFile *fp;
+ gzFile fp;
char isCompressed;
char is_a_FILE;
#endif
char *name;
Index: common/savefile.c
===================================================================
--- a/common/savefile.c
+++ b/common/savefile.c
@@ -151,9 +151,9 @@
so we will fopen a FILE to append plainly */
fclose(fp);
}
if (s->is_a_FILE) {
- s->fp = (gzFile *)fopen(s->name, "a");
+ s->fp = (gzFile)fopen(s->name, "a");
} else {
s->fp = gzopen(s->name, "a");
s->isCompressed = 1;
}

69
pkgs/by-name/ne/neohtop/package.nix Normal file
View file

@ -0,0 +1,69 @@
{
lib,
stdenv,
rustPlatform,
cargo-tauri,
nodejs,
npmHooks,
fetchNpmDeps,
pkg-config,
webkitgtk_4_1,
fetchFromGitHub,
glib,
gtk3,
libsoup_2_4,
openssl,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "neohtop";
version = "1.1.2";
src = fetchFromGitHub {
owner = "Abdenasser";
repo = "neohtop";
tag = "v${finalAttrs.version}";
hash = "sha256-5hDxMQlDPXf0llu51Hwb/9n0GX0YSvVJUS+RvEiLsnM=";
};
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
hash = "sha256-qhAdKLtTQ2iUFc7UNJNeB1Mzbzg/NrGAWrKQTdGiN4Y=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nYBPvfBzRIJdvfuOZnzs+kuSozlkBB/ImqjDYfvNBrA=";
cargoRoot = "src-tauri";
buildAndTestSubdir = "src-tauri";
nativeBuildInputs = [
cargo-tauri.hook
npmHooks.npmConfigHook
pkg-config
nodejs
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib
gtk3
openssl
libsoup_2_4
webkitgtk_4_1
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Blazing-fast system monitoring for your desktop";
homepage = "https://github.com/Abdenasser/neohtop";
changelog = "https://github.com/Abdenasser/neohtop/releases/tag/v${finalAttrs.version}";
mainProgram = "NeoHtop";
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ emaryn ];
};
})

21
pkgs/by-name/ne/netkittftp/package.nix
View file

@ -2,21 +2,30 @@
lib,
stdenv,
fetchurl,
fetchpatch,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "netkit-tftp";
version = "0.17";
src = fetchurl {
urls = [
"mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
"ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz"
"https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
"mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${finalAttrs.version}.orig.tar.gz"
"ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${finalAttrs.version}.tar.gz"
"https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${finalAttrs.version}.orig.tar.gz"
];
sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
hash = "sha256-OkPAAQ1OYfQSVj/YN2nUZn2LjoKQNSbSHLkgX+Va0U0=";
};
patches = [
# fix compilation errors, warning and many style issues
(fetchpatch {
url = "https://sources.debian.org/data/main/n/netkit-tftp/0.17-23/debian/patches/debian_changes_0.17-18.patch";
hash = "sha256-kprmSMoNF6E8GGRIPWDLWcqfPRxdUeheeLoFNqI3Uv0=";
})
];
preInstall = "
mkdir -p $out/man/man{1,8} $out/sbin $out/bin
";
@ -28,4 +37,4 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}
})

1
pkgs/by-name/ni/nix-plugin-pijul/package.nix
View file

@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
{
stable = localRepoCheck nixVersions.stable;
latest = localRepoCheck nixVersions.latest;
git = localRepoCheck nixVersions.git;
nix_2_24 = localRepoCheck nixVersions.nix_2_24;
};

44
pkgs/by-name/ni/nixpkgs-track/package.nix Normal file
View file

@ -0,0 +1,44 @@
{
lib,
rustPlatform,
fetchFromGitHub,
openssl,
pkg-config,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nixpkgs-track";
version = "0.2.0";
src = fetchFromGitHub {
owner = "uncenter";
repo = "nixpkgs-track";
tag = "v${finalAttrs.version}";
hash = "sha256-iJqYn+MttFBmcAI2HKALAAYayFzvdAtkmNwM+IewxRM=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-jC3E8BPuzRCI+smuqeWzNDA9MOcK/PDzZZPnvBVqSXI=";
buildInputs = [ openssl ];
nativeBuildInputs = [
pkg-config
versionCheckHook
];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Track where Nixpkgs pull requests have reached";
homepage = "https://github.com/uncenter/nixpkgs-track";
license = lib.licenses.mit;
mainProgram = "nixpkgs-track";
maintainers = with lib.maintainers; [
isabelroses
uncenter
];
};
})

4
pkgs/by-name/nu/nuclear/package.nix
View file

@ -5,7 +5,7 @@
}:
let
pname = "nuclear";
version = "0.6.42";
version = "0.6.43";
src = fetchurl {
# Nuclear currently only publishes AppImage releases for x86_64, which is hardcoded in
@ -13,7 +13,7 @@ let
# provide more arches, we should use stdenv.hostPlatform to determine the arch and choose
# source URL accordingly.
url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
hash = "sha256-95Q8TEn2gvJu75vgDdzSYH/1ci3BlidQ5nKA53fas6U=";
hash = "sha256-kruQ9h/0dYWIsjX8P2Em7v5weGd4B5hZbu/VldeAGRU=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

6
pkgs/by-name/nu/nuclei/package.nix
View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "nuclei";
version = "3.3.10";
version = "3.4.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "nuclei";
tag = "v${version}";
hash = "sha256-5+alARFuxwJlPYki5TU+4GdaJhBEYXbXH0BrCj2/aic=";
hash = "sha256-FseLPykYJrfjCyuS0+yLNcEhzFAaguJjMSdGHIacexo=";
};
vendorHash = "sha256-l3733hg11+Qg4h68DnXoD8LyYiB+iFyZyKggpCAsx7Q=";
vendorHash = "sha256-tTFEDTUM3ldH3/NtqYx4LyEazp7o5qZ6ionu01Vxwrw=";
proxyVendor = true; # hash mismatch between Linux and Darwin

4
pkgs/by-name/os/osqp-eigen/package.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osqp-eigen";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "robotology";
repo = "osqp-eigen";
rev = "v${finalAttrs.version}";
hash = "sha256-cXH27UC7hw3iswuf7xSf5pHX1fDyHzFxnCzUpW00SLE=";
hash = "sha256-vmHGOG+duR8R5KSC0yaXkjB5KaotTjuXbXneKv9MO3c=";
};
cmakeFlags = [

17
pkgs/by-name/ot/otb/1-otb-swig-include-itk.diff Normal file
View file

@ -0,0 +1,17 @@
diff --git a/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt b/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt
index 1a33064..d791805 100644
--- a/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt
+++ b/Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt
@@ -17,6 +17,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# Add ITK
+find_package(ITK REQUIRED)
+include(${ITK_USE_FILE})
+include_directories(${ITK_INCLUDE_DIRS})
+message(STATUS "ITK FOUND: ${ITK_INCLUDE_DIRS}")
+
include_directories( ${Python_INCLUDE_DIRS} )
include_directories ( ${CMAKE_CURRENT_SOURCE_DIR})
set_source_files_properties ( ../otbApplication.i PROPERTIES CPLUSPLUS ON )

36
pkgs/by-name/ot/otb/package.nix
View file

@ -32,7 +32,7 @@
enableLearning ? true,
enableMiscellaneous ? true,
enableOpenMP ? false,
enablePython ? false,
enablePython ? true,
extraPythonPackages ? ps: with ps; [ ],
enableRemote ? true,
enableShark ? true,
@ -49,12 +49,24 @@ let
# ITK configs for OTB requires 5.3.0 and
# filter out gdcm, libminc from list of ITK deps as it's not needed for OTB
itkVersion = "5.3.0";
itkMajorMinorVersion = lib.versions.majorMinor itkVersion;
itkDepsToRemove = [
"gdcm"
"libminc"
];
itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove;
# remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451
otbSwig = swig.overrideAttrs (oldArgs: {
version = "4.2.1";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
tag = "v4.2.1";
hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8=";
};
});
# override the ITK version with OTB version
# https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_itk.cmake?ref_type=heads#L145
otb-itk = (itk.override { enableRtk = false; }).overrideAttrs (oldArgs: {
@ -78,6 +90,13 @@ let
})
];
# fix the CMake config files for ITK which contains double slashes
postInstall =
(oldArgs.postInstall or "")
+ ''
sed -i 's|''${ITK_INSTALL_PREFIX}//nix/store|/nix/store|g' $out/lib/cmake/ITK-${itkMajorMinorVersion}/ITKConfig.cmake
'';
cmakeFlags = oldArgs.cmakeFlags or [ ] ++ [
(lib.cmakeBool "ITK_USE_SYSTEM_EIGEN" true)
@ -205,12 +224,16 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/merge_requests/1056/diffs.patch";
hash = "sha256-Zj/wkx0vxn5vqj0hszn7NxoYW1yf63G3HPVKbSdZIOY=";
})
./1-otb-swig-include-itk.diff
];
postPatch = (
"substituteInPlace Modules/Core/Wrappers/SWIG/src/python/CMakeLists.txt --replace-fail '''$''{ITK_INCLUDE_DIRS}' ${otb-itk}/include/ITK-${itkMajorMinorVersion}"
);
nativeBuildInputs = [
cmake
makeWrapper
swig
which
];
@ -246,11 +269,16 @@ stdenv.mkDerivation (finalAttrs: {
otb-itk
otb-shark
perl
swig
tinyxml
]
++ otb-itk.propagatedBuildInputs
++ optionals enablePython ([ python3 ] ++ pythonInputs)
++ optionals enablePython (
[
python3
otbSwig
]
++ pythonInputs
)
++ optionals enableShark [ otb-shark ];
doInstallCheck = true;

16
pkgs/by-name/pi/picolisp/package.nix
View file

@ -29,10 +29,16 @@ stdenv.mkDerivation {
readline
];
sourceRoot = ''pil21'';
buildPhase = ''
cd src
make
'';
preBuild =
''
cd src
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# Flags taken from instructions at: https://picolisp.com/wiki/?alternativeMacOSRepository
makeFlagsArray+=(
SHARED='-dynamiclib -undefined dynamic_lookup'
)
'';
installPhase = ''
cd ..
@ -42,7 +48,7 @@ stdenv.mkDerivation {
ln -s "$out/lib/picolisp/bin/pil" "$out/bin/pil"
ln -s "$out/lib/picolisp/man/man1/pil.1" "$out/man/pil.1"
ln -s "$out/lib/picolisp/man/man1/picolisp.1" "$out/man/picolisp.1"
substituteInPlace $out/bin/pil --replace /usr $out
substituteInPlace $out/bin/pil --replace-fail /usr $out
'';
meta = with lib; {

6
pkgs/by-name/pk/pkgsite/package.nix
View file

@ -7,13 +7,13 @@
buildGoModule {
pname = "pkgsite";
version = "0-unstable-2025-03-12";
version = "0-unstable-2025-03-21";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "9685cd9cccb49c53773c2b8ab8f2a5e6de3a1c12";
hash = "sha256-aTvoi9HFYxDm7Ze+vJfQzMvgcdWUYOEyxrBpzqQdAK0=";
rev = "d037ac96d503b32fcdcb5f5efeefef10447c394e";
hash = "sha256-/zcnS3qYmiI5kuOZ4jJB7/3C2U9KELYgte7d9OgaLmo=";
};
vendorHash = "sha256-M4cbpMZ/ujnMUoGp//KpBM2oEl/RCOfI1IcmoGMw+fw=";

8
pkgs/by-name/po/polarity/package.nix
View file

@ -7,17 +7,17 @@
rustPlatform.buildRustPackage rec {
pname = "polarity";
version = "latest-unstable-2025-03-14";
version = "latest-unstable-2025-03-26";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "ab9fda44fb490da445dcaee7ad9f8bf08b9e9e10";
hash = "sha256-ufWHDqvAaQiqwlezm95BCTLMdQEK5NTmMQgeq3oKR1o=";
rev = "73c91061930cf10002aae4f2dd7ac301af20dfdc";
hash = "sha256-EN4xOBIrIrNBd/YQPc1xRagAvCdvEH83shb2axj9xX0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-+RqW8ISBKMKIzsJd3PBUPi5OYCADjXctOH+jH19qg9g=";
cargoHash = "sha256-wpO7JYLjuEbKc/a4WO4KeUxdDCI1BswvgvSH+sFh1V0=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

6
pkgs/by-name/po/pomerium-cli/package.nix
View file

@ -14,16 +14,16 @@ let
in
buildGoModule rec {
pname = "pomerium-cli";
version = "0.23.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "pomerium";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-2upvdL8kk0Kbll8UbviyzIX2jdK+tqcHvVlkpz5JjrA=";
sha256 = "sha256-H5wZaZsMgHPcO1qDoaqp/UP+stU7IG070DNFhxC7Ehw=";
};
vendorHash = "sha256-aQo58i+XuCkdjIg/IPf7kNLXXA0NwZbQMhgWyMb45B4=";
vendorHash = "sha256-a5eESlDBxYVvfiafdZFIjUqIxB51LZc67fUJek69qwc=";
subPackages = [
"cmd/pomerium-cli"

6
pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "rabbitmqadmin-ng";
version = "0.27.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "rabbitmq";
repo = "rabbitmqadmin-ng";
tag = "v${version}";
hash = "sha256-PSG//vyhNFUVDf9XfIuqm0mGcDo0B02+x0Sesj3ggAA=";
hash = "sha256-EWL1MFBBIsjfkx43SFSxsxjM0/XVYS8O3fYkXWkkctc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-hMFawT1m8VNRWENvJtoi5Ysw7k3iNRB7y5wgNAJCxX8=";
cargoHash = "sha256-PShBU5xC9+X1exoIFP64xHWn6oVsID4ZcYMuUq/1vKI=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];

4
pkgs/by-name/ra/raspberrypi-eeprom/package.nix
View file

@ -14,13 +14,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raspberrypi-eeprom";
version = "2025.02.12-2712";
version = "2025.03.10-2712";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
tag = "v${finalAttrs.version}";
hash = "sha256-FuOBjS/9gPj775ELE3CKh6wQfBQtnaIJy5I22pAG99M=";
hash = "sha256-VfguC6sECfkTPR/BDIYXEzQk7ebYxvDjDZsRmEvQ39o=";
};
buildInputs = [ python3 ];

6
pkgs/by-name/re/retroarch-assets/package.nix
View file

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "retroarch-assets";
version = "1.20.0-unstable-2025-03-09";
version = "1.20.0-unstable-2025-03-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "retroarch-assets";
rev = "fb39cdde6dfaea2c98218d28c71b14afc632fa03";
hash = "sha256-2ytGtoci0xd10KrYGwMsGbXoT402DiokSVlCek8nhyI=";
rev = "818aca56efd784624a241a12936b5c0864e3ddd8";
hash = "sha256-14n9oQbvzl66pgWLMYEpAM7uJUH5e8a3xRCy5f1TFIw=";
};
makeFlags = [

4
pkgs/by-name/ro/rocketchat-desktop/package.nix
View file

@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rocketchat-desktop";
version = "4.1.2";
version = "4.2.0";
src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
hash = "sha256-lcMxBEcZkJARFd+ZQTAdLQLVy4/SIi4ps8N798PomyM=";
hash = "sha256-6eoZbjmwzvXz7u+zkyrvzebens8GF9jGQA40cKxX26M=";
};
nativeBuildInputs = [

26
pkgs/by-name/sd/SDL1/find-headers.patch
View file

@ -1,26 +0,0 @@
diff --git a/sdl-config.in b/sdl-config.in
index e0fcc0c..bf7928a 100644
--- a/sdl-config.in
+++ b/sdl-config.in
@@ -42,14 +42,18 @@ while test $# -gt 0; do
echo @SDL_VERSION@
;;
--cflags)
- echo -I@includedir@/SDL @SDL_CFLAGS@
+ SDL_CFLAGS=""
+ for i in @includedir@/SDL $SDL_PATH; do
+ SDL_CFLAGS="$SDL_CFLAGS -I$i"
+ done
+ echo $SDL_CFLAGS @SDL_CFLAGS@
;;
@ENABLE_SHARED_TRUE@ --libs)
-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ $SDL_LIB_PATH
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ $SDL_LIB_PATH
@ENABLE_STATIC_TRUE@ ;;
*)
echo "${usage}" 1>&2

156
pkgs/by-name/sd/SDL1/package.nix
View file

@ -1,156 +0,0 @@
{ lib
, alsa-lib
, audiofile
, config
, darwin
, fetchpatch
, fetchurl
, libGL
, libGLU
, libICE
, libXext
, libXrandr
, libcap
, libiconv
, libpulseaudio
, pkg-config
, stdenv
# Boolean flags
, alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid
, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL
, openglSupport ? libGLSupported
, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio
, x11Support ? !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isAndroid
}:
# NOTE: When editing this expression see if the same change applies to
# SDL2 expression too
let
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
extraPropagatedBuildInputs = [ ]
++ lib.optionals x11Support [ libXext libICE libXrandr ]
++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux) [ libGL ]
# libGLU doesn’t work with Android's SDL
++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ]
++ lib.optionals (openglSupport && stdenv.hostPlatform.isDarwin) [ OpenGL GLUT ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
in
stdenv.mkDerivation (finalAttrs: {
pname = "SDL";
version = "1.2.15";
src = fetchurl {
url = "https://www.libsdl.org/release/SDL-${finalAttrs.version}.tar.gz";
hash = "sha256-1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=";
};
outputs = [ "out" "dev" ];
outputBin = "dev"; # sdl-config
nativeBuildInputs = [ pkg-config ]
++ lib.optional stdenv.hostPlatform.isLinux libcap;
propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;
buildInputs =
[ ]
++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
configureFlags = [
"--disable-oss"
"--disable-video-x11-xme"
"--enable-rpath"
# Building without this fails on Darwin with
#
# ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
# SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
#
# Please try revert the change that introduced this comment when updating SDL.
] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-x11-shared"
++ lib.optional (!x11Support) "--without-x"
++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
++ lib.optional stdenv.hostPlatform.isMusl "CFLAGS=-DICONV_INBUF_NONCONST";
patches = [
./find-headers.patch
# Fix window resizing issues, e.g. for xmonad
# Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430
(fetchpatch {
name = "fix_window_resizing.diff";
url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779";
hash = "sha256-hj3ykyOKeDh6uPDlvwNHSowQxmR+mfhvCnHvcdhXZfw=";
})
# Fix drops of keyboard events for SDL_EnableUNICODE
(fetchpatch {
url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch";
hash = "sha256-5V6K0oTN56RRi48XLPQsjgLzt0a6GsjajDrda3ZEhTw=";
})
# Ignore insane joystick axis events
(fetchpatch {
url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch";
hash = "sha256-8CvKHvkmidm4tFCWYhxE059hN3gwOKz6nKs5rvQ4ZKw=";
})
# https://bugzilla.libsdl.org/show_bug.cgi?id=1769
(fetchpatch {
url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch";
hash = "sha256-t+60bC4gLFbslXm1n9nimiFrho2DnxdWdKr4H9Yp/sw=";
})
# Workaround X11 bug to allow changing gamma
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
(fetchpatch {
name = "SDL_SetGamma.patch";
url = "https://src.fedoraproject.org/rpms/SDL/raw/7a07323e5cec08bea6f390526f86a1ce5341596d/f/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch";
hash = "sha256-m7ZQ5GnfGlMkKJkrBSB3GrLz8MT6njgI9jROJAbRonQ=";
})
# Fix a build failure on OS X Mavericks
# Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
(fetchpatch {
url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch";
hash = "sha256-DCWZo0LzHJoWUr/5vL5pKIEmmz3pvr4TO6Ip8WykfDI=";
})
(fetchpatch {
url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch";
hash = "sha256-Knq+ceL6y/zKcfJayC2gy+DKnoa8DLslBNl3laMzwa8=";
})
(fetchpatch {
name = "CVE-2022-34568.patch";
url = "https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b.patch";
hash = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o=";
})
];
enableParallelBuilding = true;
postInstall = ''
moveToOutput share/aclocal "$dev"
'';
# See the same place in the expression for SDL2
postFixup = let
rpath = lib.makeLibraryPath extraPropagatedBuildInputs;
in ''
for lib in $out/lib/*.so* ; do
if [[ -L "$lib" ]]; then
patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib"
fi
done
'';
setupHook = ./setup-hook.sh;
passthru = { inherit openglSupport; };
meta = {
homepage = "http://www.libsdl.org/";
description = "Cross-platform multimedia library";
license = lib.licenses.lgpl21;
mainProgram = "sdl-config";
maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ lovek323 ]);
platforms = lib.platforms.unix;
};
})

16
pkgs/by-name/sd/SDL1/setup-hook.sh
View file

@ -1,16 +0,0 @@
addSDLPath () {
if [ -e "$1/include/SDL" ]; then
export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL"
# NB this doesn’t work with split dev packages because different packages
# will contain "include/SDL/" and "lib/" directories.
#
# However the SDL_LIB_PATH is consumed by SDL itself and serves to locate
# libraries like SDL_mixer, SDL_image, etc which are not split-package
# so the check above will only trigger on them.
if [ -e "$1/lib" ]; then
export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib"
fi
fi
}
addEnvHooks "$hostOffset" addSDLPath

16
pkgs/by-name/sd/SDL_image/clang16-webp-errors.patch
View file

@ -1,16 +0,0 @@
diff -ur a/IMG_webp.c b/IMG_webp.c
--- a/IMG_webp.c 2012-01-20 20:51:33.000000000 -0500
+++ b/IMG_webp.c 2024-07-24 20:48:58.697398200 -0400
@@ -47,9 +47,9 @@
static struct {
int loaded;
void *handle;
- int/*VP8StatuCode*/ (*webp_get_features_internal) (const uint8_t *data, uint32_t data_size, WebPBitstreamFeatures* const features, int decoder_abi_version);
- uint8_t* (*webp_decode_rgb_into) (const uint8_t* data, uint32_t data_size, uint8_t* output_buffer, int output_buffer_size, int output_stride);
- uint8_t* (*webp_decode_rgba_into) (const uint8_t* data, uint32_t data_size, uint8_t* output_buffer, int output_buffer_size, int output_stride);
+ VP8StatusCode (*webp_get_features_internal) (const uint8_t *data, size_t data_size, WebPBitstreamFeatures* const features, int decoder_abi_version);
+ uint8_t* (*webp_decode_rgb_into) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride);
+ uint8_t* (*webp_decode_rgba_into) (const uint8_t* data, size_t data_size, uint8_t* output_buffer, size_t output_buffer_size, int output_stride);
} lib;
#ifdef LOAD_WEBP_DYNAMIC

32
pkgs/by-name/sd/SDL_image/package.nix
View file

@ -1,8 +1,7 @@
{
lib,
SDL,
fetchpatch,
fetchurl,
fetchFromGitHub,
giflib,
libXpm,
libjpeg,
@ -11,29 +10,20 @@
libwebp,
pkg-config,
stdenv,
unstableGitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "SDL_image";
version = "1.2.12";
version = "1.2.12-unstable-2025-02-13";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_image/release/SDL_image-${finalAttrs.version}.tar.gz";
hash = "sha256-C5ByKYRWEATehIR3RNVmgJ27na9zKp5QO5GhtahOVpk=";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL_image";
rev = "74e8d577216e3c3a969e67b68b2e4769fcbf8fdd";
hash = "sha256-WSNH7Pw/tL5rgPQtOjxRGp2UlYSJJmXS2YQS+fAkXSc=";
};
patches = [
# Fixed security vulnerability in XCF image loader
(fetchpatch {
name = "CVE-2017-2887";
url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch";
includes = [ "IMG_xcf.c" ];
hash = "sha256-Z0nyEtE1LNGsGsN9SFG8ZyPDdunmvg81tUnEkrJQk5w=";
})
# Fixes incompatible function pointer type errors with clang 16
./clang16-webp-errors.patch
];
configureFlags = [
# Disable dynamic loading or else dlopen will fail because of no proper
# rpath
@ -70,6 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
passthru.updateScript = unstableGitUpdater {
tagFormat = "release-1.*";
tagPrefix = "release-";
branch = "SDL-1.2";
};
meta = {
homepage = "http://www.libsdl.org/projects/SDL_image/";
description = "SDL image library";

9
pkgs/by-name/sd/SDL_mixer/package.nix
View file

@ -10,6 +10,8 @@
pkg-config,
smpeg,
stdenv,
# passthru.tests
onscripter-en,
# Boolean flags
enableNativeMidi ? false,
enableSdltest ? (!stdenv.hostPlatform.isDarwin),
@ -20,6 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
pname = "SDL_mixer";
version = "1.2.12";
# word of caution: while there is a somewhat maintained SDL-1.2 branch on
# https://github.com/libsdl-org/SDL_mixer, it switches from smpeg to mpg123 which
# breaks autoconf in a bunch of packages, it's better to cherry-pick patches as needed
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${finalAttrs.version}.tar.gz";
hash = "sha256-FkQwgnmpdXmQSeSCavLPx4fK0quxGqFFYuQCUh+GmSo=";
@ -102,6 +107,10 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
passthru.tests = {
inherit onscripter-en;
};
meta = {
description = "SDL multi-channel audio mixer library";
homepage = "http://www.libsdl.org/projects/SDL_mixer/";

19
pkgs/by-name/sd/SDL_net/package.nix
View file

@ -1,20 +1,23 @@
{
lib,
SDL,
fetchurl,
fetchFromGitHub,
pkg-config,
stdenv,
unstableGitUpdater,
# Boolean flags
enableSdltest ? (!stdenv.hostPlatform.isDarwin),
}:
stdenv.mkDerivation (finalAttrs: {
pname = "SDL_net";
version = "1.2.8";
version = "1.2.8-unstable-2024-04-23";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${finalAttrs.version}.tar.gz";
hash = "sha256-X0p6i7iE95PCeKw/NxO+QZgMXu3M7P8CYEETR3FPrLQ=";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL_net";
rev = "0043be2e559f8d562d04bf62d6e3f4162ed8edad";
hash = "sha256-/W1Mq6hzJNNwpcx+VUT4DRGP3bE06GGMbYDGHBc4XlQ=";
};
nativeBuildInputs = [
@ -32,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
passthru.updateScript = unstableGitUpdater {
tagFormat = "release-1.*";
tagPrefix = "release-";
branch = "SDL-1.2";
};
meta = {
homepage = "https://github.com/libsdl-org/SDL_net";
description = "SDL networking library";

35
pkgs/by-name/sd/SDL_ttf/package.nix
View file

@ -1,33 +1,25 @@
{
lib,
SDL,
fetchpatch,
fetchurl,
fetchFromGitHub,
freetype,
stdenv,
unstableGitUpdater,
# Boolean flags
enableSdltest ? (!stdenv.hostPlatform.isDarwin),
}:
stdenv.mkDerivation (finalAttrs: {
pname = "SDL_ttf";
version = "2.0.11";
version = "2.0.11.1-unstable-2024-04-23";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${finalAttrs.version}.tar.gz";
hash = "sha256-ckzYlez02jGaPvFkiStyB4vZJjKl2BIREmHN4kjrzbc=";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL_ttf";
rev = "3c4233732b94ce08d5f6a868e597af39e13f8b23";
hash = "sha256-FX6Ko4CaOSCSKdpWVsJhTZXlWk1cnjbfVfMDiGG2+TU=";
};
patches = [
# Bug #830: TTF_RenderGlyph_Shaded is broken
(fetchpatch {
url = "https://bugzilla-attachments.libsdl.org/attachments/830/renderglyph_shaded.patch.txt";
hash = "sha256-TZzlZe7gCRA8wZDHQZsqESAOGbLpJzIoB0HD8L6z3zE=";
})
];
patchFlags = [ "-p0" ];
buildInputs = [
SDL
freetype
@ -35,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
# pass in correct *-config for cross builds
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config";
env.FT2_CONFIG = lib.getExe' freetype.dev "freetype-config";
configureFlags = [
(lib.enableFeature enableSdltest "sdltest")
@ -43,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
passthru.updateScript = unstableGitUpdater {
tagFormat = "release-2.0.11";
tagPrefix = "release-";
branch = "SDL-1.2";
};
meta = {
homepage = "https://github.com/libsdl-org/SDL_ttf";
description = "SDL TrueType library";
@ -50,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]);
inherit (SDL.meta) platforms;
knownVulnerabilities = [
"CVE-2022-27470"
# CVE applies to SDL2 https://github.com/NixOS/nixpkgs/pull/274836#issuecomment-2708627901
# "CVE-2022-27470"
];
};
})

4
pkgs/by-name/se/seaview/package.nix
View file

@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
version = "5.0.5";
version = "5.1";
pname = "seaview";
src = fetchurl {
url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
sha256 = "sha256-zo9emLpHiDv6kekbx55NOibxWN2Zg7XngzGkUqSx+PI=";
sha256 = "sha256-tL9YQB4wgUOCyCWxOkw+6oyinDFO1cSh9DRZt47W+Ys=";
};
buildInputs = [

4
pkgs/by-name/sn/snapcraft/package.nix
View file

@ -13,7 +13,7 @@
python3Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.7.2";
version = "8.7.3";
pyproject = true;
@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
tag = version;
hash = "sha256-RlaAvLU0UE8u6y2xCHLxbOFLQF9jRa+8e2mgrRgTIjw=";
hash = "sha256-T39hhosZTttX8jMlF5ul9oBcsh+FKusepj0k2NMZHNU=";
};
patches = [

6
pkgs/by-name/so/soju/package.nix
View file

@ -9,17 +9,17 @@
buildGoModule rec {
pname = "soju";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "emersion";
repo = "soju";
rev = "v${version}";
hash = "sha256-zJj9y3llJOijmx7+C5NOzEpIG/SEeg+ZhWtLPQ/iabY=";
hash = "sha256-qbSTaE0qOeXVcEmOver8Tu+gwV4cP4gNzIxByLKApCU=";
};
vendorHash = "sha256-E/9a8GCEb/0Xto6cgH9R4WWdaoo/nwb6kcFdoEeMUps=";
vendorHash = "sha256-JhoAtBw4O6lOd27dIXBNvA9EfUH5AD3ZHuGcWgU/Xv0=";
nativeBuildInputs = [
installShellFiles

6
pkgs/by-name/so/sonarlint-ls/package.nix
View file

@ -16,17 +16,17 @@
maven.buildMavenPackage rec {
pname = "sonarlint-ls";
version = "3.17.0.75948";
version = "3.18.0.75982";
src = fetchFromGitHub {
owner = "SonarSource";
repo = "sonarlint-language-server";
rev = version;
hash = "sha256-9ZZPAkfYnHYaPFGo/WfOhUIZ+Aq7SNsVmyXgDwe68gk=";
hash = "sha256-/SpooLAJutBJ/FakSUyXMtPLy3TaPxCU8KEMnnzgdBs=";
};
mvnJdk = jdk17;
mvnHash = "sha256-tsYkp6Zr9gCgb0l6vQViSB7zcbf6JX+JwO4ZYqeG52c=";
mvnHash = "sha256-IMM3xXWTnYzD3415tMjuwiQD2NMGM2XkuxdMYpsaqfA=";
# Disables failing tests which either need network access or are flaky.
mvnParameters = lib.escapeShellArgs [

9
pkgs/by-name/st/strace/package.nix
View file

@ -11,15 +11,20 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "6.13";
version = "6.14";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
hash = "sha256-4gna8O4DjKWtzEwnfpJztNUfRqL/htpXXTZ0KsNQihc=";
hash = "sha256-JE87XCCjKFTKm3yno+4JHdPUvSCTOhcezujbSGx308k=";
};
separateDebugInfo = true;
outputs = [
"out"
"man"
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];

2
pkgs/by-name/ta/tacent/package.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "bluescan";
repo = "tacent";
tag = finalAttrs.version;
tag = "v${finalAttrs.version}";
hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8=";
};

6
pkgs/by-name/ti/tinty/package.nix
View file

@ -6,7 +6,7 @@
nix-update-script,
}:
let
version = "0.26.1";
version = "0.27.0";
in
rustPlatform.buildRustPackage {
pname = "tinty";
@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
owner = "tinted-theming";
repo = "tinty";
tag = "v${version}";
hash = "sha256-+HTdmAKsm9YXyLktAfjPenbRi1RrrCusc6+ZarCI7Ac=";
hash = "sha256-3gJRVKkC3B+DVfVmvlRjBdp6cD5x5wZMX3p4PWVIjno=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-7erxE5sfEMsZiOh/VPfQYsowUub9nefkNaGYjNr0Pyg=";
cargoHash = "sha256-CJcPhUxClxk2SQAbAt1hzX7QbAhpXQCEc4xy1ADkAtk=";
# Pretty much all tests require internet access
doCheck = false;

4
pkgs/by-name/ti/tinyxml-2/package.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tinyxml2";
version = "10.0.0";
version = "11.0.0";
src = fetchFromGitHub {
owner = "leethomason";
repo = "tinyxml2";
rev = finalAttrs.version;
hash = "sha256-9xrpPFMxkAecg3hMHzzThuy0iDt970Iqhxs57Od+g2g=";
hash = "sha256-rYVQSvxA0nxlZFHwGcOWkxcXZWEvTxR9P+d8E7CSm6U=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/by-name/we/weston/package.nix
View file

@ -31,7 +31,7 @@
pipewireSupport ? true,
pipewire,
rdpSupport ? true,
freerdp3,
freerdp,
remotingSupport ? true,
gst_all_1,
vaapiSupport ? true,
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
++ lib.optional lcmsSupport lcms2
++ lib.optional pangoSupport pango
++ lib.optional pipewireSupport pipewire
++ lib.optional rdpSupport freerdp3
++ lib.optional rdpSupport freerdp
++ lib.optionals remotingSupport [
gst_all_1.gstreamer
gst_all_1.gst-plugins-base

6
pkgs/by-name/wo/woodpecker-plugin-git/package.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "woodpecker-plugin-git";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "woodpecker-ci";
repo = "plugin-git";
tag = version;
hash = "sha256-5YyYCdZpRlchLH4qX9golv8DmlMghosWi5WXP9WxMXU=";
hash = "sha256-8CioqP0+L4DMF3S7QOGAmq3Uj0WAi0W7jhw0HNWVPwQ=";
};
vendorHash = "sha256-XOriHt+qyOcuGZzMtGAZuztxLod92JzjKWWjNq5Giro=";
vendorHash = "sha256-X9cpR45fB4HqTn3TiehAw6J7G2lXAQ3OfxRh5N+ceFc=";
env.CGO_ENABLED = "0";

73
pkgs/by-name/ya/yay/package.nix Normal file
View file

@ -0,0 +1,73 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
pacman,
libarchive,
installShellFiles,
}:
buildGoModule (finalAttrs: {
pname = "yay";
version = "12.4.2";
src = fetchFromGitHub {
owner = "Jguer";
repo = "yay";
tag = "v${finalAttrs.version}";
hash = "sha256-QLkqpeHVdR9dxhSGl2wQ7WL1mX6JJm3z6pLeI37z3oM=";
};
vendorHash = "sha256-BKxhRa2y/liBDtMLg0Rlf/ysjQOgIaFjXbPWYBw53Po=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [
pacman
libarchive
];
env.CGO_ENABLED = 1;
checkFlags =
let
skippedTests = [
# need fhs
"TestAlpmExecutor"
"TestBuildRuntime"
"TestPacmanConf"
# need su/sudo/doas
"TestNewConfig"
"TestNewConfigAURDEST"
"TestNewConfigAURDESTTildeExpansion"
"TestConfiguration_setPrivilegeElevator"
"TestConfiguration_setPrivilegeElevator_su"
"TestConfiguration_setPrivilegeElevator_no_path"
"TestConfiguration_setPrivilegeElevator_doas"
"TestConfiguration_setPrivilegeElevator_pacman_auth_doas"
"TestConfiguration_setPrivilegeElevator_custom_script"
"TestConfiguration_setPrivilegeElevator_pacman_auth_sudo"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
postInstall =
''
installManPage doc/yay.8
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --name yay.bash --bash completions/bash
installShellCompletion --name yay.fish --fish completions/fish
installShellCompletion --name _yay --zsh completions/zsh
'';
meta = {
description = "AUR Helper written in Go";
homepage = "https://github.com/Jguer/yay";
mainProgram = "yay";
platforms = lib.platforms.linux;
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ emaryn ];
};
})

4
pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
View file

@ -6,11 +6,11 @@
buildGoModule rec {
pname = "zabbix-agent2-plugin-postgresql";
version = "7.2.3";
version = "7.2.4";
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
hash = "sha256-TtcEY/X8FXFcI3cghGRnLiCDj0fUwspXf90G/h22M9s=";
hash = "sha256-QslDQ45XQ3FjCSRu1cytHVPwJWpIvrxvqC57lCZGMKs=";
};
vendorHash = null;

4
pkgs/by-name/za/zapret/package.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zapret";
version = "70.3";
version = "70.5";
src = fetchFromGitHub {
owner = "bol-van";
repo = "zapret";
tag = "v${finalAttrs.version}";
hash = "sha256-sYLZH/j8bHUKfkUAAAuTrCTOXB6Qp9kVj4GjyFv6M+g=";
hash = "sha256-El/3qWZCyN5WixDWbtv+W69z0WITGMODX83dwDIT/94=";
};
buildInputs = [

6
pkgs/desktops/gnome/extensions/pop-shell/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation {
pname = "gnome-shell-extension-pop-shell";
version = "1.2.0-unstable-2025-02-20";
version = "1.2.0-unstable-2025-03-10";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "29869118d1b89e5fa2ee97d11f36f20343ecba4c";
hash = "sha256-I1DegY+vG/Yt6jE0cjH3lrzeLsS5Ce43p/zWE+5yYJo=";
rev = "b3fc4253dc29b30fb52ac5eef5d3af643a46d18c";
hash = "sha256-EMX1AREpOO3DgxV/EbF2hP5JLggzlgFu1gsbhF3W1os=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/extensions/unite/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "81";
version = "82";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
hash = "sha256-VGanUhZ1Lh0L7lMThR1PzSoRHU8AOSIIqUOpjNUULk8=";
hash = "sha256-Ceo0HQupiihD6GW6/PUbjuArOXtPtAmUPxmNi7DS8E0=";
};
passthru = {

12
pkgs/development/compilers/dart/sources.nix
View file

@ -1,27 +1,27 @@
let
version = "3.7.1";
version = "3.7.2";
in
{ fetchurl }:
{
versionUsed = version;
"${version}-x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
sha256 = "0bldcn4j99cv2a6g3s263929r7wqhjaxylwm26nd2jdfnqbmjxm2";
sha256 = "1bj9libb4bnmgm4544876xz512i1nvp73fbxrs4jz0xfp398c206";
};
"${version}-aarch64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
sha256 = "191jig17mnk0gjys2xd0qr267idjv2h50qnaz0cciflj60b2az7m";
sha256 = "0z35ndh7mdaz1dnd2yvv5g50jbfy563yclgfjlx9k400b7cn6vhh";
};
"${version}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = "1zj7k2bczb9yy63vjj8xm3ljd9sx9z77awf4wdvv6y02gnzxv4ga";
sha256 = "1a2cwr3qyy8paxjhgb1xwcv4rm1ml0dfv1byl5zynmz0c6nwqlil";
};
"${version}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "0wgfl118j7s7xjz4i0m4gyzxzsjv7x9wq9xr2m036l4ngng9a4r8";
sha256 = "133q4jz5wszs0bja7pnfgjd7mvawdspgz866ip3m0v351zbzs5n2";
};
"${version}-i686-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "1zj60jqpnv1apl4439vvxxrgfvg3azwaaizdmq8chfmrg97vr85x";
sha256 = "0y3slablp94lbcm9bafg0p407axrdqxf33vpxc420ifqczpidmh2";
};
}

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