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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-09 18:05:25 +00:00
committed by GitHub
parent 3fbcbb33f6 21b565c06f
commit 077cb3aa7d
73 changed files with 1083 additions and 1184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2511.section.md
+3 -1
View File
@@ -228,7 +228,9 @@
- `services.dependency-track` removed its configuration of the JVM heap size. This lets the JVM choose its maximum heap size automatically, which should work much better in practice for most users. For deployments on systems with little RAM, it may now be necessary to manually configure a maximum heap size using {option}`services.dependency-track.javaArgs`.
- `services.dnscrypt-proxy2` gains a `package` option to specify dnscrypt-proxy package to use.
- `services.dnscrypt-proxy2` was renamed to `services.dnscrypt-proxy` to match the package name. The systemd service is now also `dnscrypt-proxy`, but the old name is still provided as an alias for backwards compatibility.
- `services.dnscrypt-proxy` gains a `package` option to specify dnscrypt-proxy package to use.
- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.
nixos/modules/module-list.nix
+1 -1
View File
@@ -1127,7 +1127,7 @@
./services/networking/deconz.nix
./services/networking/dhcpcd.nix
./services/networking/dnscache.nix
./services/networking/dnscrypt-proxy2.nix
./services/networking/dnscrypt-proxy.nix
./services/networking/dnsdist.nix
./services/networking/dnsmasq.nix
./services/networking/dnsproxy.nix
nixos/modules/rename.nix
-1
View File
@@ -131,7 +131,6 @@ in
"services"
"deepin"
] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.")
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
(mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] ''
The dnscrypt-wrapper module was removed since the project has been effectively unmaintained since 2018;
moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys.
nixos/modules/services/networking/dnscrypt-proxy2.nix → nixos/modules/services/networking/dnscrypt-proxy.nix
+12 -7
View File
@@ -7,13 +7,17 @@
let
cfg = config.services.dnscrypt-proxy2;
cfg = config.services.dnscrypt-proxy;
in
{
options.services.dnscrypt-proxy2 = {
enable = lib.mkEnableOption "dnscrypt-proxy2";
imports = [
(lib.mkRenamedOptionModule [ "services" "dnscrypt-proxy2" ] [ "services" "dnscrypt-proxy" ])
];
options.services.dnscrypt-proxy = {
enable = lib.mkEnableOption "dnscrypt-proxy";
package = lib.mkPackageOption pkgs "dnscrypt-proxy" { };
@@ -38,7 +42,7 @@ in
upstreamDefaults = lib.mkOption {
description = ''
Whether to base the config declared in {option}`services.dnscrypt-proxy2.settings` on the upstream example config (<https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml>)
Whether to base the config declared in {option}`services.dnscrypt-proxy.settings` on the upstream example config (<https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml>)
Disable this if you want to declare your dnscrypt config from scratch.
'';
@@ -49,7 +53,7 @@ in
configFile = lib.mkOption {
description = ''
Path to TOML config file. See: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml>
If this option is set, it will override any configuration done in options.services.dnscrypt-proxy2.settings.
If this option is set, it will override any configuration done in options.services.dnscrypt-proxy.settings.
'';
example = "/etc/dnscrypt-proxy/dnscrypt-proxy.toml";
type = lib.types.path;
@@ -73,7 +77,7 @@ in
}
${pkgs.buildPackages.remarshal}/bin/json2toml < config.json > $out
'';
defaultText = lib.literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`";
defaultText = lib.literalMD "TOML file generated from {option}`services.dnscrypt-proxy.settings`";
};
};
@@ -81,7 +85,7 @@ in
networking.nameservers = lib.mkDefault [ "127.0.0.1" ];
systemd.services.dnscrypt-proxy2 = {
systemd.services.dnscrypt-proxy = {
description = "DNSCrypt-proxy client";
wants = [
"network-online.target"
@@ -93,6 +97,7 @@ in
wantedBy = [
"multi-user.target"
];
aliases = [ "dnscrypt-proxy2.service" ];
serviceConfig = {
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CacheDirectory = "dnscrypt-proxy";
nixos/modules/services/web-apps/calibre-web.nix
+3 -1
View File
@@ -160,6 +160,9 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
# fix book cover cache directory defaults to a path under /nix/store/
environment.CACHE_DIR = "/var/cache/calibre-web";
serviceConfig = {
Type = "simple";
User = cfg.user;
@@ -181,7 +184,6 @@ in
CacheDirectory = "calibre-web";
CacheDirectoryMode = "0750";
environment.CACHE_DIR = "/var/cache/calibre-web";
}
// lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) {
StateDirectory = cfg.dataDir;
nixos/tests/all-tests.nix
+1 -1
View File
@@ -439,7 +439,7 @@ in
imports = [ ./discourse.nix ];
_module.args.package = pkgs.discourseAllPlugins;
};
dnscrypt-proxy2 = runTestOn [ "x86_64-linux" ] ./dnscrypt-proxy2.nix;
dnscrypt-proxy = runTestOn [ "x86_64-linux" ] ./dnscrypt-proxy.nix;
dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
doas = runTest ./doas.nix;
docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix;
nixos/tests/dnscrypt-proxy2.nix → nixos/tests/dnscrypt-proxy.nix
+4 -4
View File
@@ -3,7 +3,7 @@ let
localProxyPort = 43;
in
{
name = "dnscrypt-proxy2";
name = "dnscrypt-proxy";
meta.maintainers = with lib.maintainers; [ joachifm ];
nodes = {
@@ -14,8 +14,8 @@ in
{
security.apparmor.enable = true;
services.dnscrypt-proxy2.enable = true;
services.dnscrypt-proxy2.settings = {
services.dnscrypt-proxy.enable = true;
services.dnscrypt-proxy.settings = {
listen_addresses = [ "127.0.0.1:${toString localProxyPort}" ];
sources.public-resolvers = {
urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ];
@@ -32,7 +32,7 @@ in
testScript = ''
client.wait_for_unit("dnsmasq")
client.wait_for_unit("dnscrypt-proxy2")
client.wait_for_unit("dnscrypt-proxy")
client.wait_until_succeeds("ss --numeric --udp --listening | grep -q ${toString localProxyPort}")
'';
}
nixos/tests/dnsdist.nix
+4 -4
View File
@@ -72,9 +72,9 @@ in
];
nodes.client = {
services.dnscrypt-proxy2.enable = true;
services.dnscrypt-proxy2.upstreamDefaults = false;
services.dnscrypt-proxy2.settings = {
services.dnscrypt-proxy.enable = true;
services.dnscrypt-proxy.upstreamDefaults = false;
services.dnscrypt-proxy.settings = {
server_names = [ "server" ];
listen_addresses = [ "[::1]:53" ];
cache = false;
@@ -92,7 +92,7 @@ in
almost_expiration = server.succeed("date --date '14min'").strip()
with subtest("The DNSCrypt client can connect to the server"):
client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\\[server\\] OK'")
client.wait_until_succeeds("journalctl -u dnscrypt-proxy --grep '\\[server\\] OK'")
with subtest("DNS queries over UDP are working"):
client.wait_for_open_port(53)
pkgs/applications/editors/vim/plugins/generated.nix
+412 -412
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+101 -90
View File
@@ -32,12 +32,12 @@
};
agda = buildGrammar {
language = "agda";
version = "0.0.0+rev=b9b32fa";
version = "0.0.0+rev=e8d47a6";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-agda";
rev = "b9b32fa042c2952a7bfca86847ea325e44ccc897";
hash = "sha256-Goll4J6xrHO8YEuYoLR2rqy6lCMsr4JJbEs5C1jiX5Q=";
rev = "e8d47a6987effe34d5595baf321d82d3519a8527";
hash = "sha256-5h56+A7ZypckJ9mwht7XP/66oiehwAEQ4Z6WeVhQBvQ=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda";
};
@@ -66,12 +66,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=2f0c122";
version = "0.0.0+rev=53eb391";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-arduino";
rev = "2f0c1223c50aa4b754136db544204c6fc99ffc77";
hash = "sha256-t0EtibjsMJpiTbwhkgZGv9lUdpI6gg2VoSEUDXswEMA=";
rev = "53eb391da4c6c5857f8defa2c583c46c2594f565";
hash = "sha256-qQVUWCOZ4y9FTsIf0FI3vmYBhLYz4hcqRTo+5C2MYvc=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
};
@@ -121,12 +121,12 @@
};
bash = buildGrammar {
language = "bash";
version = "0.0.0+rev=56b54c6";
version = "0.0.0+rev=b930fed";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-bash";
rev = "56b54c61fb48bce0c63e3dfa2240b5d274384763";
hash = "sha256-vRaN/mNfpR+hdv2HVS1bzaW0o+HGjizRFsk3iinICJE=";
rev = "b930fed16910a74c230e09ea5b97f671448d2116";
hash = "sha256-7VZRkoQc6l+YWzdsnXM6FlTzJq/eCgH1/SWkh6WTjp8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
};
@@ -231,23 +231,23 @@
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=7fa1be1";
version = "0.0.0+rev=d8d0503";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "7fa1be1b694b6e763686793d97da01f36a0e5c12";
hash = "sha256-gmzbdwvrKSo6C1fqTJFGxy8x0+T+vUTswm7F5sojzKc=";
rev = "d8d0503aa0152119149ecad76685f37682c0d03f";
hash = "sha256-Ie1WXN3aMfYABoLIl0rcwLcpoiNcufZoJ5sGaKqBxfo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
c3 = buildGrammar {
language = "c3";
version = "0.0.0+rev=be8c7fc";
version = "0.0.0+rev=057a75d";
src = fetchFromGitHub {
owner = "c3lang";
repo = "tree-sitter-c3";
rev = "be8c7fcfb424a93f541ebd21d23611b92dff0444";
hash = "sha256-EmRuBiK1X6FAjfMg0ilA2OVJ/s0ag/dD9EMqALIwmIY=";
rev = "057a75df0c866034d8edce989f701ee2cb0481d8";
hash = "sha256-MeeyiX9ZozGDbTNbO/Tvs97tQyzic5pu2sIPgXow2ok=";
};
meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
};
@@ -319,12 +319,12 @@
};
clojure = buildGrammar {
language = "clojure";
version = "0.0.0+rev=be514ee";
version = "0.0.0+rev=e43eff8";
src = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-clojure";
rev = "be514eec2c86d560c18fab146e9298e21b8eab62";
hash = "sha256-VnzOuLrE/lcXOCg3Iuntj9m8zy/Exwi1Mv+nZvi62Qs=";
rev = "e43eff80d17cf34852dcd92ca5e6986d23a7040f";
hash = "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=";
};
meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
};
@@ -396,12 +396,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=5cb9b69";
version = "0.0.0+rev=077f14f";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609";
hash = "sha256-s9/n09EruafAMF3g6xOkfu6L+WXUx83PpcVKn1Tnmg8=";
rev = "077f14ffd2de226ac95808596989c705f6dee289";
hash = "sha256-xOYuzYil5jieikb8Brt3mjtoOER2ZVO6zfSlWFn7ZbY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@@ -696,12 +696,12 @@
};
embedded_template = buildGrammar {
language = "embedded_template";
version = "0.0.0+rev=8495d10";
version = "0.0.0+rev=3499d85";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-embedded-template";
rev = "8495d106154741e6d35d37064f864758ece75de6";
hash = "sha256-DCEno1QzPcM9853hldrm4IAqKsTNALe//laDn+Hcr8Q=";
rev = "3499d85f0a0d937c507a4a65368f2f63772786e1";
hash = "sha256-H+kcKwVjIvRBRj+pjSjp8NX0kH63SDWiAS5iovT9e/c=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
};
@@ -873,12 +873,12 @@
};
gap = buildGrammar {
language = "gap";
version = "0.0.0+rev=8dee53c";
version = "0.0.0+rev=2bac148";
src = fetchFromGitHub {
owner = "gap-system";
repo = "tree-sitter-gap";
rev = "8dee53cfb962600dd35ca25432f005e7920e89f2";
hash = "sha256-rSWdxQL0y3ZboEi7SWO4Mbe7ix3epznTOkL+SDXXG9g=";
rev = "2bac14863b76ad0ff6fd7204c50574732acd66df";
hash = "sha256-3hMpEV12wE2HoJ4qX1a/lOx0JOve4pPF4n9WKcupSLo=";
};
meta.homepage = "https://github.com/gap-system/tree-sitter-gap";
};
@@ -1049,12 +1049,12 @@
};
go = buildGrammar {
language = "go";
version = "0.0.0+rev=5e73f47";
version = "0.0.0+rev=1547678";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "5e73f476efafe5c768eda19bbe877f188ded6144";
hash = "sha256-PgFdtkPMgkNK7Gv6dBf89lNjJrZyt9Wp5h5OIwd83aw=";
rev = "1547678a9da59885853f5f5cc8a99cc203fa2e2c";
hash = "sha256-y7bTET8ypPczPnMVlCaiZuswcA7vFrDOc2jlbfVk5Sk=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@@ -1325,12 +1325,12 @@
};
html = buildGrammar {
language = "html";
version = "0.0.0+rev=cbb91a0";
version = "0.0.0+rev=9fc04b9";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "cbb91a0ff3621245e890d1c50cc811bffb77a26b";
hash = "sha256-lNMiSDAQ49QpeyD1RzkIIUeRWdp2Wrv6+XQZdZ40c1g=";
rev = "9fc04b9ef21a92e3ea9258f5690e4461394d7811";
hash = "sha256-Fow2kIM9PHwYEgkEuGcS3e4wxlzETtQk0DcMUkjbcaA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
@@ -1358,12 +1358,12 @@
};
hurl = buildGrammar {
language = "hurl";
version = "0.0.0+rev=ff07a42";
version = "0.0.0+rev=1124058";
src = fetchFromGitHub {
owner = "pfeiferj";
repo = "tree-sitter-hurl";
rev = "ff07a42d9ec95443b5c1b57ed793414bf7b79be5";
hash = "sha256-9uRRlJWT0knZ3vvzGEq9CjyffQnYF53rnoBnsQ68zyE=";
rev = "1124058cd192e80d80914652a5850a5b1887cc10";
hash = "sha256-6Hd4VEjhxlfO9ofPr9YeSU4ZVbGEU0okYYjaG+hTkn0=";
};
meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl";
};
@@ -1446,57 +1446,57 @@
};
java = buildGrammar {
language = "java";
version = "0.0.0+rev=a7db522";
version = "0.0.0+rev=968afb3";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
rev = "a7db5227ec40fcfe94489559d8c9bc7c8181e25a";
hash = "sha256-fNq5MMMr83wqn7lNgj0pfSZDF4XO98YbzfNsFjr3Kpw=";
rev = "968afb3c9be2d4dba4cd36f3580ee0b1a9c1c537";
hash = "sha256-L4cfPDbuZEqjq/w3Rz8fraorTMV095b4uXIqkQbSA/s=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=384952d";
version = "0.0.0+rev=fea74f5";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "384952d91ebc176fcf8f1933dff93b9c32430911";
hash = "sha256-IH1LUPO+18vDC83jcrC0DihTYt6aXV1w/u0iTm5jgK4=";
rev = "fea74f50f5a6dcef575687703b82a96f9e6d1312";
hash = "sha256-m0aqRV37o0/HypshZDvKDg8thv3ey32sMHmLkf7g7lw=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
javascript = buildGrammar {
language = "javascript";
version = "0.0.0+rev=6fbef40";
version = "0.0.0+rev=44c892e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
rev = "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c";
hash = "sha256-X9DDCBF+gQYL0syfqgKVFvzoy2tnBl+veaYi7bUuRms=";
rev = "44c892e0be055ac465d5eeddae6d3e194424e7de";
hash = "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
jinja = buildGrammar {
language = "jinja";
version = "0.0.0+rev=129184f";
version = "0.0.0+rev=e589222";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "129184fb7bbc2d3e29967002432a869ac3758f2e";
hash = "sha256-+9aVQFi9V4RJtbkL0F48/L+l+myWqE5kM5G5EwHB9G8=";
rev = "e589222a1ad44361bc376d5abdccd08e1fecfee5";
hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk=";
};
location = "tree-sitter-jinja";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
};
jinja_inline = buildGrammar {
language = "jinja_inline";
version = "0.0.0+rev=129184f";
version = "0.0.0+rev=e589222";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "129184fb7bbc2d3e29967002432a869ac3758f2e";
hash = "sha256-+9aVQFi9V4RJtbkL0F48/L+l+myWqE5kM5G5EwHB9G8=";
rev = "e589222a1ad44361bc376d5abdccd08e1fecfee5";
hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk=";
};
location = "tree-sitter-jinja_inline";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
@@ -1525,23 +1525,23 @@
};
json = buildGrammar {
language = "json";
version = "0.0.0+rev=46aa487";
version = "0.0.0+rev=fd38547";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-json";
rev = "46aa487b3ade14b7b05ef92507fdaa3915a662a3";
hash = "sha256-s8aAOrM4Mh4O60iSORMefN3nvFxThFk/On5DvK1BwWs=";
rev = "fd38547e2fe5738e5b173e5f40a27df261224bba";
hash = "sha256-61X7gSL3SeJvvWokSvZmxyy1wmYhRZNLBX9x31XrIfY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
};
json5 = buildGrammar {
language = "json5";
version = "0.0.0+rev=ab0ba82";
version = "0.0.0+rev=5ebe24e";
src = fetchFromGitHub {
owner = "Joakker";
repo = "tree-sitter-json5";
rev = "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd";
hash = "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g=";
rev = "5ebe24e210f0fbcd6180fd673ed184ed81f3bcc6";
hash = "sha256-5JAXtDYazHbHnw/cAHLhVxkBZYrLongxYSgZf/dPGnM=";
};
meta.homepage = "https://github.com/Joakker/tree-sitter-json5";
};
@@ -1880,12 +1880,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=09666ce";
version = "0.0.0+rev=1f3bc2f";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "09666cead2c001cbbfc82b395007f6d8158113a5";
hash = "sha256-toH/pG8CKI4UFdBQqkgIer5tfpIWkWoCP+fU0OByxQg=";
rev = "1f3bc2fd4d4e28361d1ff75cf5763e1d0c2b6348";
hash = "sha256-EYi3LEezPRZXl+/TLSVHBlCjTjE4iRSwHhC3NSmxYgg=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2161,12 +2161,12 @@
};
pkl = buildGrammar {
language = "pkl";
version = "0.0.0+rev=4fc94a1";
version = "0.0.0+rev=d62e832";
src = fetchFromGitHub {
owner = "apple";
repo = "tree-sitter-pkl";
rev = "4fc94a102c25ea383d70397dac7e677ca3731f1e";
hash = "sha256-imA4+NuJ3XmVA8qfa7pkrQGBsbrNCgLNSuIFh0DsqmY=";
rev = "d62e832b69a0aa3d4f87fc34ba62d931d6c23f55";
hash = "sha256-6sVPCbs3rLlEhK9Fj2sJGjNBmvaGrajSOoGo6G78buo=";
};
meta.homepage = "https://github.com/apple/tree-sitter-pkl";
};
@@ -2417,12 +2417,12 @@
};
query = buildGrammar {
language = "query";
version = "0.0.0+rev=2668cc5";
version = "0.0.0+rev=60e253d";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-query";
rev = "2668cc53024953224a40b1e6546d7b8ec5a11150";
hash = "sha256-KrdriPQLxb0Eay5gVRwU2hYfgC0oP/VtDmvnNIctjhc=";
rev = "60e253d3c9d6b1131a0f75c85e4bdcc9a48d5b42";
hash = "sha256-xzA4nBqX5qg5GVPD4KyM1mngL0xyOnERltiTOs/jeDk=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query";
};
@@ -2648,12 +2648,12 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=3691201";
version = "0.0.0+rev=3bfef41";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "3691201b01cacb2f96ffca4c632c4e938bfacd88";
hash = "sha256-a9Te7SXVd7hkinrpvwrWgb6J53PoSL/Irk0DpQ6vS7k=";
rev = "3bfef41a01ab49a25ffdecf998823b4b82fcaf69";
hash = "sha256-oRBsIaNZDgBt1JSiGzgg+1JNbkDuGV2cxE1p0cZlFQc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
@@ -2716,12 +2716,12 @@
};
slang = buildGrammar {
language = "slang";
version = "0.0.0+rev=5b0adf6";
version = "0.0.0+rev=1dbcc4a";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-slang";
rev = "5b0adf65710c3a7c265f0451ed6b4789410cbe63";
hash = "sha256-uFU8hdz6APzrc9JUib47cmBd5kSnbSh0CbSqSbEfkoc=";
rev = "1dbcc4abc7b3cdd663eb03d93031167d6ed19f56";
hash = "sha256-UsZpXEJwbKn5M9dqbAv5eJgsCdNbsllbFWtNnDPvtoE=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-slang";
};
@@ -2738,12 +2738,12 @@
};
slint = buildGrammar {
language = "slint";
version = "0.0.0+rev=96bc969";
version = "0.0.0+rev=ecd6007";
src = fetchFromGitHub {
owner = "slint-ui";
repo = "tree-sitter-slint";
rev = "96bc969d20ff347030519184ea2467f4046a524d";
hash = "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=";
rev = "ecd60078bbd546eeb4c7fbbe02226752517b847f";
hash = "sha256-MA/7gqrdhYridk7P+yFVeiWh0AiZf75/f3LSjZd9Clc=";
};
meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
};
@@ -2771,12 +2771,12 @@
};
snakemake = buildGrammar {
language = "snakemake";
version = "0.0.0+rev=f36c158";
version = "0.0.0+rev=7731408";
src = fetchFromGitHub {
owner = "osthomas";
repo = "tree-sitter-snakemake";
rev = "f36c1587624d6d84376c82a357c20fc319cbf02c";
hash = "sha256-yiEfMB67bIaIj+iXQ/ShvVQES6HCWnKI6DzWxsrIrRk=";
rev = "7731408e5e8095fe242fdd423c3d3ae886fbf9fd";
hash = "sha256-/XeO9/4rTLLicDRWWlUoAhCr+2AyjlQLszBmeQ/8wZY=";
};
meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake";
};
@@ -2916,12 +2916,12 @@
};
supercollider = buildGrammar {
language = "supercollider";
version = "0.0.0+rev=1a8ee0d";
version = "0.0.0+rev=c6145ca";
src = fetchFromGitHub {
owner = "madskjeldgaard";
repo = "tree-sitter-supercollider";
rev = "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7";
hash = "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ=";
rev = "c6145cad24e19485f6ceb86e0a1be479d6537fb0";
hash = "sha256-9t7yWtzuzY19M22q5Aiu+hVX2bkBTm3AmUi6ZSc4psQ=";
};
meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider";
};
@@ -2961,12 +2961,12 @@
};
sway = buildGrammar {
language = "sway";
version = "0.0.0+rev=3950067";
version = "0.0.0+rev=9b7845c";
src = fetchFromGitHub {
owner = "FuelLabs";
repo = "tree-sitter-sway";
rev = "395006713db3bbb90d267ebdfcbf1881b399b05c";
hash = "sha256-5Js5WbpQAln6cfdjEd0emMtkC6uFGWA2LXQZkiXbap4=";
rev = "9b7845ce06ecb38b040c3940970b4fd0adc331d1";
hash = "sha256-+BRw4OFQb7FljdKCj5mruK0L9wsZ+1UDTykVLS9wjoY=";
};
meta.homepage = "https://github.com/FuelLabs/tree-sitter-sway.git";
};
@@ -3006,12 +3006,12 @@
};
systemverilog = buildGrammar {
language = "systemverilog";
version = "0.0.0+rev=3bd2c5d";
version = "0.0.0+rev=999e885";
src = fetchFromGitHub {
owner = "gmlarumbe";
repo = "tree-sitter-systemverilog";
rev = "3bd2c5d2f60ed7b07c2177b34e2976ad9a87c659";
hash = "sha256-ZkG5XsSBz9cZWLulIu40WPy71OGuVOlZSMcFH3AwXKc=";
rev = "999e88565e199abec12d6fb7470419b5ae217386";
hash = "sha256-eY51D/B25m87JPtRprwewa6SF6xSoXXYOL6DCOd5A4k=";
};
meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
};
@@ -3473,6 +3473,17 @@
};
meta.homepage = "https://github.com/liamwh/tree-sitter-wit";
};
wxml = buildGrammar {
language = "wxml";
version = "0.0.0+rev=7b821c7";
src = fetchFromGitHub {
owner = "BlockLune";
repo = "tree-sitter-wxml";
rev = "7b821c748dc410332f59496c0dea2632168c4e5a";
hash = "sha256-ZJeBKccEreak/Fs/Zi5E3m2S//s2R54KwFK3atoCvf0=";
};
meta.homepage = "https://github.com/BlockLune/tree-sitter-wxml";
};
xcompose = buildGrammar {
language = "xcompose";
version = "0.0.0+rev=a51d636";
@@ -3498,12 +3509,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=f40778f";
version = "0.0.0+rev=423597c";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "f40778ff42f2119aebacd46d4b6d785a4181a9ba";
hash = "sha256-9vqVBsErlbFXzTd7QmMItd5GW2F9kE04HQFjq/vtrTc=";
rev = "423597c9ee0cd9fd98691a9f9881ff4e6f7b047a";
hash = "sha256-BOXlyU2inSOqAmpDlqYjtDl2O37+ddOFiEEUvXb/kb4=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
pkgs/applications/editors/vim/plugins/overrides.nix
+9 -28
View File
@@ -1228,7 +1228,7 @@ assertNoAdditions {
];
# Patch libgit2 library dependency
postPatch = ''
substituteInPlace lua/fugit2/libgit2.lua \
substituteInPlace lua/fugit2/core/libgit2.lua \
--replace-fail \
'M.library_path = "libgit2"' \
'M.library_path = "${lib.getLib libgit2}/lib/libgit2${stdenv.hostPlatform.extensions.sharedLibrary}"'
@@ -4113,10 +4113,17 @@ assertNoAdditions {
});
zenbones-nvim = super.zenbones-nvim.overrideAttrs {
checkInputs = with self; [
# Optional lush-nvim integration
lush-nvim
];
nvimSkipModules = [
# Requires global variable set
"randombones"
"randombones.palette"
"randombones_dark.palette"
"randombones_light"
"randombones_light.palette"
# Optional shipwright
"zenbones.shipwright.runners.alacritty"
"zenbones.shipwright.runners.foot"
@@ -4128,33 +4135,7 @@ assertNoAdditions {
"zenbones.shipwright.runners.vim"
"zenbones.shipwright.runners.wezterm"
"zenbones.shipwright.runners.windows_terminal"
# Optional lush-nvim integration
"duckbones"
"duckbones.palette"
"forestbones"
"forestbones.palette"
"kanagawabones"
"kanagawabones.palette"
"neobones"
"neobones.palette"
"nordbones"
"nordbones.palette"
"rosebones"
"rosebones.palette"
"seoulbones"
"seoulbones.palette"
"tokyobones"
"tokyobones.palette"
"vimbones"
"vimbones.palette"
"zenbones"
"zenbones.palette"
"zenbones.specs.dark"
"zenbones.specs.light"
"zenburned"
"zenburned.palette"
"zenwritten"
"zenwritten.palette"
"randombones_dark"
];
};
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1 -1
View File
@@ -1317,7 +1317,7 @@ https://github.com/mhinz/vim-crates/,,
https://github.com/vim-crystal/vim-crystal/,HEAD,
https://github.com/OrangeT/vim-csharp/,,
https://github.com/ap/vim-css-color/,,
https://github.com/jjo/vim-cue/,,
https://github.com/cue-lang/vim-cue/,,
https://github.com/itchyny/vim-cursorword/,,
https://github.com/ehamberg/vim-cute-python/,,
https://github.com/tpope/vim-dadbod/,,
pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+28 -8
View File
@@ -1,4 +1,5 @@
{
stdenv,
lib,
vscode-utils,
icu,
@@ -11,12 +12,36 @@
vscode-extension-update-script,
}:
let
supported = {
x86_64-linux = {
hash = "sha256-AlqZTioxiL0XPRMpWMWw8fIWoDAmU1ybCaDhlaXv6lc=";
arch = "linux-x64";
};
x86_64-darwin = {
hash = "sha256-IWj79vUJJXt88kDiCIHVY95aKsHB84vH3iv6GgLOFQo=";
arch = "darwin-x64";
};
aarch64-linux = {
hash = "sha256-kTSHvqS50UZ/yTMqJITyFIUZgHn1dMSwX1R3oxmTnYk=";
arch = "linux-arm64";
};
aarch64-darwin = {
hash = "sha256-LWA8LqCQrmd83icDYCmUgytPJbCV3ecNobSpWV2R3MA=";
arch = "darwin-arm64";
};
};
base =
supported.${stdenv.hostPlatform.system}
or (throw "unsupported platform ${stdenv.hostPlatform.system}");
in
vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
mktplcRef = base // {
name = "python";
publisher = "ms-python";
version = "2025.12.0";
hash = "sha256-IY4xrAFLGe8JCgdx2H3kiQTCh9i5wOykL9hfpztV+44=";
};
buildInputs = [ icu ];
@@ -52,12 +77,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
homepage = "https://github.com/Microsoft/vscode-python";
changelog = "https://github.com/microsoft/vscode-python/releases";
license = lib.licenses.mit;
platforms = [
"aarch64-linux"
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
platforms = builtins.attrNames supported;
maintainers = [
lib.maintainers.jraygauthier
lib.maintainers.jfchevrette
pkgs/applications/gis/qgis/default.nix
+2 -2
View File
@@ -19,10 +19,10 @@ let
withWebKit = withWebKit;
};
in
symlinkJoin rec {
symlinkJoin {
inherit (qgis-unwrapped) version src;
name = "qgis-${version}";
pname = "qgis";
paths = [ qgis-unwrapped ];
pkgs/applications/gis/qgis/ltr.nix
+2 -2
View File
@@ -19,10 +19,10 @@ let
withWebKit = withWebKit;
};
in
symlinkJoin rec {
symlinkJoin {
inherit (qgis-ltr-unwrapped) version src;
name = "qgis-${version}";
pname = "qgis";
paths = [ qgis-ltr-unwrapped ];
pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+2 -2
View File
@@ -10,11 +10,11 @@
buildMozillaMach rec {
pname = "firefox-beta";
binaryName = pname;
version = "143.0b8";
version = "143.0b9";
applicationName = "Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "bf8e78abcc1cf6c8b48a591d0185c85195a818de0d13bafa3f004ad9c76364a2c07cacdf09fe0ae2e290d9cbce7b8c3ba4b57793cd3d39240023ef53eea08377";
sha512 = "b014e343ddba2e3750a0f50925c9b7f07237593c299604d96275f45332063f1487a47234411f7c952ee50ffaeb385a22dedbc4f924e4e0fc89668172b06c78fd";
};
meta = {
pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildMozillaMach rec {
pname = "firefox-devedition";
binaryName = pname;
version = "143.0b8";
version = "143.0b9";
applicationName = "Firefox Developer Edition";
requireSigning = false;
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "89152a4dd3e17f68d7991fae65a6365a2273fcbef28c245a76e9e068a1f12c486a7d0c6d3cb8988c1c9955b15809fa93e117e25b04f9b1a9d449e685cbf30cfc";
sha512 = "a323bbcc7c8898073e320f3c2701881d849cff31a01a8bad34df7f08945dd7fb7e8cc9afd8aceb209198e8932b7b1d835af45b87459f4454f9a7f48bc85ef690";
};
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
pkgs/applications/networking/instant-messengers/discord/default.nix
+4 -4
View File
@@ -11,14 +11,14 @@ let
{
stable = "0.0.108";
ptb = "0.0.159";
canary = "0.0.751";
canary = "0.0.752";
development = "0.0.85";
}
else
{
stable = "0.0.359";
ptb = "0.0.190";
canary = "0.0.857";
canary = "0.0.858";
development = "0.0.97";
};
version = versions.${branch};
@@ -34,7 +34,7 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-cE1BiWwZGrSzvdKDSiAs+Dz/nnxhuVs4JQYMwwY/F5k=";
hash = "sha256-6hq0KIXR9j/AHGPyQIXjhf1uJiYizxB5Nu+0unn/frE=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
@@ -52,7 +52,7 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-omk2vau5LKRhxgcG3k4dYqyc3YH7mZ72Nz4lQyaoO0c=";
hash = "sha256-/dVr7ZS6bRccLPz85xxoniZEbkK1qQ3lqedhGuaBIRk=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
pkgs/by-name/av/avalonia/package.nix
+2 -2
View File
@@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation (
}
rec {
pname = "Avalonia";
version = "11.3.4";
version = "11.3.5";
src = fetchFromGitHub {
owner = "AvaloniaUI";
repo = "Avalonia";
tag = version;
fetchSubmodules = true;
hash = "sha256-zEQKflqdM3ZGm6aMk1zlKHHH3efTX0OZ+xRFwlLAu2M=";
hash = "sha256-o3KMfHNFDksz+8WO5TPoHPxVvjwuSZrwmB7kl+rvGDw=";
};
patches = [
pkgs/by-name/bo/botamusique/package.nix
+1
View File
@@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
];
pythonPath = with python3Packages; [
audioop-lts
flask
magic
mutagen
pkgs/by-name/ci/cirrus-cli/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.150.0";
version = "0.153.3";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "cirrus-cli";
rev = "v${version}";
hash = "sha256-tuZdJX4xA2GmZKe0Z4IqawEaLoZBURsMexp5F9Yz1Ew=";
hash = "sha256-sv02mwTOn44rwfDX4BTw9YL8UxEvszBb1Sv4EX7bfVw=";
};
vendorHash = "sha256-uzOLi/cRL+NaRX7f7aUu0AeL8qaUexzCpezZ8xCcRb0=";
vendorHash = "sha256-2MYQ1VHnnLG4APWR3lJ404QXXKkQMoH5oajfNyE++Y8=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
pkgs/by-name/cl/claude-code/package-lock.json
Generated
+4 -4
View File
@@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.107"
"@anthropic-ai/claude-code": "^1.0.109"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.107",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.107.tgz",
"integrity": "sha512-YYbOLIZF6aIwUeLa9Yg2gsHggBC5IWJwsA3B0wpl1z412yIgjp2CjWJ2GGLMTxCrrL5WgUe4SDmNxiAYEPP0yQ==",
"version": "1.0.109",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.109.tgz",
"integrity": "sha512-gjj76f/+M5KfI+ORA9VNVJgR7s8eyur66XCWIIO66q4poNWcszxidXo+TDTqokLLwuNV+qFGx4JkK/PDmtwqMA==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
pkgs/by-name/cl/claude-code/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.107";
version = "1.0.109";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-ht8MReur4K/QrEY9/MH6srQL3/8LHk8pCuSDld+LlEg=";
hash = "sha256-bmva84iO0iDf8V537DX6Ggh1PyjKEkfebx4CSB3f4/U=";
};
npmDepsHash = "sha256-xbxMjwVvkUmjiaklcYsrWLcb2c9qxiYWcT5eM8LN/h8=";
npmDepsHash = "sha256-jpvy7b4A+E5iI7Y7kYnwH51BZAQGVXKaf3lQjI9e3OM=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
pkgs/by-name/co/collada-dom/package.nix
+54
View File
@@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
boost,
libxml2,
minizip,
readline,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "collada-dom";
version = "2.5.1";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "Gepetto";
repo = "collada-dom";
tag = "v${finalAttrs.version}";
hash = "sha256-DYdqrwRIrVq0BQqZB0vtZzADteJGVaJtFC5kC/cD250=";
};
postInstall = ''
ln -s $out/include/*/* $out/include
'';
nativeBuildInputs = [ cmake ];
buildInputs = [
boost
libxml2
minizip
readline
];
meta = {
description = "API that provides a C++ object representation of a COLLADA XML instance document";
longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years.";
homepage = "https://github.com/Gepetto/collada-dom";
changelog = "https://github.com/Gepetto/collada-dom/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
sigmasquadron
marius851000
];
platforms = lib.platforms.all;
# Fails to build.
badPlatforms = lib.platforms.darwin;
};
})
pkgs/by-name/cr/crosvm/package.nix
+3 -3
View File
@@ -21,12 +21,12 @@
rustPlatform.buildRustPackage {
pname = "crosvm";
version = "0-unstable-2025-08-28";
version = "0-unstable-2025-09-09";
src = fetchgit {
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
rev = "ce1281988c5639f2a6a4cc6c20c03eb44751de07";
hash = "sha256-zorrj6sENcjV+pa2VYhunu8LhxT3oOyDRreHX78HckI=";
rev = "3202c663eaa555678bd142320d51c63acce266bc";
hash = "sha256-t53RWPx/z9pHvCd+kuXR+AkOKcnaFNwVs3kePalbnbE=";
fetchSubmodules = true;
};
pkgs/by-name/da/dart-sass/package.nix
+2 -2
View File
@@ -23,13 +23,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.91.0";
version = "1.92.1";
src = fetchFromGitHub {
owner = "sass";
repo = "dart-sass";
tag = version;
hash = "sha256-a1yFDSvuEy/Xaksx9JgzcSOAigD3u3GDtWAJuB8osys=";
hash = "sha256-ee1ED6CeRQnv+jopgupelWybiH3h05Lk1TUgYUS8rNo=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
pkgs/development/php-packages/deployer/default.nix → pkgs/by-name/de/deployer/package.nix
View File
pkgs/by-name/dn/dnscrypt-proxy/package.nix
+1 -1
View File
@@ -20,7 +20,7 @@ buildGoModule rec {
hash = "sha256-JPBAlRpJw6Oy4f3twyhX95XqWFtUTEFPjwyVaNMSHmQ=";
};
passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; };
passthru.tests = { inherit (nixosTests) dnscrypt-proxy; };
meta = with lib; {
description = "Tool that provides secure DNS resolution";
pkgs/by-name/dn/dnsmasq/package.nix
+1 -1
View File
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq;
# these tests use dnsmasq incidentally
inherit (nixosTests) dnscrypt-proxy2;
inherit (nixosTests) dnscrypt-proxy;
kubernetes-dns-single = nixosTests.kubernetes.dns-single-node;
kubernetes-dns-multi = nixosTests.kubernetes.dns-multi-node;
};
pkgs/by-name/fe/fex/package.nix
+115
View File
@@ -11,8 +11,83 @@
xxHash,
fmt,
nasm,
buildEnv,
writeText,
pkgsCross,
libclang,
libllvm,
alsa-lib,
libdrm,
libGL,
wayland,
xorg,
}:
let
# Headers required to build the ThunkLibs subtree
libForwardingInputs = lib.map lib.getInclude [
alsa-lib
libdrm
libGL
wayland
xorg.libX11
xorg.libxcb
xorg.libXrandr
xorg.libXrender
xorg.xorgproto
];
pkgsCross32 = pkgsCross.gnu32;
pkgsCross64 = pkgsCross.gnu64;
devRootFS = buildEnv {
name = "fex-dev-rootfs";
paths = [
pkgsCross64.stdenv.cc.libc_dev
pkgsCross32.stdenv.cc.libc_dev
pkgsCross64.stdenv.cc.cc
pkgsCross32.stdenv.cc.cc
]
++ libForwardingInputs;
ignoreCollisions = true;
pathsToLink = [
"/include"
"/lib"
];
postBuild = ''
mkdir -p $out/usr
ln -s $out/include $out/usr/
'';
};
toolchain32 = writeText "toolchain_nix_x86_32.txt" ''
set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")
set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
set(CMAKE_SYSTEM_PROCESSOR i686)
set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_C_COMPILER ${pkgsCross32.buildPackages.clang}/bin/i686-unknown-linux-gnu-clang)
set(CMAKE_CXX_COMPILER ${pkgsCross32.buildPackages.clang}/bin/i686-unknown-linux-gnu-clang++)
set(CLANG_FLAGS "-nodefaultlibs -nostartfiles -target i686-linux-gnu -msse2 -mfpmath=sse --sysroot=${devRootFS} -iwithsysroot/usr/include")
set(CMAKE_C_FLAGS "''${CMAKE_C_FLAGS} ''${CLANG_FLAGS}")
set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} ''${CLANG_FLAGS}")
'';
toolchain = writeText "toolchain_nix_x86_64.txt" ''
set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")
set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_C_COMPILER ${pkgsCross64.buildPackages.clang}/bin/x86_64-unknown-linux-gnu-clang)
set(CMAKE_CXX_COMPILER ${pkgsCross64.buildPackages.clang}/bin/x86_64-unknown-linux-gnu-clang++)
set(CLANG_FLAGS "-nodefaultlibs -nostartfiles -target x86_64-linux-gnu --sysroot=${devRootFS} -iwithsysroot/usr/include")
set(CMAKE_C_FLAGS "''${CMAKE_C_FLAGS} ''${CLANG_FLAGS}")
set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} ''${CLANG_FLAGS}")
'';
in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "fex";
version = "2508.1";
@@ -49,6 +124,37 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
'';
};
postPatch = ''
substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \
--replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \
--replace-fail "/usr/include/wayland" "${devRootFS}/include/wayland"
# Add include paths for thunkgen invocation
substituteInPlace ThunkLibs/HostLibs/CMakeLists.txt \
--replace-fail "-- " "-- $(cat ${llvmPackages.stdenv.cc}/nix-support/libc-cflags) $(cat ${llvmPackages.stdenv.cc}/nix-support/libcxx-cxxflags) ${
lib.concatMapStrings (x: "-isystem " + x + "/include ") libForwardingInputs
}"
substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt \
--replace-fail "-- " "-- $(cat ${llvmPackages.stdenv.cc}/nix-support/libcxx-cxxflags) "
# Patch any references to library wrapper paths
substituteInPlace FEXCore/Source/Interface/Config/Config.json.in \
--replace-fail "ThunkGuestLibs" "UnusedThunkGuestLibs" \
--replace-fail "ThunkHostLibs" "UnusedThunkHostLibs"
substituteInPlace FEXCore/Source/Interface/Config/Config.cpp \
--replace-fail "FEXCore::Config::CONFIG_THUNKGUESTLIBS" "FEXCore::Config::CONFIG_UNUSEDTHUNKGUESTLIBS" \
--replace-fail "FEXCore::Config::CONFIG_THUNKHOSTLIBS" "FEXCore::Config::CONFIG_UNUSEDTHUNKHOSTLIBS"
substituteInPlace Source/Tools/LinuxEmulation/VDSO_Emulation.cpp \
--replace-fail "FEX_CONFIG_OPT(ThunkGuestLibs, THUNKGUESTLIBS);" "auto ThunkGuestLibs = []() { return \"$out/share/fex-emu/GuestThunks/\"; };"
substituteInPlace Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.h \
--replace-fail "FEX_CONFIG_OPT(ThunkGuestLibs, THUNKGUESTLIBS);" "fextl::string ThunkGuestLibs() { return \"$out/share/fex-emu/GuestThunks/\"; }"
substituteInPlace Source/Tools/LinuxEmulation/Thunks.cpp \
--replace-fail "FEX_CONFIG_OPT(ThunkHostLibsPath, THUNKHOSTLIBS);" "fextl::string ThunkHostLibsPath() { return \"$out/lib/fex-emu/HostThunks/\"; }"
substituteInPlace Source/Tools/FEXConfig/main.qml \
--replace-fail "config: \"Thunk" "config: \"UnusedThunk" \
--replace-fail "title: qsTr(\"Library forwarding:\")" "visible: false; title: qsTr(\"Library forwarding:\")"
'';
nativeBuildInputs = [
cmake
ninja
@@ -69,7 +175,12 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
buildInputs = [
xxHash
fmt
pkgsCross64.buildPackages.clang
pkgsCross32.buildPackages.clang
libclang
libllvm
]
++ libForwardingInputs
++ (with qt5; [
qtbase
qtdeclarative
@@ -83,6 +194,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_ASSERTIONS" false)
(lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "BUILD_THUNKS" true)
(lib.cmakeFeature "X86_32_TOOLCHAIN_FILE" "${toolchain32}")
(lib.cmakeFeature "X86_64_TOOLCHAIN_FILE" "${toolchain}")
(lib.cmakeFeature "X86_DEV_ROOTFS" "${devRootFS}")
];
strictDeps = true;
pkgs/by-name/hc/hcloud/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "hcloud";
version = "1.51.0";
version = "1.52.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
tag = "v${version}";
hash = "sha256-wRz+zWUeKAbk6EmYjm7A4ks7ZhXXhpipts6XZZthsI0=";
hash = "sha256-YL8CM67zdhXjiPihsQHl3I211Y3NmRFOPGd2gLhoQZM=";
};
vendorHash = "sha256-axVG4KOxDy7+brwui2iPLutFLJ8L7LAQmeDcoFCv7uA=";
vendorHash = "sha256-We6Y+m+GS4bADW94TQ5zv+y++nT/I34mYzoYHAQU7lU=";
ldflags = [
"-s"
pkgs/by-name/ho/houdini/package.nix
+3
View File
@@ -33,6 +33,7 @@ buildFHSEnv {
nspr
expat
pciutils
libdrm
libxkbcommon
libudev0-shim
tbb
@@ -63,6 +64,8 @@ buildFHSEnv {
libXScrnSaver
libXrandr
libxcb
libxkbfile
libxshmfence
xcbutil
xcbutilimage
xcbutilrenderutil
pkgs/by-name/ho/houdini/runtime.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ requireFile, callPackage }:
callPackage ./runtime-build.nix rec {
version = "20.5.684";
version = "21.0.440";
eulaDate = "2021-10-13";
src = requireFile {
name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz";
hash = "sha256-cyFeeKBCV1EGdgruQ71EnEJOVndn1SKSiCtD6WRc878=";
hash = "sha256-qHRR+RRtUgUam6FC1TWTZjg1FSakjLoMYVaiIfO+WOY=";
url = "https://www.sidefx.com/download/daily-builds/?production=true";
};
outputHash = "sha256-mAX4jSdV0/DC+48O7d1hgmKjC1leKm1QgSBMbyAxyFs=";
outputHash = "sha256-SSBiqNZRnxz6tnvusYRi2UASY1k3voiblDpkiu+qU0w=";
}
pkgs/by-name/li/lintspec/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lintspec";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "beeb";
repo = "lintspec";
tag = "v${version}";
hash = "sha256-XpwKQM6CqdRZZKdrCl6B3XlFMwKMfxBRjqfcjb9IMqQ=";
hash = "sha256-TMiUOrDsKXi+d/CbJauo2FT9WEWnztMYqrZZHpS8i7M=";
};
cargoHash = "sha256-8L+C3bBvKPMuEOKz6v0aKFmXgA3Z8/Sw0ugElN0mfEk=";
cargoHash = "sha256-K8zx+dW6RXcbX2ZqNdfnv7WjbvjA8ZdJBitdDOi8hxE=";
meta = {
description = "Blazingly fast linter for NatSpec comments in Solidity code";
pkgs/by-name/lo/lockbook-desktop/package.nix
+3 -3
View File
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "lockbook-desktop";
version = "0.9.26";
version = "0.9.27";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = version;
hash = "sha256-tiw8FtPtXtBZsKxgZ7T+6VUoBO93IkuKfEHNol2fJ18=";
hash = "sha256-D194oIp6EE0Ub0+4iw4SlTxoyJ9I8xZa67TTh241BvE=";
};
cargoHash = "sha256-XVvSVaUn4N7lsgBEAbRfCD6qR4I/n/NHBw2qISWrzI0=";
cargoHash = "sha256-KTT4z9lSrxpbCAyEccFMdqrCJKNYhv/8Jb6HeKzJYHs=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/lo/lockbook/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "lockbook";
version = "0.9.26";
version = "0.9.27";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = version;
hash = "sha256-tiw8FtPtXtBZsKxgZ7T+6VUoBO93IkuKfEHNol2fJ18=";
hash = "sha256-D194oIp6EE0Ub0+4iw4SlTxoyJ9I8xZa67TTh241BvE=";
};
cargoHash = "sha256-XVvSVaUn4N7lsgBEAbRfCD6qR4I/n/NHBw2qISWrzI0=";
cargoHash = "sha256-KTT4z9lSrxpbCAyEccFMdqrCJKNYhv/8Jb6HeKzJYHs=";
doCheck = false; # there are no cli tests
cargoBuildFlags = [
pkgs/by-name/ly/lyra/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "lyra";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "bfgroup";
repo = "lyra";
rev = version;
sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI=";
sha256 = "sha256-X8wJwSfOo7v2SKYrKJ4RhpEmOdEkS8lPHIqCxP46VF4=";
};
nativeBuildInputs = [
pkgs/by-name/my/mygui/disable-framework.patch
-20
View File
@@ -1,20 +0,0 @@
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index 7e279c986..b33f097c0 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -418,15 +418,6 @@ function(mygui_config_lib PROJECTNAME)
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
# add GCC visibility flags to shared library build
set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
- if (APPLE)
- # deal with Mac OS X's framework system
- set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE)
- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}")
- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME})
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE)
- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
- endif (APPLE)
endif ()
endif (MYGUI_STATIC)
mygui_install_target(${PROJECTNAME} "")
pkgs/by-name/my/mygui/package.nix
+26 -12
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
boost,
@@ -18,19 +19,26 @@
let
renderSystem = if withOgre then "3" else "4";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mygui";
version = "3.4.2";
version = "3.4.3";
__structuredAttrs = true;
strictDeps = true;
src = fetchFromGitHub {
owner = "MyGUI";
repo = "mygui";
rev = "MyGUI${version}";
hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4=";
tag = "MyGUI${finalAttrs.version}";
hash = "sha256-qif9trHgtWpYiDVXY3cjRsXypjjjgStX8tSWCnXhXlk=";
};
patches = [
./disable-framework.patch
(fetchpatch {
name = "darwin-mygui-framework-fix.patch";
url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/ade30e6e98c051ac2a505f6984518f5f41fa87a5/macos/mygui.patch";
sha256 = "sha256-Tk+O4TFgPZOqWAY4c0Q69bZfvIB34wN9e7h0tXhLULU=";
})
];
nativeBuildInputs = [
@@ -57,15 +65,21 @@ stdenv.mkDerivation rec {
# Tools are disabled due to compilation failures.
cmakeFlags = [
"-DMYGUI_BUILD_TOOLS=OFF"
"-DMYGUI_BUILD_DEMOS=OFF"
"-DMYGUI_RENDERSYSTEM=${renderSystem}"
(lib.cmakeBool "MYGUI_BUILD_DEMOS" false)
(lib.cmakeBool "MYGUI_BUILD_TOOLS" false)
(lib.cmakeBool "MYGUI_DONT_USE_OBSOLETE" true)
(lib.cmakeFeature "MYGUI_RENDERSYSTEM" renderSystem)
];
meta = with lib; {
meta = {
homepage = "http://mygui.info/";
changelog = "https://github.com/MyGUI/mygui/releases/tag/MyGUI${finalAttrs.version}";
description = "Library for creating GUIs for games and 3D applications";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with lib.maintainers; [ sigmasquadron ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
# error: implicit instantiation of undefined template 'std::char_traits'
badPlatforms = lib.platforms.darwin;
};
}
})
pkgs/by-name/na/nats-server/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "nats-server";
version = "2.11.8";
version = "2.11.9";
src = fetchFromGitHub {
owner = "nats-io";
repo = "nats-server";
rev = "v${version}";
hash = "sha256-4kxiyxV44O+PtxTqmBmS12RkH1Rcru/EXSV7CY+8eo0=";
hash = "sha256-F35qklJRa9IUikVNhh8c34KF3l41yfPXl0aig1iQq1g=";
};
vendorHash = "sha256-+wQJijP3vOU7riz8xrPot0EecEU+KhZK9UQdcI72Vtg=";
vendorHash = "sha256-ti2Y4ev8INMNudfwmPhmKGCManRj2cFTw6Fh7kkvDQc=";
doCheck = false;
pkgs/by-name/ol/olympus-unwrapped/package.nix
+4 -4
View File
@@ -31,9 +31,9 @@ let
phome = "$out/lib/olympus";
# The following variables are to be updated by the update script.
version = "25.08.17.03";
buildId = "5045"; # IMPORTANT: This line is matched with regex in update.sh.
rev = "977e47bd2addb50ced3a81ee8a006bfc050e8afa";
version = "25.09.09.02";
buildId = "5131"; # IMPORTANT: This line is matched with regex in update.sh.
rev = "fa3f1a9aaca5e57bfa6d2e18a0a8688c7608b747";
in
buildDotnetModule {
pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
owner = "EverestAPI";
repo = "Olympus";
fetchSubmodules = true; # Required. See upstream's README.
hash = "sha256-VnHuFL+EDHfYdjYNhLQDiNQGK/X97HD3hJ8xAftFzFk=";
hash = "sha256-MJzrQDMsnbjua76twT+swZ1fMiRqokqlxg0ce1fnvLU=";
};
nativeBuildInputs = [
pkgs/by-name/op/openmw/package.nix
+149
View File
@@ -0,0 +1,149 @@
{
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
SDL2,
boost,
bullet,
cmake,
collada-dom,
ffmpeg,
libXt,
lua,
luajit,
lz4,
mygui,
openal,
openscenegraph,
pkg-config,
qt6Packages,
recastnavigation,
unshield,
yaml-cpp,
GLPreference ? "GLVND",
}:
let
inherit (stdenv.hostPlatform) isDarwin isLinux isAarch64;
isAarch64Linux = isLinux && isAarch64;
in
assert lib.assertOneOf "GLPreference" GLPreference [
"GLVND"
"LEGACY"
];
stdenv.mkDerivation (finalAttrs: {
pname = "openmw";
version = "0.49.0";
__structuredAttrs = true;
strictDeps = true;
osg' = (openscenegraph.override { colladaSupport = true; }).overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [
(fetchpatch {
# Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW.
name = "darwin-osg-plugins-fix.patch";
url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/1305497c009dc0e7a6a70fe14f0a2f92b96cbcb4/macos/osg.patch";
hash = "sha256-G8Y+fnR6FRGxECWrei/Ixch3A3PkRfH6b5q9iawsSCY=";
})
];
cmakeFlags =
(oldAttrs.cmakeFlags or [ ])
++ [
"-Wno-dev"
(lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference)
(lib.cmakeBool "BUILD_OSG_PLUGINS_BY_DEFAULT" false)
(lib.cmakeBool "BUILD_OSG_DEPRECATED_SERIALIZERS" false)
]
++ (map (plugin: lib.cmakeBool "BUILD_OSG_PLUGIN_${plugin}" true) [
"BMP"
"DAE"
"DDS"
"FREETYPE"
"JPEG"
"OSG"
"PNG"
"TGA"
]);
});
bullet' = bullet.overrideAttrs (oldAttrs: {
cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [
"-Wno-dev"
(lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference)
(lib.cmakeBool "USE_DOUBLE_PRECISION" true)
(lib.cmakeBool "BULLET2_MULTITHREADING" true)
];
});
src = fetchFromGitLab {
owner = "OpenMW";
repo = "openmw";
tag = "openmw-${finalAttrs.version}";
hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80=";
};
postPatch = ''
sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
''
# Don't fix Darwin app bundle
+ lib.optionalString isDarwin ''
sed -i '/fixup_bundle/d' CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
]
++ (with qt6Packages; [
wrapQtAppsHook
]);
# If not set, OSG plugin .so files become shell scripts on Darwin.
dontWrapQtApps = isDarwin;
buildInputs = [
SDL2
boost
collada-dom
ffmpeg
libXt
(if isAarch64Linux then lua else luajit)
lz4
mygui
openal
recastnavigation
unshield
yaml-cpp
]
++ (with qt6Packages; [
qttools
])
++ (with finalAttrs; [
bullet'
osg'
]);
cmakeFlags = [
(lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference)
(lib.cmakeBool "USE_LUAJIT" (!isAarch64Linux))
(lib.cmakeBool "OPENMW_USE_SYSTEM_RECASTNAVIGATION" true)
(lib.cmakeBool "OPENMW_OSX_DEPLOYMENT" isDarwin)
];
meta = {
description = "Unofficial open source engine reimplementation of the game Morrowind";
changelog = "https://gitlab.com/OpenMW/openmw/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
homepage = "https://openmw.org";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
marius851000
sigmasquadron
];
platforms = with lib.platforms; linux ++ darwin ++ windows;
# Nixpkgs' NT infrastructure is currently incapable of building this.
badPlatforms = lib.platforms.windows;
};
})
pkgs/by-name/op/openscenegraph/package.nix
+4 -2
View File
@@ -32,7 +32,7 @@
curlSupport ? true,
curl,
colladaSupport ? false,
opencollada,
collada-dom,
opencascadeSupport ? false,
opencascade-occt,
ffmpegSupport ? false,
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
++ lib.optional gdalSupport gdal
++ lib.optional curlSupport curl
++ lib.optionals colladaSupport [
opencollada
collada-dom
pcre
]
++ lib.optional opencascadeSupport opencascade-occt
@@ -115,6 +115,8 @@ stdenv.mkDerivation rec {
++ lib.optionals withExamples [ fltk ]
++ lib.optional (restSupport || colladaSupport) boost;
env = lib.optionalAttrs colladaSupport { COLLADA_DIR = collada-dom; };
patches = [
(fetchpatch {
name = "opencascade-api-patch";
pkgs/by-name/ox/oxidized/package.nix
+2 -47
View File
@@ -3,17 +3,8 @@
ruby,
bundlerApp,
bundlerUpdateScript,
defaultGemConfig,
nixosTests,
libssh2,
pkg-config,
openssl,
cmake,
libgit2,
icu,
which,
file,
zlib,
libyaml,
}:
bundlerApp {
@@ -27,43 +18,7 @@ bundlerApp {
"oxs"
];
gemConfig = {
rugged = attrs: {
buildInputs = [
pkg-config
cmake
];
nativeBuildInputs = [
pkg-config
cmake
];
propagatedBuildInputs = [
libssh2
openssl
libgit2
];
dontUseCmakeConfigure = true;
buildFlags = [ "--with-ssh" ];
};
charlock_holmes = attrs: {
buildInputs = [
icu
zlib
];
nativeBuildInputs = [
which
pkg-config
file
];
};
psych = attrs: {
buildInputs = [ libyaml ];
nativeBuildInputs = [ pkg-config ];
};
};
gemConfig = defaultGemConfig;
passthru = {
tests = nixosTests.oxidized;
pkgs/by-name/pa/packer/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "packer";
version = "1.14.1";
version = "1.14.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
hash = "sha256-3g9hsmrfLzGhjcGvUza/L9PMGUFw+KLbg2pIK0CxlQI=";
hash = "sha256-PR2wKpqU4pL5OurOR+ju9yil6cJF5WRXmVP0g9JF5KM=";
};
vendorHash = "sha256-F6hn+pXPyPe70UTK8EF24lk7ArYz7ygUyVVsatW6+hI=";
vendorHash = "sha256-LJklEYxNYwRQNdxoO1FUCD1kK38+eptGBff+3MHT44U=";
subPackages = [ "." ];
pkgs/by-name/pl/plantuml/package.nix
+2 -2
View File
@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plantuml";
version = "1.2025.4";
version = "1.2025.7";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
hash = "sha256-86qUpDvGLbD3Epr7Iis/vijggqFKpIW5X1zBpP4/lJ8=";
hash = "sha256-iimzT6g/W+E4V6AxiQtRDuPJhfmXLR6qx9gkB31N6H8=";
};
nativeBuildInputs = [
pkgs/by-name/qs/qsv/package.nix
+3 -3
View File
@@ -11,7 +11,7 @@
let
pname = "qsv";
version = "6.0.1";
version = "7.1.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "dathere";
repo = "qsv";
rev = version;
hash = "sha256-lB/lWLTZ0sfs0COZ/BgnQ2xf0aQQJnKaN06aoPMfuQc=";
hash = "sha256-jo5hlNydHXNqSjYOC270fmIk7GOeFACIZ3aZEca1M28=";
};
cargoHash = "sha256-ZgGFUOqJ5WBDaO/V3X3fUFqnIykL68Rilpjc21DyhAc=";
cargoHash = "sha256-jfr5wrOLBhvkikjDAb0vMT/Zwc+aYrSWF5lIC7EGwME=";
buildInputs = [
file
pkgs/by-name/si/sillytavern/package.nix
+10 -16
View File
@@ -1,35 +1,26 @@
{
makeBinaryWrapper,
buildNpmPackage,
nodejs,
fetchFromGitHub,
lib,
}:
buildNpmPackage (finalAttrs: {
pname = "sillytavern";
version = "1.13.2";
version = "1.13.3";
src = fetchFromGitHub {
owner = "SillyTavern";
repo = "SillyTavern";
tag = finalAttrs.version;
hash = "sha256-tTBpSXkXzQjp3TW9hksqUpA3sagR2GSY42bHLHEd9oI=";
hash = "sha256-IR2lR6kkjHXIHqCZJ+KK7abxK+oyJzWyEya86e3cEn8=";
};
npmDepsHash = "sha256-hayhsEZN857V6bsWPXupLeqxcOr1sgKs0uWN2pSQD+k=";
nativeBuildInputs = [ makeBinaryWrapper ];
npmDepsHash = "sha256-cAfFRJY2cVBSu3gp2zGlHe84L7c9PahZDyO7iREjHWs=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,opt}
cp -r . $out/opt/sillytavern
makeWrapper ${lib.getExe nodejs} $out/bin/sillytavern \
--add-flags $out/opt/sillytavern/server.js \
--set-default NODE_ENV production
runHook postInstall
# These dirs are not installed automatically.
# And if they were not in place, the app would try to create them at runtime, which is of course impossible to achieve.
postInstall = ''
mkdir $out/lib/node_modules/sillytavern/{backups,public/scripts/extensions/third-party}
'';
meta = {
@@ -37,6 +28,9 @@ buildNpmPackage (finalAttrs: {
longDescription = ''
SillyTavern is a user interface you can install on your computer (and Android phones) that allows you to interact with
text generation AIs and chat/roleplay with characters you or the community create.
This package makes a global installation, instead of a standalone installation according to the official tutorial.
See [the official documentation](https://docs.sillytavern.app/installation/#global--standalone-mode) for the context.
'';
downloadPage = "https://github.com/SillyTavern/SillyTavern/releases";
homepage = "https://docs.sillytavern.app/";
pkgs/by-name/sy/sycl-info/fix-lyra-message.patch
+12
View File
@@ -0,0 +1,12 @@
diff '--color=auto' -u -r old/sycl-info/cli_config.hpp new/sycl-info/cli_config.hpp
--- old/sycl-info/cli_config.hpp 2025-08-28 01:01:14.403357414 +0800
+++ new/sycl-info/cli_config.hpp 2025-08-28 01:02:11.256702715 +0800
@@ -42,7 +42,7 @@
auto cli = make_cli();
auto result = cli.parse(lyra::args(argc, argv));
if (!result) {
- raise_error(result.errorMessage(), cli);
+ raise_error(result.message(), cli);
}
}
pkgs/by-name/sy/sycl-info/package.nix
+5
View File
@@ -23,6 +23,11 @@ stdenv.mkDerivation {
sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m";
};
patches = [
# fix error caused by upgrading lyra from 1.6.1 to 1.7.0
./fix-lyra-message.patch
];
buildInputs = [
nlohmann_json
ronn
pkgs/by-name/ta/talosctl/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "talosctl";
version = "1.10.7";
version = "1.11.1";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
tag = "v${version}";
hash = "sha256-ve10wLoPVvZQKyzJVxtTTPCwDg9s+2Z06g2fwzm46mk=";
hash = "sha256-G+su1Udkp/IqsU9/TWcEQO4MY8iGC+QM39eMeBUSaDs=";
};
vendorHash = "sha256-Ib99XI9jAVNTOChjRuiF1L194XjQILMDQjv7ugGYQA0=";
vendorHash = "sha256-x9In+TaEuYMB0swuMzyXQRRnWgP1Krg7vKQH4lqDf+c=";
ldflags = [
"-s"
pkgs/by-name/th/theforceengine/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "theforceengine";
version = "1.22.300";
version = "1.22.410";
src = fetchFromGitHub {
owner = "luciusDXL";
repo = "TheForceEngine";
tag = "v${finalAttrs.version}";
hash = "sha256-m/VNlcuvpJkcfTpL97gCUTQtdAWqimVrhU0qLj0Erck=";
hash = "sha256-ydZ/S6u3UQNeVRTfzjshlNzLRc1y3FXsTY2NXbUoJBA=";
};
nativeBuildInputs = [
pkgs/by-name/yq/yq-go/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "yq-go";
version = "4.47.1";
version = "4.47.2";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
tag = "v${finalAttrs.version}";
hash = "sha256-r9vHXDviQADv7yIwwzCHKjvHSNzZnJATwiWAaFW4vXs=";
hash = "sha256-hN2ps2JeEfTIbAWr0pSfz/qJa1plwIIbe7s3xT0m4hA=";
};
vendorHash = "sha256-mG9rKla2ZSEbOvSlV6jl7MBoo0dDI//CMcR2hLET4K4=";
vendorHash = "sha256-Yy0ty7jIu5HMp59r987gZApcrb38JvcXfuEqCur1AwY=";
nativeBuildInputs = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
installShellFiles
pkgs/by-name/yt/ytt/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
}:
buildGoModule rec {
pname = "ytt";
version = "0.52.0";
version = "0.52.1";
src = fetchFromGitHub {
owner = "carvel-dev";
repo = "ytt";
rev = "v${version}";
sha256 = "sha256-lFq1cdLKnNy+GaJLap2b/zhRvK8CjYPl3CQx9FKEpUc=";
sha256 = "sha256-fSrvsRZpXXvR6SpEigEMiP0lU5y+ddidHwtz+rmgSb4=";
};
vendorHash = null;
pkgs/by-name/zi/zipline/package.nix
+3 -9
View File
@@ -5,7 +5,6 @@
pnpm_10,
nodejs_24,
makeWrapper,
prisma,
prisma-engines,
ffmpeg,
openssl,
@@ -49,13 +48,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "zipline";
version = "4.3.0";
version = "4.3.1";
src = fetchFromGitHub {
owner = "diced";
repo = "zipline";
tag = "v${finalAttrs.version}";
hash = "sha256-/UNSAvXfVeybFGFFQaVklAbKGT64pa37DmUilzo5ss4=";
hash = "sha256-tQRfgLU0Dvf3vhELsttprfzscvHUgI1u7k9RA4S4vqo=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
@@ -63,15 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
'';
};
postPatch = ''
substituteInPlace src/lib/db/migration/index.ts \
--replace-fail "pnpm prisma" ${lib.getExe' prisma "prisma"}
'';
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-TCbtaxc8AEpFhaHpK+NIrLPR6dQ+iFIEfEfwKob61yI=";
hash = "sha256-zbr57RVBKGpnL5u0evbQAKGyMftHXj6cuntYBHiUxiM=";
};
buildInputs = [
pkgs/development/python-modules/django-tenants/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "django-tenants";
version = "3.7.8";
version = "3.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "django-tenants";
repo = "django-tenants";
tag = "v${version}";
hash = "sha256-WC9NWykSnAD7ywjMGuhNdlasGhrnZJfoh/3wJ+2BF2E=";
hash = "sha256-oj8nh2qzdTChu6URvfWEj6FeqPq38h5N8V2G/e6hE/Q=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/elevenlabs/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
}:
let
version = "2.12.1";
version = "2.15.1";
tag = "v${version}";
in
buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
owner = "elevenlabs";
repo = "elevenlabs-python";
inherit tag;
hash = "sha256-61MxA0xnXhfzvIpLtL0SA0aXdwF3tzIy+/TsJRaS2mM=";
hash = "sha256-Ue1Duag9UYSLnfijk/9R6blx2MSN2kXmfy3LBtkdv7o=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/google-cloud-compute/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-compute";
version = "1.35.0";
version = "1.37.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_compute";
inherit version;
hash = "sha256-8TlG3b6ifOqlXMOjICYXfRr20kenbp7UQHJWBn+r2s8=";
hash = "sha256-J/ApQytSkwN59YnPP6XjOs6WajOepUzWRLK1+eCkgeM=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/json-repair/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "json-repair";
version = "0.50.0";
version = "0.50.1";
pyproject = true;
src = fetchFromGitHub {
owner = "mangiucugna";
repo = "json_repair";
tag = "v${version}";
hash = "sha256-QiM5EVIJtnS4jE8aIm3dDi2LrF+eb2PoP02Qc/1tzzk=";
hash = "sha256-OOrXK1yaj8aOTKfA25KkIx4ZfA8A8UfZqOtTp2R8TPU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-neo4j";
version = "0.5.0";
version = "0.5.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_neo4j";
inherit version;
hash = "sha256-Iumsnln5iGMAoB3aY4haecm87jYXlEW4/2+uppW8m9c=";
hash = "sha256-P3EzR6piD49dFQY26LuV4/gZpOsFe5Hfp87BFiwo1Xg=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/neurokit2/default.nix
+4
View File
@@ -11,6 +11,7 @@
matplotlib,
numpy,
pandas,
pywavelets,
requests,
scikit-learn,
scipy,
@@ -22,6 +23,7 @@
plotly,
pytest-cov-stub,
pytestCheckHook,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
@@ -49,6 +51,7 @@ buildPythonPackage rec {
matplotlib
numpy
pandas
pywavelets
requests
scikit-learn
scipy
@@ -61,6 +64,7 @@ buildPythonPackage rec {
astropy
coverage
pytestCheckHook
writableTmpDirAsHomeHook
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
pkgs/development/python-modules/oelint-parser/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "oelint-parser";
version = "8.2.4";
version = "8.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "priv-kweihmann";
repo = "oelint-parser";
tag = version;
hash = "sha256-MFbDK/uahH4ZNRY3f8vW0uMFC2frlYtqVOZHT3NwA30=";
hash = "sha256-/lfUmhMj8Gosece58f3HpiQHn+RVeA4xjzb5VG1gYVE=";
};
pythonRelaxDeps = [ "regex" ];
pkgs/development/python-modules/torchao/default.nix
+2 -2
View File
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "ao";
version = "0.12.0";
version = "0.13.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pytorch";
repo = "ao";
tag = "v${version}";
hash = "sha256-J0aUce9Bu03Ff0ZjDKt39ZAX/UAif1S96SI7Gk4Hppw=";
hash = "sha256-R9H4+KkKuOzsunM3A5LT8upH1TfkHrD+BZerToCHwjo=";
};
build-system = [
pkgs/development/python-modules/wandb/default.nix
+26 -37
View File
@@ -4,10 +4,9 @@
fetchFromGitHub,
## wandb-core
buildGoModule,
git,
buildGo125Module,
gitMinimal,
versionCheckHook,
fetchpatch2,
## gpu-stats
rustPlatform,
@@ -44,6 +43,7 @@
azure-storage-blob,
bokeh,
boto3,
cloudpickle,
coverage,
flask,
google-cloud-artifact-registry,
@@ -78,22 +78,22 @@
}:
let
version = "0.19.11";
version = "0.21.3";
src = fetchFromGitHub {
owner = "wandb";
repo = "wandb";
tag = "v${version}";
hash = "sha256-JsciaNN1l3Ldty8dB2meRXWz62JdLRXeG09b7PNrQx4=";
hash = "sha256-GJk+Q/PY3/jo/yeetYRgqgMdXdYSlGt7Ny1NqdfHF0Q=";
};
gpu-stats = rustPlatform.buildRustPackage {
pname = "gpu-stats";
version = "0.4.0";
version = "0.6.0";
inherit src;
sourceRoot = "${src.name}/gpu_stats";
cargoHash = "sha256-q8csheytw57C6+wPPaANkMkW1Smoo+IViiA6Cdrag4Q=";
cargoHash = "sha256-iZinowkbBc3nuE0uRS2zLN2y97eCMD1mp/MKVKdnXaE=";
checkFlags = [
# fails in sandbox
@@ -103,7 +103,6 @@ let
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/gpu_stats";
versionCheckProgramArg = "--version";
doInstallCheck = true;
@@ -112,32 +111,15 @@ let
};
};
wandb-core = buildGoModule rec {
wandb-core = buildGo125Module rec {
pname = "wandb-core";
inherit src version;
sourceRoot = "${src.name}/core";
# x86_64-darwin fails with:
# "link: duplicated definition of symbol dlopen, from github.com/ebitengine/purego and github.com/ebitengine/purego"
# This is fixed in purego 0.8.3, but wandb-core uses 0.8.2, so we pull in the fix here.
patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
(fetchpatch2 {
url = "https://github.com/ebitengine/purego/commit/1638563e361522e5f63511d84c4541ae1c5fd704.patch";
stripLen = 1;
extraPrefix = "vendor/github.com/ebitengine/purego/";
# These are not vendored by wandb-core
excludes = [
"vendor/github.com/ebitengine/purego/.github/workflows/test.yml"
"vendor/github.com/ebitengine/purego/internal/fakecgo/gen.go"
];
hash = "sha256-GoT/OL6r3rJY5zoUyl3kGzSRpX3PoI7Yjpe7oRb0cFc=";
})
];
# hardcode the `gpu_stats` binary path.
postPatch = ''
substituteInPlace pkg/monitor/gpuresourcemanager.go \
substituteInPlace internal/monitor/gpuresourcemanager.go \
--replace-fail \
'cmdPath, err := getGPUCollectorCmdPath()' \
'cmdPath, err := "${lib.getExe gpu-stats}", error(nil)'
@@ -146,7 +128,7 @@ let
vendorHash = null;
nativeBuildInputs = [
git
gitMinimal
];
nativeInstallCheckInputs = [
@@ -182,17 +164,23 @@ buildPythonPackage rec {
patches = [
# Replace git paths
(replaceVars ./hardcode-git-path.patch {
git = lib.getExe git;
git = lib.getExe gitMinimal;
})
];
# Hard-code the path to the `wandb-core` binary in the code.
postPatch = ''
substituteInPlace wandb/util.py \
--replace-fail \
'bin_path = pathlib.Path(__file__).parent / "bin" / "wandb-core"' \
'bin_path = pathlib.Path("${lib.getExe wandb-core}")'
'';
postPatch =
# Prevent hatch from building wandb-core
''
substituteInPlace hatch_build.py \
--replace-fail "artifacts.extend(self._build_wandb_core())" ""
''
# Hard-code the path to the `wandb-core` binary in the code.
+ ''
substituteInPlace wandb/util.py \
--replace-fail \
'bin_path = pathlib.Path(__file__).parent / "bin" / "wandb-core"' \
'bin_path = pathlib.Path("${lib.getExe wandb-core}")'
'';
env = {
# Prevent the install script to try building and embedding the `gpu_stats` and `wandb-core`
@@ -237,8 +225,9 @@ buildPythonPackage rec {
azure-containerregistry
azure-identity
azure-storage-blob
boto3
bokeh
boto3
cloudpickle
coverage
flask
google-cloud-artifact-registry
pkgs/development/ruby-modules/gem-config/default.nix
+1
View File
@@ -1039,6 +1039,7 @@ in
zlib
];
dontUseCmakeConfigure = true;
buildFlags = [ "--with-ssh" ];
};
sassc = attrs: {
pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch
-41
View File
@@ -1,41 +0,0 @@
From 59f8403616e8db6dcf8f3489c44b61524044fe64 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Thu, 2 Jan 2025 04:28:42 +0000
Subject: [PATCH] Function inclusion fixes for GCC 14
This patch includes <algorithm> in bsa_file.cpp and <list> in
charactermanager.hpp to prevent a build failure with GCC 14.
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
apps/openmw/mwstate/charactermanager.hpp | 1 +
components/bsa/bsa_file.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index 8b3f2b8f8f..fac73b3d44 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -4,6 +4,7 @@
#include <boost/filesystem/path.hpp>
#include "character.hpp"
+#include <list>
namespace MWState
{
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 4f795ec0d4..38e97b267b 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -25,6 +25,7 @@
#include <components/files/constrainedfilestream.hpp>
+#include <algorithm>
#include <cassert>
#include <boost/filesystem/path.hpp>
--
2.47.0
pkgs/games/openmw/default.nix
-130
View File
@@ -1,130 +0,0 @@
{
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
cmake,
pkg-config,
wrapQtAppsHook,
SDL2,
boost,
bullet,
# Please unpin this on the next OpenMW release.
ffmpeg_6,
libXt,
luajit,
lz4,
mygui,
openal,
openscenegraph,
recastnavigation,
unshield,
yaml-cpp,
}:
let
GL = "GLVND"; # or "LEGACY";
osg' = (openscenegraph.override { colladaSupport = true; }).overrideDerivation (old: {
patches = [
(fetchpatch {
# Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW.
name = "darwin-osg-plugins-fix.patch";
url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch";
sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U=";
})
];
cmakeFlags =
(old.cmakeFlags or [ ])
++ [
"-Wno-dev"
"-DOpenGL_GL_PREFERENCE=${GL}"
"-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
"-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
]
++ (map (e: "-DBUILD_OSG_PLUGIN_${e}=1") [
"BMP"
"DAE"
"DDS"
"FREETYPE"
"JPEG"
"OSG"
"PNG"
"TGA"
]);
});
bullet' = bullet.overrideDerivation (old: {
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
"-Wno-dev"
"-DOpenGL_GL_PREFERENCE=${GL}"
"-DUSE_DOUBLE_PRECISION=ON"
"-DBULLET2_MULTITHREADING=ON"
];
});
in
stdenv.mkDerivation rec {
pname = "openmw";
version = "0.48.0";
src = fetchFromGitLab {
owner = "OpenMW";
repo = "openmw";
rev = "${pname}-${version}";
hash = "sha256-zkjVt3GfQZsFXl2Ht3lCuQtDMYQWxhdFO4aGSb3rsyo=";
};
patches = [ ./0001-function-inclusion-fixes-for-gcc14.patch ];
postPatch = ''
sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# Don't fix Darwin app bundle
sed -i '/fixup_bundle/d' CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
];
# If not set, OSG plugin .so files become shell scripts on Darwin.
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
buildInputs = [
SDL2
boost
bullet'
ffmpeg_6
libXt
luajit
lz4
mygui
openal
osg'
recastnavigation
unshield
yaml-cpp
];
cmakeFlags = [
"-DOpenGL_GL_PREFERENCE=${GL}"
"-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DOPENMW_OSX_DEPLOYMENT=ON"
];
meta = with lib; {
description = "Unofficial open source engine reimplementation of the game Morrowind";
homepage = "https://openmw.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
marius851000
];
platforms = platforms.linux ++ platforms.darwin;
};
}
pkgs/games/openmw/tes3mp-gcc14-fix.patch
-25
View File
@@ -1,25 +0,0 @@
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index 2daf734..b77d2a8 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -1,6 +1,8 @@
#ifndef GAME_STATE_CHARACTERMANAGER_H
#define GAME_STATE_CHARACTERMANAGER_H
+#include <list>
+
#include <boost/filesystem/path.hpp>
#include "character.hpp"
diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
index 6eef4b9..608323e 100644
--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
@@ -1,5 +1,7 @@
#include "filesystemarchive.hpp"
+#include <algorithm>
+
#include <boost/filesystem.hpp>
#include <components/debug/debuglog.hpp>
pkgs/games/openmw/tes3mp.nix
-179
View File
@@ -1,179 +0,0 @@
{
lib,
stdenv,
cmake,
openmw,
fetchFromGitHub,
fetchpatch,
luajit,
makeWrapper,
symlinkJoin,
}:
# revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy
let
# raknet could also be split into dev and lib outputs
raknet = stdenv.mkDerivation {
pname = "raknet";
version = "unstable-2020-01-19";
src = fetchFromGitHub {
owner = "TES3MP";
repo = "CrabNet";
# usually fixed:
# https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589
rev = "19e66190e83f53bcdcbcd6513238ed2e54878a21";
sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA=";
};
patches = [
# gcc-13 build fix:
# https://github.com/TES3MP/CrabNet/pull/18
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/TES3MP/CrabNet/commit/3ec9a338a7cefd5cc751c9d29095cafa4c73be20.patch";
hash = "sha256-zE87icjX9GSnApgKQXj0K4IjlrReV/upFLjVgNYkNfM=";
})
];
cmakeFlags = [
"-DCRABNET_ENABLE_DLL=OFF"
];
nativeBuildInputs = [ cmake ];
installPhase = ''
install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a
'';
};
coreScripts = stdenv.mkDerivation {
pname = "corescripts";
version = "0.8.1";
src = fetchFromGitHub {
owner = "TES3MP";
repo = "CoreScripts";
# usually latest in stable branch (e.g. 0.7.1)
rev = "6ae0a2a5d16171de3764817a7f8b1067ecde3def";
sha256 = "8j/Sr9IRMNFPEVfFzdb42PckHS3KW7FH7x7rRxIh5gY=";
};
buildCommand = ''
dir=$out/share/openmw-tes3mp
mkdir -p $dir
cp -r $src $dir/CoreScripts
'';
};
# build an unwrapped version so we don't have to rebuild it all over again in
# case the scripts or wrapper scripts change.
unwrapped = openmw.overrideAttrs (oldAttrs: rec {
pname = "openmw-tes3mp-unwrapped";
version = "0.8.1";
src = fetchFromGitHub {
owner = "TES3MP";
repo = "TES3MP";
# usually latest in stable branch (e.g. 0.7.1)
rev = "68954091c54d0596037c4fb54d2812313b7582a1";
sha256 = "8/bV4sw7Q8l8bDTHGQ0t4owf6J6h9q468JFx4KegY5o=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ];
buildInputs = oldAttrs.buildInputs ++ [ luajit ];
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DBUILD_OPENCS=OFF"
"-DRakNet_INCLUDES=${raknet.src}/include"
"-DRakNet_LIBRARY_RELEASE=${raknet}/lib/libRakNetLibStatic.a"
"-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a"
];
prePatch = ''
substituteInPlace components/process/processinvoker.cpp \
--replace "\"./\"" "\"$out/bin/\""
'';
patches = [
# glibc-2.34 support
(fetchpatch {
url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch";
hash = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
})
# gcc-13 build fix:
# https://github.com/TES3MP/TES3MP/pull/674
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/TES3MP/TES3MP/commit/7921f71a79e96f817a2009100e5105a7948b3fe2.patch";
hash = "sha256-mpxuOSPA2xixgBeYXsxutEUI7VJL5PxAeZgaNU7YkJQ=";
})
# https://github.com/TES3MP/openmw-tes3mp/issues/552
./tes3mp.patch
# https://github.com/TES3MP/TES3MP/pull/691
./tes3mp-gcc14-fix.patch
];
env.NIX_CFLAGS_COMPILE = "-fpermissive";
preConfigure = ''
substituteInPlace files/version.in \
--subst-var-by OPENMW_VERSION_COMMITHASH ${src.rev}
'';
# move everything that we wrap out of the way
postInstall = ''
mkdir -p $out/libexec
mv $out/bin/tes3mp-* $out/libexec
'';
meta = with lib; {
description = "Multiplayer for TES3:Morrowind based on OpenMW";
homepage = "https://tes3mp.com/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ];
platforms = [
"x86_64-linux"
"i686-linux"
];
};
});
tes3mp-server-run = ''
config="''${XDG_CONFIG_HOME:-''$HOME/.config}"/openmw
data="''${XDG_DATA_HOME:-''$HOME/.local/share}"/openmw
if [[ ! -f "$config"/tes3mp-server.cfg && ! -d "$data"/server ]]; then
mkdir -p "$config"
echo [Plugins] > "$config"/tes3mp-server.cfg
echo "home = $data/server" >> "$config"/tes3mp-server.cfg
mkdir -p "$data"
cp -r ${coreScripts}/share/openmw-tes3mp/CoreScripts "$data"/server
chmod -R u+w "$data"/server
fi
'';
in
symlinkJoin {
name = "openmw-tes3mp-${unwrapped.version}";
inherit (unwrapped) version meta;
nativeBuildInputs = [ makeWrapper ];
paths = [ unwrapped ];
postBuild = ''
mkdir -p $out/bin
makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \
--chdir "$out/bin"
makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \
--run '${tes3mp-server-run}' \
--chdir "$out/bin"
'';
}
pkgs/games/openmw/tes3mp.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp
index be365cfb8..204dcdc7b 100644
--- a/apps/openmw-mp/Script/Types.hpp
+++ b/apps/openmw-mp/Script/Types.hpp
@@ -105,7 +105,7 @@ struct ScriptFunctionPointer : public ScriptIdentity
void *addr;
#if (!defined(__clang__) && defined(__GNUC__))
template<typename R, typename... Types>
- constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {}
+ constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}
#else
template<typename R, typename... Types>
constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}
pkgs/top-level/aliases.nix
+1 -1
View File
@@ -634,7 +634,6 @@ mapAliases {
code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22
collada-dom = opencollada; # added 2024-02-21
collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08
colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
@@ -1831,6 +1830,7 @@ mapAliases {
openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04
openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17
openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
opensmtpd-extras = throw "opensmtpd-extras has been removed in favor of separate opensmtpd-table-* packages"; # Added 2025-01-26
openssl_3_0 = openssl_3; # Added 2022-06-27
opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
pkgs/top-level/all-packages.nix
-4
View File
@@ -14000,10 +14000,6 @@ with pkgs;
openloco = pkgsi686Linux.callPackage ../games/openloco { };
openmw = libsForQt5.callPackage ../games/openmw { };
openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
openraPackages_2019 = import ../games/openra_2019 {
inherit lib;
pkgs = pkgs.__splicedPackages;
pkgs/top-level/php-packages.nix
+1 -2
View File
@@ -230,8 +230,6 @@ lib.makeScope pkgs.newScope (
cyclonedx-php-composer = callPackage ../development/php-packages/cyclonedx-php-composer { };
deployer = callPackage ../development/php-packages/deployer { };
grumphp = callPackage ../development/php-packages/grumphp { };
phan = callPackage ../development/php-packages/phan { };
@@ -257,6 +255,7 @@ lib.makeScope pkgs.newScope (
psalm = callPackage ../development/php-packages/psalm { };
}
// lib.optionalAttrs config.allowAliases {
deployer = throw "`php8${lib.versions.minor php.version}Packages.deployer` has been removed, use `deployer`";
phpcbf = throw "`php8${lib.versions.minor php.version}Packages.phpcbf` has been removed, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";
phpcs = throw "`php8${lib.versions.minor php.version}Packages.phpcs` has been removed, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";
psysh = throw "`php8${lib.versions.minor php.version}Packages.psysh` has been removed, use `psysh`";