Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-03-09 18:03:47 +00:00
committed by GitHub
81 changed files with 1577 additions and 11647 deletions
+13
View File
@@ -14414,6 +14414,13 @@
githubId = 30194994;
name = "Felix Nilles";
};
marcin-serwin = {
name = "Marcin Serwin";
github = "marcin-serwin";
githubId = 12128106;
email = "marcin@serwin.dev";
keys = [ { fingerprint = "F311 FA15 1A66 1875 0C4D A88D 82F5 C70C DC49 FD1D"; } ];
};
marcovergueira = {
email = "vergueira.marco@gmail.com";
github = "marcovergueira";
@@ -23350,6 +23357,12 @@
githubId = 7060816;
name = "Thao-Tran Le-Phuong";
};
thardin = {
email = "th020394@gmail.com";
github = "Tyler-Hardin";
githubId = 5404976;
name = "Tyler Hardin";
};
thblt = {
name = "Thibault Polge";
email = "thibault@thb.lt";
+10
View File
@@ -6,6 +6,7 @@ let
cfg = config.programs.xonsh;
package = cfg.package.override { inherit (cfg) extraPackages; };
bashCompletionPath = "${cfg.bashCompletion.package}/share/bash-completion/bash_completion";
in
{
@@ -49,6 +50,13 @@ in
Xontribs and extra Python packages to be available in xonsh.
'';
};
bashCompletion = {
enable = lib.mkEnableOption "bash completions for xonsh" // {
default = true;
};
package = lib.mkPackageOption pkgs "bash-completion" { };
};
};
};
@@ -78,6 +86,8 @@ in
aliases['ls'] = _ls_alias
del _ls_alias
${lib.optionalString cfg.bashCompletion.enable "$BASH_COMPLETIONS = '${bashCompletionPath}'"}
${cfg.config}
'';
@@ -157,7 +157,6 @@ in
};
config = lib.mkIf cfg.enable {
systemd.defaultUnit = "graphical.target";
# Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
systemd.services.phosh = {
wantedBy = [ "graphical.target" ];
@@ -213,7 +212,7 @@ in
security.pam.services.phosh = {};
hardware.graphics.enable = lib.mkDefault true;
services.graphical-desktop.enable = true;
services.gnome.core-shell.enable = true;
services.gnome.core-os-services.enable = true;
+4 -2
View File
@@ -42,6 +42,8 @@
TRACY_NO_INVARIANT_CHECK = "1";
};
};
virtualisation.memorySize = 2048;
};
enableOCR = true;
@@ -51,8 +53,8 @@
import tempfile
import subprocess
selectionColor: str = "#2A82DA"
openorbisColor: str = "#336081"
selectionColor: str = "#354953"
openorbisColor: str = "#306082"
# Based on terminal-emulators.nix' check_for_pink
def check_for_color(color: str) -> Callable[[bool], bool]:
+4 -12
View File
@@ -8,22 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "Mopidy-Local";
version = "3.2.1";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9";
inherit version;
pname = "mopidy_local";
hash = "sha256-y6btbGk5UiVan178x7d9jq5OTnKMbuliHv0aRxuZK3o=";
};
patches = [
# Fix tests with newer Mopidy versions >=3.4.0 -- mopidy/mopidy-local#69
(fetchpatch {
name = "update-tests-for-mopidy-3.4.0.patch";
url = "https://github.com/mopidy/mopidy-local/commit/f2c198f8eb253f62100afc58f652e73a76d5a090.patch";
hash = "sha256-jrlZc/pd00S5q9nOfV1OXu+uP/SvH+Xbi7U52aZajj4=";
})
];
propagatedBuildInputs = [
mopidy
python3Packages.uritools
File diff suppressed because it is too large Load Diff
@@ -27,12 +27,12 @@
};
angular = buildGrammar {
language = "angular";
version = "0.0.0+rev=745d3c6";
version = "0.0.0+rev=cba2889";
src = fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "745d3c65c2294aca1110b6b6ad6805124be605c9";
hash = "sha256-4i1B4r+V5QgBIPVJepQ7V2pJDQfafLxRG1sk4XZVrco=";
rev = "cba288924f4832abb619c627539f111004ff22e5";
hash = "sha256-ZYBmTu6wNDBMBE/nFrNZdNX2o4uG+4wFIA1XBT4rgCA=";
};
meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
};
@@ -270,12 +270,12 @@
};
cmake = buildGrammar {
language = "cmake";
version = "0.0.0+rev=e409ae3";
version = "0.0.0+rev=cd00bbc";
src = fetchFromGitHub {
owner = "uyha";
repo = "tree-sitter-cmake";
rev = "e409ae33f00e04cde30f2bcffb979caf1a33562a";
hash = "sha256-+DiM/deIBx4AyJOF86S5tbKkg93+1fg4r8kDnlyfU+w=";
rev = "cd00bbcb77fe31283ca79b0038387ec7411759ae";
hash = "sha256-Lz2K+/GvmNsQAm1g4TCDdHs+Vebu8fERzTvlVAsA40U=";
};
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
};
@@ -414,12 +414,12 @@
};
dart = buildGrammar {
language = "dart";
version = "0.0.0+rev=e81af6a";
version = "0.0.0+rev=80e23c0";
src = fetchFromGitHub {
owner = "UserNobody14";
repo = "tree-sitter-dart";
rev = "e81af6ab94a728ed99c30083be72d88e6d56cf9e";
hash = "sha256-nguzW8cADqJsdxnE57IrHXKHCvveX1t3rDJcUuc2hH4=";
rev = "80e23c07b64494f7e21090bb3450223ef0b192f4";
hash = "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=";
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
@@ -480,12 +480,12 @@
};
djot = buildGrammar {
language = "djot";
version = "0.0.0+rev=67e6e23";
version = "0.0.0+rev=eb31845";
src = fetchFromGitHub {
owner = "treeman";
repo = "tree-sitter-djot";
rev = "67e6e23ba7be81a4373e0f49e21207bdc32d12a5";
hash = "sha256-Mp2y2YaaSPptZnc84GKiMQh4gHrJofm7SgPOMwYRx7w=";
rev = "eb31845d59b9ee8c1b2098e78e9ca72004bd1579";
hash = "sha256-7qwBdueO33SdOp5KY12WMIkDgjS5Psz2eF804wn/aLk=";
};
meta.homepage = "https://github.com/treeman/tree-sitter-djot";
};
@@ -524,12 +524,12 @@
};
dtd = buildGrammar {
language = "dtd";
version = "0.0.0+rev=26e95de";
version = "0.0.0+rev=2128a0b";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "26e95de449d772bc2dd4f0382580f84e2a0754d6";
hash = "sha256-lUFjL9QxjEBaBOOnEmabo1GNJ6bgPpeglKXNvmJlfPY=";
rev = "2128a0b249263e238d88cb894dad00c3168fea37";
hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
};
location = "dtd";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -592,12 +592,12 @@
};
elixir = buildGrammar {
language = "elixir";
version = "0.0.0+rev=86ec2ed";
version = "0.0.0+rev=450a819";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "86ec2ed45d6d9433b4e0b88cd3d96796bd45625f";
hash = "sha256-9M/DpqpGivDtgGt3ojU/kHR51sla59+KtZ/95hT6IIo=";
rev = "450a8194f5a66561135962cfc8d7545a27b61c4c";
hash = "sha256-4cL8E7if7j5NeuMH/5IEgudHu2kcerpdTj4pVoYM0Ao=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -757,12 +757,12 @@
};
fortran = buildGrammar {
language = "fortran";
version = "0.0.0+rev=765d82a";
version = "0.0.0+rev=21b7408";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "765d82ad913e75abfffdd57837217e96f4774fba";
hash = "sha256-+vLs5nHWDiusMYbRjOWIvTCTkK6fdWqn61HAjfCq5uE=";
rev = "21b740801794b6570a0380f8aef22bb67214ea65";
hash = "sha256-/PEl7Cl/SIbwEo88gFppPCBjBU/dfovN5J7PXNu7CBw=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -779,12 +779,12 @@
};
fsharp = buildGrammar {
language = "fsharp";
version = "0.0.0+rev=9308e58";
version = "0.0.0+rev=02929f0";
src = fetchFromGitHub {
owner = "ionide";
repo = "tree-sitter-fsharp";
rev = "9308e58bec0394232a8d4abdd92eeaa387aefc89";
hash = "sha256-Zzzm9flwRuVV4aKVF8bBGtSf532a94R4T+EvFjV+jrA=";
rev = "02929f084726db969e5b916d144436f248146824";
hash = "sha256-64MF/777+pY+wcoyg4WMaKUlDRiz8VqwLO55TNotVbE=";
};
location = "fsharp";
meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
@@ -912,12 +912,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=af60434";
version = "0.0.0+rev=e01c884";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f";
hash = "sha256-6OVt35LcFMDu3y2eWMPenxZldwBu1L93jToJdaAS8yw=";
rev = "e01c88449b53e2ee5dad222d4020cc7006c5b700";
hash = "sha256-clkf5DxLvvDJDcNYQgAPLQYw+hz05UBdOmPK8kjlVDA=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -1408,24 +1408,24 @@
};
jinja = buildGrammar {
language = "jinja";
version = "0.0.0+rev=41b17a3";
version = "0.0.0+rev=07a62ad";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "41b17a33f335130ce9861fd21bffeb88fd768ef4";
hash = "sha256-3ffp5uoJqXXwCHcyU9BYDKo90UiwmRe4N4v1RE8GZow=";
rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4";
hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k=";
};
location = "tree-sitter-jinja";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
};
jinja_inline = buildGrammar {
language = "jinja_inline";
version = "0.0.0+rev=41b17a3";
version = "0.0.0+rev=07a62ad";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "41b17a33f335130ce9861fd21bffeb88fd768ef4";
hash = "sha256-3ffp5uoJqXXwCHcyU9BYDKo90UiwmRe4N4v1RE8GZow=";
rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4";
hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k=";
};
location = "tree-sitter-jinja_inline";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
@@ -1798,23 +1798,23 @@
};
meson = buildGrammar {
language = "meson";
version = "0.0.0+rev=c5fffb8";
version = "0.0.0+rev=742a21e";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-meson";
rev = "c5fffb8edd39f22644084ab3f73a924a75721ee3";
hash = "sha256-Q+5sCO+1CAbnaE7nq7vl/CxUpydxEHVtmPXIAUGJiOE=";
rev = "742a21e11e914096e0172dad2f0b85e7554c95ff";
hash = "sha256-XwGCwwLM6sdLLNAVK8TGc6XMJ3eXFq6Ayk4dj0FmJmQ=";
};
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=ad38178";
version = "0.0.0+rev=c7c62f3";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "ad381783044e107ce144af3c36342cc34183d5b4";
hash = "sha256-meE+FKpw3dFX6PpaKRUErgMTUeGMCFHlVMn9smVlIog=";
rev = "c7c62f37a8612a897d25906d93363fec36c1591c";
hash = "sha256-SFMJoAjofemUqPy+Spu4mibGXLShXPqDvpl7gJeZQJg=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1931,12 +1931,12 @@
};
nu = buildGrammar {
language = "nu";
version = "0.0.0+rev=a073ba8";
version = "0.0.0+rev=b99dc3b";
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "a073ba8cd854318ca5d56e97279fc330f194be8a";
hash = "sha256-PuoSH6MV9xWF9wm2xJZN4PBJvvUnvc3mWPU3t6URkEI=";
rev = "b99dc3b7b26337d84f95c0de4dda81077b03e5c7";
hash = "sha256-w1zG976wp0PE3SpbZnh0GKS/WiRyXEif7jNjKMwfcvY=";
};
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
};
@@ -1964,24 +1964,24 @@
};
ocaml = buildGrammar {
language = "ocaml";
version = "0.0.0+rev=91e4d91";
version = "0.0.0+rev=6921a83";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "91e4d9106f5da8199ab5158ba65e02da3e664597";
hash = "sha256-AJs6GJOIV69sFMKVGHxcyAeC8PEq8I3upEsup+lF2sw=";
rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd";
hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw=";
};
location = "grammars/ocaml";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
};
ocaml_interface = buildGrammar {
language = "ocaml_interface";
version = "0.0.0+rev=91e4d91";
version = "0.0.0+rev=6921a83";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "91e4d9106f5da8199ab5158ba65e02da3e664597";
hash = "sha256-AJs6GJOIV69sFMKVGHxcyAeC8PEq8I3upEsup+lF2sw=";
rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd";
hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw=";
};
location = "grammars/interface";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
@@ -2145,12 +2145,12 @@
};
powershell = buildGrammar {
language = "powershell";
version = "0.0.0+rev=32fe49c";
version = "0.0.0+rev=e904962";
src = fetchFromGitHub {
owner = "airbus-cert";
repo = "tree-sitter-powershell";
rev = "32fe49cc5d4a2d5a976dacafc0da16d98787866b";
hash = "sha256-KweKsz/9X9HHvqZDhXb5qVVRMjwUSKNkiTYg5OcIiS0=";
rev = "e904962e25858b7e8e19c653e737ad3b7d1c55bd";
hash = "sha256-RlzGW09DE6gLM1G+y57gkEDPzMHc5Vi1jTHROUxMOt8=";
};
meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
};
@@ -2467,12 +2467,12 @@
};
requirements = buildGrammar {
language = "requirements";
version = "0.0.0+rev=5ad9b75";
version = "0.0.0+rev=7289100";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-requirements";
rev = "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2";
hash = "sha256-L3PF6B+d+v/pjAQGVwkc7hCKrhbAB7u/BdXOpEum08w=";
rev = "728910099ddea7f1f94ea95a35a70d1ea76a1639";
hash = "sha256-IiIvU4iyqlP9px6qCivmQXusp/vuhOJBfWqMfcdKN7s=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
};
@@ -2577,23 +2577,23 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=6e883a2";
version = "0.0.0+rev=e86119b";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "6e883a2adea9414799300699e78c0d2f032b5c46";
hash = "sha256-vvB5xswHwBCjYObyaZ4SHYFPuIPF1bAjZ2Xl5zsQB2Q=";
rev = "e86119bdb4968b9799f6a014ca2401c178d54b5f";
hash = "sha256-zJHUx5ZQVJ80hWWWh/PlO0jrOcCHDm9EPUTmZChab6g=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=d67fe3b";
version = "0.0.0+rev=ed939ed";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "d67fe3ba3879bd7ba74bd7f56c9a38fed241ba25";
hash = "sha256-jyWnFyjbgmmshsZ+/NUqHfxXJN1EYgzZrrDnHECnoOY=";
rev = "ed939ed550ebff7d4ad8aafb4d5aad44de69965d";
hash = "sha256-OR0GIC7bDOkUZZvbvd1XdyOdYnjUAXhbYnOhNddH8wU=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@@ -2656,12 +2656,12 @@
};
slim = buildGrammar {
language = "slim";
version = "0.0.0+rev=a0f08e8";
version = "0.0.0+rev=546e3aa";
src = fetchFromGitHub {
owner = "theoo";
repo = "tree-sitter-slim";
rev = "a0f08e85b787248219ea645423c5916c8d620ef6";
hash = "sha256-b+V56Csa+byGvTieN+cAvoVy8UpFzS8/SSdYeW3cjts=";
rev = "546e3aa1af8a3b355c7734efccd9a759ffc0b43a";
hash = "sha256-G9+9TdEDqIDt3HvXWxMrjKixtgey7qkFNNp9fWx7Uec=";
};
meta.homepage = "https://github.com/theoo/tree-sitter-slim";
};
@@ -2845,12 +2845,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=9266b31";
version = "0.0.0+rev=15ff939";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "9266b3131bbcc0705b3b752bcb7478871a143740";
hash = "sha256-WjMydZZPgGuk2Syuy+PIsBfoRT4IIy4G7Ia8SZVxckY=";
rev = "15ff939100f9d52342445407973f3ce125a8437e";
hash = "sha256-fM+zhRvEwjMIq9RtgbMBF9GlybIWdO53ln6qZv+xHJs=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3193,12 +3193,12 @@
};
unison = buildGrammar {
language = "unison";
version = "0.0.0+rev=3c97db7";
version = "0.0.0+rev=169e7f7";
src = fetchFromGitHub {
owner = "kylegoetz";
repo = "tree-sitter-unison";
rev = "3c97db76d3cdbd002dfba493620c2d5df2fd6fa9";
hash = "sha256-xveOQpCCkYdeiPkRbFlPNfXOpWW0lzCxfQbxXz+eurM=";
rev = "169e7f748a540ec360c0cb086b448faad012caa4";
hash = "sha256-0HOLtLh1zRdaGQqchT5zFegWKJHkQe9r7DGKL6sSkPo=";
};
generate = true;
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
@@ -3272,12 +3272,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=f3a8d69";
version = "0.0.0+rev=db1d744";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "f3a8d69a96656bb81d803f7e6ec24fbe1aa2c313";
hash = "sha256-8cWDG3nqYwFlFSL1eLAR/B7aAkLlOlAuT20WhgGCRy0=";
rev = "db1d7446bd07d811981734cd501fe1994cbad99d";
hash = "sha256-0lNyEc6MS+k+vJvegQDI6/nlsx47xwLSro2ZGcaoADM=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3393,12 +3393,12 @@
};
xml = buildGrammar {
language = "xml";
version = "0.0.0+rev=26e95de";
version = "0.0.0+rev=2128a0b";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "26e95de449d772bc2dd4f0382580f84e2a0754d6";
hash = "sha256-lUFjL9QxjEBaBOOnEmabo1GNJ6bgPpeglKXNvmJlfPY=";
rev = "2128a0b249263e238d88cb894dad00c3168fea37";
hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
};
location = "xml";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -3471,24 +3471,24 @@
};
ziggy = buildGrammar {
language = "ziggy";
version = "0.0.0+rev=acf2b6b";
version = "0.0.0+rev=af41bdb";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831";
hash = "sha256-ovHM91WXDOrp4d5pO6dg0LM+FN/5WrwcJZmSlQMZvbw=";
rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596";
hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs=";
};
location = "tree-sitter-ziggy";
meta.homepage = "https://github.com/kristoff-it/ziggy";
};
ziggy_schema = buildGrammar {
language = "ziggy_schema";
version = "0.0.0+rev=acf2b6b";
version = "0.0.0+rev=af41bdb";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831";
hash = "sha256-ovHM91WXDOrp4d5pO6dg0LM+FN/5WrwcJZmSlQMZvbw=";
rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596";
hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs=";
};
location = "tree-sitter-ziggy-schema";
meta.homepage = "https://github.com/kristoff-it/ziggy";
@@ -612,7 +612,6 @@ https://github.com/echasnovski/mini.starter/,HEAD,
https://github.com/echasnovski/mini.statusline/,HEAD,
https://github.com/echasnovski/mini.surround/,HEAD,
https://github.com/echasnovski/mini.tabline/,HEAD,
https://github.com/echasnovski/mini.test/,HEAD,
https://github.com/echasnovski/mini.trailspace/,HEAD,
https://github.com/echasnovski/mini.visits/,HEAD,
https://github.com/wfxr/minimap.vim/,,
+2 -2
View File
@@ -40,14 +40,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
version = "0.274";
version = "0.275";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-fZ2mjwP45qpFB0VaIHBccjkDPKyDmxqaXcZg3TFSAlY=";
hash = "sha256-VD0T+zoR8fPZqRwTVrk2k5ui3tLQumEg1Fd64SJdszU=";
};
outputs = [
@@ -10,11 +10,11 @@
buildMozillaMach rec {
pname = "firefox-beta";
binaryName = pname;
version = "135.0b9";
version = "137.0b2";
applicationName = "Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3007c2a8743e4444226e66f0c11f53f01255c09702deda7de83bbe134a19c324b8b49de78d3211b20bb82c7b2040127145d2e39ed8aa81c653ac4397c46476f6";
sha512 = "ac9d9635ede14506bf579735768cc643843c658122be89bb223f1c08702ee570757fbf091cf8191ad614688fff2330964ce728e51ea2519a801b838df94cc5d2";
};
meta = {
@@ -10,13 +10,13 @@
buildMozillaMach rec {
pname = "firefox-devedition";
binaryName = pname;
version = "135.0b9";
version = "137.0b2";
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 = "bf09f999b347492b841a26fcbcfb4d37e5f74528a05ffab47572dcaae01cb43e70baf58e83cc5153498a6a6ad2cb69507b628fba840090c91f4dbca62717a435";
sha512 = "a15eded14d6a4ddeb3798ac7bb72a9e8a6541a3ee76dc9051cf6865816079f8794e6defe2f9299f327976eefc1f4ea957d972b56d1f03816296b25f0c0173a12";
};
meta = {
+13 -12
View File
@@ -20,6 +20,7 @@
tcl,
doxygen,
groff,
jsoncpp,
}:
let
@@ -39,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
pname = "svxlink";
version = "19.09.2";
version = "24.02";
src = fetchFromGitHub {
owner = "sm0svx";
repo = pname;
rev = version;
sha256 = "sha256-riyFEuEmJ7+jYT3UoTTsMUwFdO3y5mjo4z0fcC3O8gY=";
repo = "svxlink";
tag = version;
hash = "sha256-QNm3LQ9RY24F/wmRuP+D2G5of1490YpZD9bp6dZErU0=";
};
cmakeFlags = [
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
"-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include"
"../src"
];
dontWrapQtApps = true;
nativeBuildInputs = [
@@ -77,25 +79,24 @@ stdenv.mkDerivation rec {
rtl-sdr
speex
tcl
jsoncpp
];
postInstall = ''
rm -f $out/share/applications/*
cp -v ${desktopItem}/share/applications/* $out/share/applications
mv $out/share/icons/link.xpm $out/share/icons/qtel.xpm
rm -rf $out/share/applications
ln -s ${desktopItem}/share/applications $out/share/applications
wrapQtApp $out/bin/qtel
'';
meta = with lib; {
meta = {
description = "Advanced repeater controller and EchoLink software";
longDescription = ''
Advanced repeater controller and EchoLink software for Linux including a
GUI, Qtel - The Qt EchoLink client
'';
homepage = "http://www.svxlink.org/";
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ zaninime ];
platforms = platforms.linux;
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ zaninime ];
platforms = lib.platforms.linux;
};
}
@@ -10,13 +10,13 @@
buildLua rec {
pname = "mpvacious";
version = "0.37";
version = "0.38";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "sha256-sT74uDGtEUSDMJqSTJ6bI9XvdpRnQDNvKebWMx0CRcE=";
sha256 = "sha256-x0ZljJSNlkIszUJy2FUCZMd6Vud08YnCJs7DmT4o/fA=";
};
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
@@ -3,36 +3,96 @@
buildNpmPackage,
fetchFromGitHub,
gitUpdater,
nodejs_20,
python3,
nodejs,
cmake,
pkg-config,
openssl,
libdatachannel,
plog,
}:
let
# Modified from pkgs/by-name/ht/httptoolkit-server/package.nix
nodeDatachannel = buildNpmPackage {
pname = "node-datachannel";
version = "0.10.1";
src = fetchFromGitHub {
owner = "murat-dogan";
repo = "node-datachannel";
rev = "refs/tags/v${nodeDatachannel.version}";
hash = "sha256-r5tBg645ikIWm+RU7Muw/JYyd7AMpkImD0Xygtm1MUk=";
};
npmFlags = [ "--ignore-scripts" ];
makeCacheWritable = true;
npmDepsHash = "sha256-1ZJd0Y45B3CT2YPXDYfCuFMBo5uggWRuDH11eCobyyY=";
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
openssl
libdatachannel
plog
];
dontUseCmakeConfigure = true;
env.NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
preBuild = ''
# don't use static libs and don't use FetchContent
substituteInPlace CMakeLists.txt \
--replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \
--replace-fail 'if(NOT libdatachannel)' 'if(false)' \
--replace-fail 'datachannel-static' 'datachannel'
sed -i '2ifind_package(plog)' CMakeLists.txt
# don't fetch node headers
substituteInPlace node_modules/cmake-js/lib/dist.js \
--replace-fail '!this.downloaded' 'false'
'';
installPhase = ''
runHook preInstall
install -Dm755 build/Release/*.node -t $out/build/Release
runHook postInstall
'';
};
in
buildNpmPackage rec {
pname = "webtorrent-mpv-hook";
version = "1.4.1";
version = "1.4.4";
src = fetchFromGitHub {
owner = "mrxdst";
repo = pname;
rev = "v${version}";
hash = "sha256-/dMtXcIyfAs++Zgz2CxRW0tkzn5QjS+WVGChlCyrU0U=";
hash = "sha256-qFeQBVPZZFKkxz1fhK3+ah3TPDovklhhQwtv09TiSqo=";
};
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
postPatch = ''
substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs_20}'"
substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs}'"
# This executable is just for telling non-Nix users how to install
substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' ""
rm -rf src/bin.ts
'';
npmDepsHash = "sha256-EqHPBoYyBuW9elxQH/XVTZoPkKHC6+7aksYo60t7WA4=";
npmDepsHash = "sha256-fKzXdbtxC2+63/GZdvPOxvBpQ5rzgvfseigOgpP1n5I=";
makeCacheWritable = true;
npmFlags = [ "--ignore-scripts" ];
nativeBuildInputs = [
python3 # Fixes node-gyp on aarch64-linux
];
postConfigure = ''
# manually place our prebuilt `node-datachannel` binary into its place, since we used '--ignore-scripts'
ln -s ${nodeDatachannel}/build node_modules/node-datachannel/build
'';
postInstall = ''
mkdir -p $out/share/mpv/scripts/
ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/
+3 -3
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation (self: {
pname = "alacritty-theme";
version = "0-unstable-2025-02-16";
version = "0-unstable-2025-02-20";
src = fetchFromGitHub {
owner = "alacritty";
repo = "alacritty-theme";
rev = "082983da8e4811f3a6ddc0c54a161f2a89011c8e";
hash = "sha256-FeZdkmYEHihTWWPhvDq257r91L9iVU0heIZXAOp3XQo=";
rev = "687675f3f2245c80ff8bfe8180b0eb40dfc0bc86";
hash = "sha256-kxOPURbK/tzHSO7eZRCV2l4XOj7BNT5bCTc0Qcifuww=";
sparseCheckout = [ "themes" ];
};
+6 -7
View File
@@ -1,21 +1,20 @@
{
buildGoModule,
buildGo124Module,
lib,
fetchFromGitHub,
nix-update-script,
buildNpmPackage,
fetchpatch,
}:
buildGoModule rec {
buildGo124Module rec {
pname = "beszel";
version = "0.9.1";
version = "0.10.1";
src = fetchFromGitHub {
owner = "henrygd";
repo = "beszel";
tag = "v${version}";
hash = "sha256-tZLv/YwamQpZDo2Ha86z3lpDdLl7PVarBiAXJtCn1UE=";
hash = "sha256-4RuYZcBR7X9Ug6l91N/FtyfT38HlW2guputzo4kF8YU=";
};
webui = buildNpmPackage {
@@ -49,12 +48,12 @@ buildGoModule rec {
sourceRoot = "${src.name}/beszel/site";
npmDepsHash = "sha256-ObLulUnCCcKetDW6XKdC8u0NuKBLVUl37jebCGloGoE=";
npmDepsHash = "sha256-UKOS7QyGsdKosjhxVhZErFkXhnfrFxdX0ozBUJGsNII=";
};
sourceRoot = "${src.name}/beszel";
vendorHash = "sha256-h4JgRzjpG17kKXEchX+OtLBnjjd0C3D37jUCvOqQXP0=";
vendorHash = "sha256-VX9mil0Hdmb85Zd9jfvm5Zz2pPQx+oAGHY+BI04bYQY=";
preBuild = ''
mkdir -p site/dist
+414 -399
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.13.7";
version = "2.0.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-NYeAa8F8LpLWVMW0M/KPVt1XCFOJP50Aug11dxLkSGw=";
sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
+3 -3
View File
@@ -10,18 +10,18 @@
buildGraalvmNativeImage rec {
pname = "clojure-lsp";
version = "2024.11.08-17.49.29";
version = "2025.02.07-16.11.24";
src = fetchFromGitHub {
owner = "clojure-lsp";
repo = "clojure-lsp";
rev = version;
hash = "sha256-pvIfW96RaJXMIDPKHfJjds9dU6IuC2f1TwdI8X/JTw0=";
hash = "sha256-QGYcLqhQ/5vtrJKIl3au24cYcXILjiY13uRa+8K62fM=";
};
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
hash = "sha256-QMc62p6qFTh+y4C5aBGuZX/pQZQSywbYCFA1nYIY/80=";
hash = "sha256-6Qe2uPgIZ+E+GRjKGyivGHv08ZbzaOIdKeW0bnJP0Gk=";
};
extraNativeImageBuildArgs = [
+62 -44
View File
@@ -3,51 +3,40 @@
stdenv,
fetchFromGitHub,
rustPlatform,
makeBinaryWrapper,
cosmic-icons,
just,
pkg-config,
libcosmicAppHook,
glib,
libxkbcommon,
wayland,
xorg,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.0.0-alpha.1";
version = "1.0.0-alpha.6";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
rev = "epoch-${version}";
hash = "sha256-UwQwZRzOyMvLRRmU2noxGrqblezkR8J2PNMVoyG0M0w=";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-i1CVhfieexeiKPwp0y29QyrKspzEFkp1+zwIaM9D/Qc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-me/U4LtnvYtf77qxF2Z1ncHRVOLp3inDVlwnCjwlj08=";
cargoHash = "sha256-I5WRuEogMwa0dB6wxhWDxivqhCdUugvsPrwUvjjDnt8=";
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env.VERGEN_GIT_COMMIT_DATE = "2024-08-05";
env.VERGEN_GIT_SHA = src.rev;
postPatch = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
'';
env = {
VERGEN_GIT_COMMIT_DATE = "2025-02-21";
VERGEN_GIT_SHA = finalAttrs.src.tag;
};
nativeBuildInputs = [
just
pkg-config
makeBinaryWrapper
];
buildInputs = [
glib
libxkbcommon
wayland
libcosmicAppHook
];
buildInputs = [ glib ];
dontUseJustBuild = true;
dontUseJustCheck = true;
justFlags = [
"--set"
@@ -56,31 +45,60 @@ rustPlatform.buildRustPackage rec {
"--set"
"bin-src"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files"
"--set"
"applet-src"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files-applet"
];
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/cosmic-files" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
wayland
]
}
# This is needed since by setting cargoBuildFlags, it would build both the applet and the main binary
# at the same time, which would cause problems with the desktop items applet
buildPhase = ''
runHook preBuild
defaultCargoBuildFlags="$cargoBuildFlags"
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files"
runHook cargoBuildHook
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files-applet"
runHook cargoBuildHook
runHook postBuild
'';
meta = with lib; {
checkPhase = ''
runHook preCheck
defaultCargoTestFlags="$cargoTestFlags"
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"
runHook cargoCheckHook
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"
runHook cargoCheckHook
runHook postCheck
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"unstable"
"--version-regex"
"epoch-(.*)"
];
};
meta = {
homepage = "https://github.com/pop-os/cosmic-files";
description = "File Manager for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
maintainers = with maintainers; [
license = lib.licenses.gpl3Only;
mainProgram = "cosmic-files";
maintainers = with lib.maintainers; [
ahoneybun
nyabinary
HeitorAugustoLN
];
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}
})
-2534
View File
File diff suppressed because it is too large Load Diff
+2 -7
View File
@@ -26,13 +26,8 @@ rustPlatform.buildRustPackage {
./fix-daemon.patch
];
# git dependencies are currently not supported in the fixed-output derivation fetcher.
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"galaxy_buds_rs-0.2.10" = "sha256-95PBmGwHJiXi72Rir8KK7as+i9yjs5nf45SaBhj1geg=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-Y1pMmWxfXGcEFPj05/BpXQvd199O5l6hJmePNxMQc/Y=";
nativeBuildInputs = [
pkg-config
-3910
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -40,12 +40,8 @@ rustPlatform.buildRustPackage {
hash = "sha256-4MArENBmX6tDVLZE1O8cuJe7A0R+sLZoxBkDvIwIVZ4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-2Hf492/xZ/QGqDYbjiZep/FX8bPyEuoxkMJ4qnMqu+c=";
nativeBuildInputs = [
extra-cmake-modules
-3007
View File
File diff suppressed because it is too large Load Diff
+2 -6
View File
@@ -16,12 +16,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-vakCBDyL/Su55tkn/SJ5ShZcYC8l+p2acpve/fTN0uI=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"suricatax-rule-parser-0.1.0" = "sha256-qwkZFmvgfXrH0zHPq/dVfxpWkulPDT+CzPQQHfeBotg=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-b3PQQlSRt1ysnJIkBXdG1KRUdEJ8h1WLzbmZXx9VjqU=";
meta = {
description = "Web Based Event Viewer (GUI) for Suricata EVE Events in Elastic Search";
+11 -4
View File
@@ -1,7 +1,7 @@
{
stdenv,
lib,
fetchgit,
fetchFromGitea,
pkg-config,
git,
libmicrohttpd,
@@ -11,16 +11,23 @@ stdenv.mkDerivation rec {
pname = "fileshare";
version = "0.2.4";
src = fetchgit {
url = "https://git.tkolb.de/Public/fileshare.git";
src = fetchFromGitea {
domain = "git.tkolb.de";
owner = "Public";
repo = "fileshare";
rev = "v${version}";
sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk";
sha256 = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4=";
};
postPatch = ''
sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile
substituteInPlace Makefile \
--replace-fail pkg-config "${stdenv.cc.targetPrefix}pkg-config" \
--replace-fail gcc "${stdenv.cc.targetPrefix}cc"
'';
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
nativeBuildInputs = [
pkg-config
git
+3 -3
View File
@@ -11,17 +11,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "fum";
version = "1.2.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "qxb3";
repo = "fum";
tag = "v${version}";
hash = "sha256-v/MEqfDMrEVGr2tt3I2R1xPduZSxtiSHDxcp8GBHE+U=";
hash = "sha256-qZGbJGotxJCxlMIRPS/hw/cfz/k8PFdVKoJtqWKXD6s=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-1dtCcVtl0ztsrr9LPYgEi51vkAnhdE1HEEvhEOzgLwA=";
cargoHash = "sha256-g6Nn3teRHMdlKReX3j0jkhfJEHOigDF4ghSfSYU33o8=";
nativeBuildInputs = [
autoPatchelfHook
+38
View File
@@ -0,0 +1,38 @@
{
lib,
stdenv,
fetchurl,
appimageTools,
}:
let
version = "5.5.224";
pname = "gdevelop";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
sha256 = "sha256-/o7Yyu5BjRfpg4Tl0ZwN6/KD9Kg4LcEmUqlO7NE/dew=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
appimageContents = appimageTools.extractType2 { inherit pname src; };
dontPatchELF = true;
in
appimageTools.wrapType2 rec {
inherit pname version src;
meta = {
description = "Graphical Game Development Studio";
homepage = "https://gdevelop.io/";
downloadPage = "https://github.com/4ian/GDevelop/releases";
license = lib.licenses.mit;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ tombert ];
platforms = [ "x86_64-linux" ];
};
}
+3 -3
View File
@@ -8,15 +8,15 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.22.2";
version = "2.23.0";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-mm6ZP+NtXp/BfiQuvBOk9VBDiFPfJ636EoAklnsRGSs=";
sha256 = "sha256-ku3pB9LLlDjwEEzJEVgCK+ar+L+beyMrjDtASfBWqLM=";
};
vendorHash = "sha256-lX/rt2XWAojWBBwGHQk9ZzE6sZU5TZke5pRmOiD3rLw=";
vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";
# integration tests expect more file changes
# types tests are missing CodeLocation
+2 -2
View File
@@ -12,14 +12,14 @@
python3Packages.buildPythonApplication rec {
pname = "git-cola";
version = "4.11.0";
version = "4.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
tag = "v${version}";
hash = "sha256-aFdjkuQrVYgYALTnupdwVL58kSsp4SC6xsXefA1NnKI=";
hash = "sha256-1y/fYqvsPpgCEakL7XepI9SVPFgmk1m795uMPv1WgNc=";
};
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ];
+3 -3
View File
@@ -18,13 +18,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "grimblast";
version = "0.1-unstable-2025-02-13";
version = "0.1-unstable-2025-03-06";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "contrib";
rev = "59178a657b7e09ddf82b9e79681f482b6c2f378b";
hash = "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=";
rev = "0e40ccfc2d6772f9b7d5e1b50c56fb5e468a18fb";
hash = "sha256-inSG4OUSdCHXSJZhLNcCUA1s0Ebomr5+v4x3FE/XQ3M=";
};
strictDeps = true;
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gtk4-layer-shell";
version = "1.0.4";
version = "1.1.0";
outputs = [
"out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "wmww";
repo = "gtk4-layer-shell";
rev = "v${finalAttrs.version}";
hash = "sha256-0Ya3NVTSO/urU8H+h6SVZBkcvdnqwr06rNWyBtwhQ8E=";
hash = "sha256-UGhFeaBBIfC4ToWdyoX+oUzLlqJsjF++9U7mtszE0y0=";
};
strictDeps = true;
+54
View File
@@ -0,0 +1,54 @@
{
lib,
buildGoModule,
fetchFromGitHub,
testers,
holos,
kubectl,
kustomize,
kubernetes-helm,
}:
buildGoModule rec {
pname = "holos";
version = "0.104.1";
src = fetchFromGitHub {
owner = "holos-run";
repo = "holos";
rev = "v${version}";
hash = "sha256-4LCNKPf+b7O9DHCmOzaI8clCbmikyAAG+6C3I0aQdMg=";
};
vendorHash = "sha256-FR3H2NS4sEYjGmzIyaUglby98AgDAgbIzl9de8h/cj8=";
ldflags = [
"-w"
"-X github.com/holos-run/holos/version.GitDescribe=v${version}"
"-X github.com/holos-run/holos/version.GitCommit=${src.rev}"
"-X github.com/holos-run/holos/version.GitTreeState=clean"
# fix time for deterministic builds
"-X github.com/holos-run/holos/version.BuildDate=1970-01-01T00:00:00Z"
];
subPackages = [ "cmd/holos" ];
nativeCheckInputs = [
kubernetes-helm
kubectl
kustomize
];
passthru.tests.version = testers.testVersion {
package = holos;
command = "holos --version || true";
version = "${version}";
};
meta = with lib; {
description = "Holos CLI tool";
homepage = "https://github.com/holos-run/holos";
license = licenses.asl20;
maintainers = with maintainers; [ cameronraysmith ];
mainProgram = "holos";
};
}
+6
View File
@@ -58,6 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace libhs.pc.in \
--replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
--replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
substituteInPlace cmake/pcre.cmake --replace-fail 'CHECK_C_SOURCE_COMPILES("#include <pcre.h.generic>
#if PCRE_MAJOR != ''${PCRE_REQUIRED_MAJOR_VERSION} || PCRE_MINOR < ''${PCRE_REQUIRED_MINOR_VERSION}
#error Incorrect pcre version
#endif
main() {}" CORRECT_PCRE_VERSION)' 'set(CORRECT_PCRE_VERSION TRUE)'
'';
doCheck = true;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "imgpkg";
version = "0.44.0";
version = "0.44.2";
src = fetchFromGitHub {
owner = "carvel-dev";
repo = "imgpkg";
rev = "v${version}";
hash = "sha256-M8OUeB2aigwlvGznByVEsDZnSQb0ggqQA73lXFwbY2c=";
hash = "sha256-UZhmuSUqm8EPCSc0CONgpISINgMJh3uNUx0v52eQNIc=";
};
vendorHash = null;
+16 -8
View File
@@ -5,19 +5,19 @@
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "iwe";
version = "0.0.17";
version = "0.0.27";
src = fetchFromGitHub {
owner = "iwe-org";
repo = "iwe";
tag = "iwe-v${version}";
hash = "sha256-eE84KzYJTJ39UDQt3VZpSIba/P+7VFR9K6+MSMlg0Wc=";
tag = "iwe-v${finalAttrs.version}";
hash = "sha256-4qKZnJa7rBMReWJO7iutp9SOKKL5BrxbZQySdogD03s=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-K8RxVYHh0pStQyHMiLLeUakAoK1IMoUtCNg70/NfDiI=";
cargoHash = "sha256-pakgzQ268WNjIM0ykKm9s3x0uCj4Z+H3/c9+2hWjx10=";
cargoBuildFlags = [
"--package=iwe"
@@ -28,13 +28,21 @@ rustPlatform.buildRustPackage rec {
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^iwe-v(.*)$"
];
};
meta = {
description = "Personal knowledge management system (editor plugin & command line utility)";
homepage = "https://iwe.md/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ phrmendes ];
maintainers = with lib.maintainers; [
phrmendes
HeitorAugustoLN
];
mainProgram = "iwe";
};
}
})
+24 -19
View File
@@ -3,40 +3,45 @@
stdenv,
fetchzip,
nixosTests,
installShellFiles,
}:
let
arch = "amd64";
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.15.107955";
version = "0.16.129390";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "sha256-qCG3yi0ACmqOnn+gaCN8GedciUobpOww50Kz5AdknqU=";
url = "https://repo.jotta.us/archives/linux/amd64/jotta-cli-${version}_linux_amd64.tar.gz";
hash = "sha256-iw8OZ6clpK+CnBFNK5jOSGQ3ReU4pnOQSJFE2LTJNxE=";
stripRoot = false;
};
installPhase = ''
install -D usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
mkdir -p $out/share/bash-completion/completions
'';
nativeBuildInputs = [ installShellFiles ];
postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
$out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash
'';
installPhase =
''
runHook preInstall
install -Dm0755 usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
runHook postInstall
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd jotta-cli \
--bash <($out/bin/jotta-cli completion bash) \
--fish <($out/bin/jotta-cli completion fish) \
--zsh <($out/bin/jotta-cli completion zsh)
'';
passthru.tests = { inherit (nixosTests) jotta-cli; };
meta = with lib; {
meta = {
description = "Jottacloud CLI";
homepage = "https://www.jottacloud.com/";
downloadPage = "https://repo.jotta.us/archives/linux/";
maintainers = with maintainers; [ evenbrenden ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with lib.maintainers; [ evenbrenden ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
};
}
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libnick";
version = "2025.1.0";
version = "2025.2.0";
src = fetchFromGitHub {
owner = "NickvisionApps";
repo = "libnick";
tag = finalAttrs.version;
hash = "sha256-Y7Vn9KaZjEJ29o2GouNl5B/svAtJ24El9WYgXHhnxho=";
hash = "sha256-pPQ4MEWKmPYUQ0FxQpCd7m6kT723pRnh1QTw/W0RY0Q=";
};
nativeBuildInputs =
+3 -3
View File
@@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec {
pname = "maa-cli";
version = "0.5.3";
version = "0.5.4";
src = fetchFromGitHub {
owner = "MaaAssistantArknights";
repo = "maa-cli";
rev = "v${version}";
hash = "sha256-aaB9/VbMDR+QGB8bj8g5+5iQ/r1qRx89f0bTPUKE0YE=";
hash = "sha256-KoKMfZrI3V73hbZGm0Xx8VxL7ENicSApropLm02B098=";
};
nativeBuildInputs = [
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "git2" ];
useFetchCargoVendor = true;
cargoHash = "sha256-FjPvjlAq3Xj2WTRvzvhZ87CaUjhJf9R1VDUs+XQchtU=";
cargoHash = "sha256-EIN624QnrPvta8ZNb27vT6ZDO2YY0CKSrSIZqelSlJU=";
# maa-cli would only search libMaaCore.so and resources in itself's path
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
@@ -1,13 +0,0 @@
diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py
index 09c391d5..5d74d930 100644
--- a/mealie/services/openai/openai.py
+++ b/mealie/services/openai/openai.py
@@ -7,7 +7,7 @@ from pathlib import Path
from textwrap import dedent
from openai import NOT_GIVEN, AsyncOpenAI
-from openai.resources.chat.completions import ChatCompletion
+from openai.types.chat import ChatCompletion
from pydantic import BaseModel, field_validator
from mealie.core.config import get_app_settings
+8 -9
View File
@@ -7,15 +7,16 @@
nixosTests,
python3Packages,
writeShellScript,
nix-update-script,
}:
let
version = "2.6.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "mealie-recipes";
repo = "mealie";
tag = "v${version}";
hash = "sha256-txkHCQ/xTakPXXFki161jNOKwAH9p9z1hCNEEkbqQtM=";
hash = "sha256-nN8AuSzxHjIDKc8rGN+O2/vlzkH/A5LAr4aoAlOTLlk=";
};
frontend = callPackage (import ./mealie-frontend.nix src version) { };
@@ -55,11 +56,6 @@ pythonpkgs.buildPythonApplication rec {
pythonRelaxDeps = true;
patches = [
# compatibility with openai 1.63.0
./0000_openai_1.63.0.patch
];
dependencies = with pythonpkgs; [
aiofiles
alembic
@@ -141,8 +137,11 @@ pythonpkgs.buildPythonApplication rec {
"tests/unit_tests/test_security.py"
];
passthru.tests = {
inherit (nixosTests) mealie;
passthru = {
updateScript = nix-update-script { };
tests = {
inherit (nixosTests) mealie;
};
};
meta = with lib; {
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "mujs";
version = "1.3.5";
version = "1.3.6";
src = fetchurl {
url = "https://mujs.com/downloads/mujs-${version}.tar.gz";
hash = "sha256-eKMRrkIkQAd0ywnvW6omM8JpcVE/i5MdMiSg64WxPgs=";
hash = "sha256-fPOl5iLP9BkD7/8DNFGPyUrwYyVnUsOLpGGKUZHkTxg=";
};
buildInputs = [ readline ];
+4 -4
View File
@@ -166,13 +166,13 @@
},
{
"pname": "NBitcoin",
"version": "7.0.46",
"hash": "sha256-c5KHQ/TYGBTMoKKKo7XYR8r7VTJlaU0ZW6KqWRMjh2Y="
"version": "7.0.50",
"hash": "sha256-l3H70u5OAbd2hevX/yeVBdQyee/dUn5mp4iGvTnTcjk="
},
{
"pname": "NBitcoin.Altcoins",
"version": "3.0.31",
"hash": "sha256-Mtaqj8Fl8jxeOBXz66fjZQKZ/yg6pARJKJTFW0V/wDA="
"version": "3.0.34",
"hash": "sha256-eh5Yft+UQqlLREJJ3kKAKLYYjAHOuMxhBI+tr3Ciya8="
},
{
"pname": "NETStandard.Library",
+2 -2
View File
@@ -7,13 +7,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
version = "2.5.17";
version = "2.5.23";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
sha256 = "sha256-8tcE60SVhQ2CgoQu24hNL2rrv9JG+2+DuSJWtmycYA0=";
sha256 = "sha256-T7pKIj7e4ZOX0JRawLc53eqjMrAV2CV8m6BRjukJ+t4=";
};
projectFile = "NBXplorer/NBXplorer.csproj";
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "phrase-cli";
version = "2.36.0";
version = "2.37.0";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
sha256 = "sha256-/ZZPqU/bG0dCfyxKg2Bo/222Or0ZcSR1Jb5eOqqy3wY=";
sha256 = "sha256-lPqxMnZV7yco29Cdn1abVN7pl9ll3yRj4+iVFYlcW9M=";
};
vendorHash = "sha256-LtymNbvrm0PBj6EM9KN6LU+M2gsdenYOJma00ZDtlpU=";
vendorHash = "sha256-T2QbX/mZmaaGWcJyB/ArI2qSv1Kj3UgEQsm5Gv27Np0=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
+3 -3
View File
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "presenterm";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "mfontanini";
repo = "presenterm";
tag = "v${version}";
hash = "sha256-ow87vKHfdstL2k73wHD06HsX28mLvTrWh5yIbo/a54M=";
hash = "sha256-R2ATN495/sk+EMYs5BBxWk8nLO1ublWKfznn075/V5c=";
};
buildInputs = [
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
];
useFetchCargoVendor = true;
cargoHash = "sha256-KpwW2lblX4aCN73jWFY9Ylp+AEbGWCu/jb/c8wTao08=";
cargoHash = "sha256-XXJGduSiPxlmcUyYp8QbTrPYI6NkoYxFA9cfsWgy1Es=";
checkFlags = [
# failed to load .tmpEeeeaQ: No such file or directory (os error 2)
+3 -3
View File
@@ -9,16 +9,16 @@
buildNpmPackage rec {
pname = "redocly";
version = "1.28.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
hash = "sha256-TCBPcYbyMlmz7O1c/6/72I3Tb9ZnhBc5W5S/yDQ0AHo=";
hash = "sha256-Oa4R4R7Obg26DKWZkccqjIcrD35pBw1AYIPe2/KN8f4=";
};
npmDepsHash = "sha256-soAnln7K3vNMCDTGPX+j2qaatvoWTrhFzL7hjHuE6QQ=";
npmDepsHash = "sha256-V0NklVsPRqRJ479nIMWqs/sXciXOm6LAlIh3YcPPDEc=";
npmBuildScript = "prepare";
+6 -7
View File
@@ -4,8 +4,7 @@
fetchFromGitHub,
makeWrapper,
nodejs,
overrideSDK,
pnpm_9,
pnpm_10,
python3,
testers,
xcbuild,
@@ -16,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "renovate";
version = "39.153.1";
version = "39.191.0";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
tag = finalAttrs.version;
hash = "sha256-QKCUHwm6c50wTDFbmAqhh/tV8Lzx9HD4U9k7ke6t8OE=";
hash = "sha256-HJvtYqEUmIr+P8g6cCr+NSgmZkzF7TZaVifyhI84oSY=";
};
postPatch = ''
@@ -33,14 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeWrapper
nodejs
pnpm_9.configHook
pnpm_10.configHook
python3
yq-go
] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
pnpmDeps = pnpm_9.fetchDeps {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-MTkbRQnimEXP4XepJ+x2KGHtJTkqN9WBWvisAHH/j18=";
hash = "sha256-w0BaiLwP2AC2KsP2+GTgagMcfFbP/FBaUurbL9y+pXw=";
};
env.COREPACK_ENABLE_STRICT = 0;
+3 -3
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "sblim-sfcc";
version = "2.2.9"; # this is technically 2.2.9-preview
version = "2.2.8-unstable-2023-06-26";
src = fetchFromGitHub {
owner = "kkaempf";
repo = "sblim-sfcc";
rev = "514a76af2020fd6dc6fc380df76cbe27786a76a2";
sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs";
rev = "881fccbaf19e26cbef3da1bebe2b42b3a9de1147";
hash = "sha256-zXQD+IYuMV5vw27FpTpeCfh/mf0wvKzOvc4bplEDJCw=";
};
buildInputs = [ curl ];
@@ -1,36 +0,0 @@
From 0a93bc8850b4b1608d77b123cdb1875f60635e6d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 7 Dec 2024 10:47:29 +0100
Subject: [PATCH] Support keypad-less keyboards everywhere
---
src/sdl_window.cpp | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp
index d95e8d63..ac8c5c72 100644
--- a/src/sdl_window.cpp
+++ b/src/sdl_window.cpp
@@ -174,19 +174,12 @@ void WindowSDL::OnResize() {
}
void WindowSDL::OnKeyPress(const SDL_Event* event) {
-#ifdef __APPLE__
// Use keys that are more friendly for keyboards without a keypad.
// Once there are key binding options this won't be necessary.
constexpr SDL_Keycode CrossKey = SDLK_N;
constexpr SDL_Keycode CircleKey = SDLK_B;
constexpr SDL_Keycode SquareKey = SDLK_V;
constexpr SDL_Keycode TriangleKey = SDLK_C;
-#else
- constexpr SDL_Keycode CrossKey = SDLK_KP_2;
- constexpr SDL_Keycode CircleKey = SDLK_KP_6;
- constexpr SDL_Keycode SquareKey = SDLK_KP_4;
- constexpr SDL_Keycode TriangleKey = SDLK_KP_8;
-#endif
auto button = OrbisPadButtonDataOffset::None;
Input::Axis axis = Input::Axis::AxisMax;
--
2.47.0
+5 -8
View File
@@ -24,6 +24,7 @@
rapidjson,
renderdoc,
robin-map,
sdl3,
sndio,
stb,
vulkan-headers,
@@ -37,21 +38,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shadps4";
version = "0.5.0-unstable-2025-01-20";
version = "0.6.0-unstable-2025-03-07";
src = fetchFromGitHub {
owner = "shadps4-emu";
repo = "shadPS4";
rev = "95a30b2b3e1aa4e20c3db632955cc67bbded0fb1";
hash = "sha256-52BhGKSUv+9asACNkppxiNm3Gja7r3LcXOIwhQR5ALs=";
rev = "6b3746f3a688cd4c7c2acfbbe8238ebd97235d37";
hash = "sha256-j5gIrSmQsc7nbDJ0OeFPpauHBOCADFykN0RMjCA8P8A=";
fetchSubmodules = true;
};
patches = [
# Fix controls without a numpad
./laptop-controls.patch
];
buildInputs = [
alsa-lib
boost
@@ -78,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
rapidjson
renderdoc
robin-map
sdl3
sndio
stb
vulkan-headers
+25 -14
View File
@@ -5,8 +5,7 @@
zlib,
libtiff,
libxml2,
SDL,
xorgproto,
SDL_compat,
libX11,
libXi,
libXmu,
@@ -15,21 +14,27 @@
libGL,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "stardust";
version = "0.1.13";
src = fetchurl {
url = "http://iwar.free.fr/IMG/gz/${pname}-${version}.tar.gz";
sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp";
url = "http://iwar.free.fr/spip/IMG/gz/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-t5cykB5zHYYj4tlk9QDhL7YQVgEScBZw9OIVXz5NOqc=";
};
strictDeps = true;
enableParallelBuilding = true;
nativeBuildInputs = [
SDL_compat
libxml2
];
buildInputs = [
zlib
libtiff
libxml2
SDL
xorgproto
SDL_compat
libX11
libXi
libXmu
@@ -38,20 +43,26 @@ stdenv.mkDerivation rec {
libGL
];
installFlags = [ "bindir=\${out}/bin" ];
patches = [ ./pointer-fix.patch ];
installFlags = [ "bindir=${placeholder "out"}/bin" ];
hardeningDisable = [ "format" ];
postConfigure = ''
substituteInPlace config.h \
--replace '#define PACKAGE ""' '#define PACKAGE "stardust"'
--replace-fail '#define PACKAGE ""' '#define PACKAGE "stardust"'
'';
meta = with lib; {
meta = {
description = "Space flight simulator";
homepage = "http://iwar.free.fr/spip/rubrique2.html";
mainProgram = "stardust";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with lib.maintainers; [
raskin
marcin-serwin
];
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
};
}
})
@@ -0,0 +1,13 @@
diff --git a/src/obj.c b/src/obj.c
index 66d528b..ab08a4f 100644
--- a/src/obj.c
+++ b/src/obj.c
@@ -183,7 +183,7 @@ static short intnpar(char *line, int mode, struct face *face) {
*/
#define ALLOC_MORE 100
GLuint obj_load(Obj *object, const char *obj_file) {
- gzFile *gzp = NULL;
+ gzFile gzp = NULL;
char line[1024], command[1024];
char filename_mtl[256] = "\0";
+4 -3
View File
@@ -2,21 +2,22 @@
buildGoModule rec {
pname = "temporal";
version = "1.26.2";
version = "1.27.1";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
hash = "sha256-tyMR0LpZDa1QbSe/Ba8fBhtRc8ZI+gwayfi7ZKDa8gI=";
hash = "sha256-hQs2rSTbNqknQ/N0mZ8BxeKQn2Pm9Yt/5eKGB2Kc+ME=";
};
vendorHash = "sha256-Ljx0LocoowYwqy7MIumGnOcUwxpy+EY5rdTEehIq8Yo=";
vendorHash = "sha256-kasKs692fHojyCLsSdho5LWej11Asu8JJb61rbg1k2k=";
excludedPackages = [ "./build" ];
env.CGO_ENABLED = 0;
tags = [ "test_dep" ];
ldflags = [ "-s" "-w" ];
# There too many integration tests.
+7
View File
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
sed -i -e 's/chmod 2755/chmod 755/' extras/Makefile.in
'';
# Work around failures with GCC 14, upstream is inactive unfortunately
# https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors
NIX_CFLAGS_COMPILE = [
"-Wno-error=implicit-int"
"-Wno-error=implicit-function-declaration"
];
buildInputs = [
libxcrypt
];
+11 -11
View File
@@ -1,6 +1,6 @@
{
stdenv,
lib,
stdenv,
fetchFromGitHub,
pkg-config,
meson,
@@ -10,7 +10,7 @@
itstool,
wrapGAppsHook3,
desktop-file-utils,
libsoup_2_4,
libsoup_3,
json-glib,
geoclue2,
geocode-glib,
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "tuner";
version = "1.5.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "louis77";
repo = pname;
rev = version;
sha256 = "sha256-tG1AMEqHcp4jHNgWDy9fS2FtlxFTlpMD5MVbepIY+GY=";
repo = "tuner";
tag = "v${version}";
hash = "sha256-i6I5NSwiS8FJuZaHbrXvUcumo9RZvEVPcfKOkHUXiLo=";
};
nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libsoup_2_4
libsoup_3
json-glib
geoclue2
geocode-glib
@@ -58,13 +58,13 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-ugly
];
meta = with lib; {
meta = {
homepage = "https://github.com/louis77/tuner";
description = "App to discover and play internet radio stations";
license = licenses.gpl3Plus;
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
mainProgram = "com.github.louis77.tuner";
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
abbe
aleksana
];
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "xerces-c";
version = "3.2.5";
version = "3.3.0";
src = fetchurl {
url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz";
sha256 = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU=";
sha256 = "sha256-lVXx0G+CmH+7RliGJwVRV0BBT9NLTbatLtdqLcCNO94=";
};
buildInputs = [
+12 -5
View File
@@ -1,6 +1,6 @@
{
lib,
llvmPackages_15,
llvmPackages_18,
fetchzip,
sbcl,
pkg-config,
@@ -13,16 +13,16 @@
}:
let
inherit (llvmPackages_15) stdenv llvm libclang;
inherit (llvmPackages_18) stdenv llvm libclang;
in
stdenv.mkDerivation rec {
pname = "clasp";
version = "2.6.0";
version = "2.7.0";
src = fetchzip {
url = "https://github.com/clasp-developers/clasp/releases/download/${version}/clasp-${version}.tar.gz";
hash = "sha256-SiQ4RMha6dMV7V2fh+UxtAIgEEH/6/hF9fe+bPtoGIw=";
hash = "sha256-IoEwsMvY/bbb6K6git+7zRGP0DIJDROt69FBQuzApRk=";
};
patches = [
@@ -64,7 +64,14 @@ stdenv.mkDerivation rec {
--package-path=/ \
--bin-path=$out/bin \
--lib-path=$out/lib \
--share-path=$out/share
--dylib-path=$out/lib \
--share-path=$out/share \
--pkgconfig-path=$out/lib/pkgconfig
'';
postInstall = ''
# --dylib-path not honored. Fix it in post.
mv $out/libclasp* $out/lib/
'';
meta = {
File diff suppressed because it is too large Load Diff
@@ -28,12 +28,9 @@ rustPlatform.buildRustPackage rec {
]
);
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"pubgrub-dependency-provider-elm-0.1.0" = "sha256-00J5XZfmuB4/fgB06aaXrRjdmOpOsSwA3dC3Li1m2Cc=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-F3/v4zYGZRv1PRVl/Tas+e0pc/dTM6ina+/c63KVuZY=";
# Tests perform networking and therefore can't work in sandbox
doCheck = false;
+2 -2
View File
@@ -38,7 +38,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gegl";
version = "0.4.52";
version = "0.4.54";
outputs = [
"out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor finalAttrs.version}/gegl-${finalAttrs.version}.tar.xz";
hash = "sha256-yiEqD8PgRIxQWMUcpqDTD9+wKXHyHyiCDaK0kBOWAAo=";
hash = "sha256-NaNC8IxrQ3mt7iy1dI/E4wfP3PJBfAuxfWymVD8jix4=";
};
nativeBuildInputs = [
@@ -13,16 +13,16 @@
buildPythonPackage rec {
pname = "humanize";
version = "4.11.0";
version = "4.12.1";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "python-humanize";
repo = pname;
repo = "humanize";
tag = version;
hash = "sha256-C6u7t7RedInHJtN4yHli22Wc7llnrxn4YeKssyQ+hS4=";
hash = "sha256-sj7c44KQ5jGkmans2EyAn9qMS4+GGu3hcSt7PRiTGKk=";
};
nativeBuildInputs = [
@@ -3,42 +3,51 @@
pkgs,
buildPythonPackage,
fetchFromGitHub,
pdm-backend,
setuptools,
wheel,
symlinkJoin,
cmake,
ninja,
pathspec,
pcre,
pkg-config,
scikit-build-core,
pytestCheckHook,
pytest-mock,
}:
let
lib-deps = symlinkJoin {
name = "hyperscan-static-deps";
paths = [
(pkgs.hyperscan.override { withStatic = true; })
(pcre.overrideAttrs { dontDisableStatic = 0; }).out
];
};
in
buildPythonPackage rec {
pname = "hyperscan";
version = "0.7.8";
version = "0.7.9";
pyproject = true;
src = fetchFromGitHub {
owner = "darvid";
repo = "python-hyperscan";
tag = "v${version}";
hash = "sha256-gNXE2VjHRTmIMyoLyTsmC9CuY3YT5ZsKfNZvMRthPn0=";
hash = "sha256-tf3dQgY0p+J6GIS8pB3+kvomNVYcbMJ+72T8IVbrnrU=";
};
buildInputs = [
(pkgs.hyperscan.override { withStatic = true; })
# we need static pcre to be built, by default only shared library is built
(pcre.overrideAttrs { dontDisableStatic = 0; })
];
env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib";
dontUseCmakeConfigure = true;
nativeBuildInputs = [
pkg-config
pdm-backend
setuptools
wheel
cmake
pathspec
ninja
scikit-build-core
];
pythonImportsCheck = [ "hyperscan" ];
pytestFlagsArray = [ "tests" ];
nativeCheckInputs = [
pytestCheckHook
pytest-mock
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "libusb1";
version = "3.2.0";
version = "3.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "vpelletier";
repo = "python-libusb1";
tag = version;
hash = "sha256-D2VMqrq1MQa6gp8vxDiLRAqTDyRGK3qVKo6YMmo5Zrg=";
hash = "sha256-RPuSpkEsACbDkaG+nRuWAckvH/RStJgQWbfgTPY4OvQ=";
};
patches = [
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "nodriver";
version = "0.39";
version = "0.40";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-r4T3YhWHfHQWb5XI52FSaOMfYRj0xykdIB8pAD8iSO8=";
hash = "sha256-lgUe2oIptqzNbKi4wECPaSHdAUu2RcEZFs7jddhcens=";
};
disabled = pythonOlder "3.9";
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "pyedflib";
version = "0.1.39";
version = "0.1.40";
pyproject = true;
src = fetchFromGitHub {
owner = "holgern";
repo = "pyedflib";
tag = "v${version}";
hash = "sha256-NHjeaNLbOxTPzTbQ9owFkessQY/QnxBSC8G93JahMGg=";
hash = "sha256-FWEd1Y883LPsPdzbjR6+emsYBMBrM33/jR8p1aIWmV4=";
};
build-system = [
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,
setuptools,
types-requests,
@@ -9,15 +8,13 @@
buildPythonPackage rec {
pname = "types-tqdm";
version = "4.67.0.20241221";
version = "4.67.0.20250301";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "types_tqdm";
inherit version;
hash = "sha256-5WBGYxBWkiOFq+ia6xivVhH0cerdeRigrX802EzUyMw=";
hash = "sha256-XomjitibhngjNo65fZ+Q0vxpgGuwVd3mJxagXaYrXg0=";
};
build-system = [ setuptools ];
@@ -27,10 +24,10 @@ buildPythonPackage rec {
# This package does not have tests.
doCheck = false;
meta = with lib; {
meta = {
description = "Typing stubs for tqdm";
homepage = "https://pypi.org/project/types-tqdm/";
license = licenses.asl20;
maintainers = with maintainers; [ GaetanLepage ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
@@ -0,0 +1,47 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
numpy,
torch,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "ultralytics-thop";
version = "2.0.14";
pyproject = true;
src = fetchFromGitHub {
owner = "ultralytics";
repo = "thop";
tag = "v${version}";
hash = "sha256-Xn01zh0/oaMPqH0FPDKElE0q7di3sDrXYcXCg6I/89E=";
};
build-system = [ setuptools ];
dependencies = [
numpy
torch
];
pythonImportsCheck = [ "thop" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = {
homepage = "https://github.com/ultralytics/thop";
changelog = "https://github.com/ultralytics/thop/releases/tag/v${version}";
description = "Profile PyTorch models by computing the number of Multiply-Accumulate Operations (MACs) and parameters";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ osbm ];
};
}
@@ -0,0 +1,109 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
scipy,
matplotlib,
opencv-python,
pillow,
pyyaml,
requests,
torch,
torchvision,
tqdm,
psutil,
py-cpuinfo,
pandas,
seaborn,
ultralytics-thop,
# tests
pytestCheckHook,
onnx,
onnxruntime,
}:
buildPythonPackage rec {
pname = "ultralytics";
version = "8.3.85";
pyproject = true;
src = fetchFromGitHub {
owner = "ultralytics";
repo = "ultralytics";
tag = "v${version}";
hash = "sha256-4EiTiy4SNinNwIUvqbckaA/5YRcv6io8ssTAhwDVgsM=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "numpy>=1.23.0,<=2.1.1" "numpy"
'';
build-system = [ setuptools ];
dependencies = [
scipy
matplotlib
opencv-python
pillow
pyyaml
requests
scipy
torch
torchvision
tqdm
psutil
py-cpuinfo
pandas
seaborn
ultralytics-thop
];
pythonImportsCheck = [ "ultralytics" ];
nativeCheckInputs = [
pytestCheckHook
onnx
onnxruntime
];
# rest of the tests require internet access
pytestFlagsArray = [ "tests/test_python.py" ];
disabledTests = [
# also remove the individual tests that require internet
"test_model_methods"
"test_predict_txt"
"test_predict_img"
"test_predict_visualize"
"test_predict_grey_and_4ch"
"test_val"
"test_train_scratch"
"test_train_pretrained"
"test_all_model_yamls"
"test_workflow"
"test_predict_callback_and_setup"
"test_results"
"test_labels_and_crops"
"test_data_annotator"
"test_model_embeddings"
"test_yolov10"
"test_utils_torchutils"
"test_yolo_world"
];
meta = {
homepage = "https://github.com/ultralytics/ultralytics";
changelog = "https://github.com/ultralytics/ultralytics/releases/tag/v${version}";
description = "Train YOLO models for computer vision tasks";
mainProgram = "yolo";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ osbm ];
};
}
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "weasyprint";
version = "63.1";
version = "64.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "weasyprint";
hash = "sha256-y0JOY+jdPxQZW/5fIDUnZGqkCi8ArIGfnTm4MEzsAEQ=";
hash = "sha256-KLAvLGQJuvzhsSINnXanNFh1vTvQjE9t+/UQu5KpR1c=";
};
patches = [
@@ -552,6 +552,10 @@ in
rpath="$(patchelf --print-rpath "$soPath")"
patchelf --set-rpath "${lib.makeLibraryPath [ lasem glib cairo ]}:$rpath" "$soPath"
patchelf --replace-needed liblasem.so liblasem-0.4.so "$soPath"
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.bundle"
install_name_tool -add_rpath "${lib.makeLibraryPath [ lasem glib cairo ]}/lib" "$soPath"
install_name_tool -change @rpath/liblasem.dylib "${lib.getLib lasem}/lib/liblasem-0.4.dylib" "$soPath"
'';
};
+2 -2
View File
@@ -22,13 +22,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vkquake";
version = "1.32.0";
version = "1.32.1";
src = fetchFromGitHub {
owner = "Novum";
repo = "vkQuake";
tag = finalAttrs.version;
hash = "sha256-UnldXIQD05yPFPuES5PvWFu0xQf72iht10GYJFZdZlQ=";
hash = "sha256-yqoP24SNjq7YZ9QfkZQte6tsSeR16ScknXgZ5nQJerI=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "sgt-puzzles";
version = "20250216.b99f107";
version = "20250303.7da4641";
src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
hash = "sha256-TErU482qrpPFWq//5RuCIpl6RpHU+MdckRolSDAS+xk=";
hash = "sha256-fwphR47zUV+H+Avjco0Dlb94TeH+s6v81MU/H+mbEAk=";
};
sgt-puzzles-menu = fetchurl {
@@ -0,0 +1,40 @@
{
stdenv,
lib,
fetchFromGitHub,
kernel,
}:
let
KDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
in
stdenv.mkDerivation {
pname = "amdgpu-i2c";
version = "0-unstable-2024-12-16";
src = fetchFromGitHub {
owner = "twifty";
repo = "amd-gpu-i2c";
rev = "06ca41fd12fb90f970d3ebd4785cc26cc0a3f3b0";
sha256 = "sha256-GVyrwnwNSBW4OCNDqQMU6e31C4bG14arC0MPkRWfiJQ=";
};
hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
buildPhase = "make -C ${KDIR} M=/build/source modules";
installPhase = ''
make -C ${KDIR} M=/build/source INSTALL_MOD_PATH="$out" modules_install
'';
meta = with lib; {
homepage = "https://github.com/twifty/amd-gpu-i2c";
downloadPage = "https://github.com/twifty/amd-gpu-i2c";
description = "Exposes i2c interface to set colors on AMD GPUs";
broken = kernel.kernelOlder "6.1.0" || kernel.isLibre;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ thardin ];
};
}
+1 -1
View File
@@ -31,7 +31,7 @@ buildNpmPackage {
prisma
];
npmDepsHash = "sha256-X/208utkpbWrn5S+y4HmpbzjQO+WmaXRaDRp8zOMCKM=";
npmDepsHash = "sha256-Np79hY7ooCFBqrL1tswq4HdITa815/DpkSfV8zrsJPQ=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+2 -2
View File
@@ -5,12 +5,12 @@
}:
let
version = "1.9.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "stonith404";
repo = "pingvin-share";
rev = "v${version}";
hash = "sha256-Yy1Ncqgl5A/0bQ9BAtOdQCCmYNL+AfShm1dDtEydO9c=";
hash = "sha256-xP6XiehTbbXu9hCxF1mwb9ud/2SCnaskhz9XMtF3HKI=";
};
in
+1 -1
View File
@@ -23,7 +23,7 @@ buildNpmPackage {
buildInputs = [ vips ];
nativeBuildInputs = [ pkg-config ];
npmDepsHash = "sha256-iZAlMDDd1zSLa7C9HoeKcIETaraEci8kaQUFLMGmMqE=";
npmDepsHash = "sha256-ZtIQnBNK/blpm3I9fc6iulhcykcUSEaHX3D/rSr3vBo=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonApplication rec {
pname = "pandoc-include";
version = "1.4.2";
version = "1.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "DCsunset";
repo = "pandoc-include";
tag = "v${version}";
hash = "sha256-GkZyv9iI9jeR5fVYXQmpu9ssum9H1PTypNpqKsNzh2Q=";
hash = "sha256-8ldIywvCExnbMNs9m7iLwM1HrTRHl7j4t3JQuBt0Z7U=";
};
build-system = [
+2
View File
@@ -339,6 +339,8 @@ in {
akvcam = callPackage ../os-specific/linux/akvcam { };
amdgpu-i2c = callPackage ../os-specific/linux/amdgpu-i2c { };
amneziawg = callPackage ../os-specific/linux/amneziawg { };
apfs = callPackage ../os-specific/linux/apfs { };
+4
View File
@@ -17938,6 +17938,10 @@ self: super: with self; {
ultraheat-api = callPackage ../development/python-modules/ultraheat-api { };
ultralytics = callPackage ../development/python-modules/ultralytics { };
ultralytics-thop = callPackage ../development/python-modules/ultralytics-thop { };
umalqurra = callPackage ../development/python-modules/umalqurra { };
umap-learn = callPackage ../development/python-modules/umap-learn { };