Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-03-01 00:26:11 +00:00
committed by GitHub
108 changed files with 1536 additions and 973 deletions
+19 -6
View File
@@ -1568,12 +1568,6 @@
githubId = 1358320;
name = "Arie Middelkoop";
};
amiloradovsky = {
email = "miloradovsky@gmail.com";
github = "amiloradovsky";
githubId = 20530052;
name = "Andrew Miloradovsky";
};
aminechikhaoui = {
email = "amine.chikhaoui91@gmail.com";
github = "AmineChikhaoui";
@@ -19389,6 +19383,12 @@
github = "0xnook";
githubId = 88323754;
};
norbertwnuk = {
name = "Norbert Wnuk";
email = "norbert.wnuk@gmail.com";
github = "norbertwnuk";
githubId = 70071;
};
norfair = {
email = "syd@cs-syd.eu";
github = "NorfairKing";
@@ -19866,6 +19866,13 @@
githubId = 20923;
name = "Erik Timan";
};
olduser101 = {
email = "nathan.j.gill@outlook.com";
github = "OldUser101";
githubId = 64069240;
matrix = "@olduser101:matrix.org";
name = "Nathan Gill";
};
olebedev = {
email = "ole6edev@gmail.com";
github = "olebedev";
@@ -25258,6 +25265,12 @@
githubId = 7669898;
name = "Katharina Fey";
};
spaghetti-stack = {
email = "spaghetti_stack@protonmail.com";
github = "spaghetti-stack";
githubId = 44814450;
name = "spaghetti-stack";
};
spalf = {
email = "tom@tombarrett.xyz";
name = "tom barrett";
@@ -28,6 +28,8 @@ in
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
security.wrappers."gsr-kms-server" = {
owner = "root";
group = "root";
@@ -44,8 +44,8 @@ in
ACTION=="add|change", KERNEL=="event*", ATTRS{name}=="CrossMacro Virtual Input Device", ENV{LIBINPUT_ATTR_POINTER_ACCEL}="0"
'';
environment.etc."polkit-1/actions/org.crossmacro.policy".source =
"${cfg.daemonPackage}/share/polkit-1/actions/org.crossmacro.policy";
environment.etc."polkit-1/actions/io.github.alper_han.crossmacro.policy".source =
"${cfg.daemonPackage}/share/polkit-1/actions/io.github.alper_han.crossmacro.policy";
environment.etc."polkit-1/rules.d/50-crossmacro.rules".source =
"${cfg.daemonPackage}/share/polkit-1/rules.d/50-crossmacro.rules";
@@ -87,7 +87,6 @@ in
ProtectKernelLogs = true; # Prevent access to kernel logs
ProtectClock = true; # Prevent setting the RTC
ProtectProc = "noaccess";
ProcSubset = "pid";
# Networking
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
@@ -140,6 +140,7 @@ in
wantedBy = [ "multi-user.target" ];
environment = {
HOME = cfg.dataDir;
PYTHONUNBUFFERED = "1"; # ensure stdout is logged to journal
};
serviceConfig = lib.mkMerge [
{
File diff suppressed because it is too large Load Diff
@@ -202,12 +202,12 @@
};
blade = buildGrammar {
language = "blade";
version = "0.0.0+rev=cc764da";
version = "0.0.0+rev=42b3c5a";
src = fetchFromGitHub {
owner = "EmranMR";
repo = "tree-sitter-blade";
rev = "cc764dadcbbceb3f259396fef66f970c72e94f96";
hash = "sha256-3/gY68F+xOF5Fv6rK9cEIJCVDzg/3ap1/gzkEacGuy4=";
rev = "42b3c5a06bc29fbd2c2cbd52b96113365fbed646";
hash = "sha256-zWAu5FZzfYYy4Zw8e1W5zujto/pDqGqGXKfWDYiH3NY=";
};
meta.homepage = "https://github.com/EmranMR/tree-sitter-blade";
};
@@ -268,12 +268,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "0.0.0+rev=f1bf9a9";
version = "0.0.0+rev=8836663";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "f1bf9a9b8410b1ebea900e2e5fc000007d5ef99d";
hash = "sha256-xvOjR6j64whwvFvop63jhDti2OrAIStvNy56OGUK6ZI=";
rev = "88366631d598ce6595ec655ce1591b315cffb14c";
hash = "sha256-x2JQKMCyvqJkVuQPfAmoihSaBxgWaTFadkmZOuc58Bc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@@ -411,12 +411,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=12bd6f7";
version = "0.0.0+rev=8b5b49e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "12bd6f7e96080d2e70ec51d4068f2f66120dde35";
hash = "sha256-vmXTv6Idf0Le5ZVa8Rc1DVefqzUxkGeLGsYcSDNBpQU=";
rev = "8b5b49eb196bec7040441bee33b2c9a4838d6967";
hash = "sha256-x3gDJ7/lukdOwfRFKrHZqV2zZ3Buqel5GcfbFnxStLU=";
};
passthru.requires = [
"c"
@@ -465,12 +465,12 @@
};
cue = buildGrammar {
language = "cue";
version = "0.0.0+rev=770737b";
version = "0.0.0+rev=be0f609";
src = fetchFromGitHub {
owner = "eonpatapon";
repo = "tree-sitter-cue";
rev = "770737bcff2c4aa3f624d439e32b07dbb07102d3";
hash = "sha256-ujSBOwOnjsKuFhHtt4zvj90VcQsak8mEcWYJ0e5/mKc=";
rev = "be0f609c73cc2929811a9bce0ed90ca71ea87604";
hash = "sha256-PDezYVX4JL2KUk9PsOPnJuVMhAJQ7ic7sJwziJB1NXo=";
};
meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue";
};
@@ -509,12 +509,12 @@
};
desktop = buildGrammar {
language = "desktop";
version = "0.0.0+rev=27c713c";
version = "0.0.0+rev=v1.1.1";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-desktop";
rev = "27c713cd097f85d3024569adf34e069cade84905";
hash = "sha256-PBzf6Bqe874zhp5KI9gjF35J7y11Me+Sgsrt6d+BAq8=";
tag = "v1.1.1";
hash = "sha256-ZxOpv7SPq04jEuduVc0NaVr+IgjJ9CdHp1lpLgYHQQg=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
};
@@ -643,12 +643,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=b58de0c";
version = "0.0.0+rev=v2.0.0";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "b58de0ce2c52990c8913e39a8c14ce4a40e29a39";
hash = "sha256-c1J9vFJ1c7aJqgJibCT4r8P6SlKtLAQTwDi67zToNxc=";
tag = "v2.0.0";
hash = "sha256-XoIUVzuXiGDADlAeMKCi0p8mJXrPIzuqi4LLm9wD5Ns=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -808,12 +808,12 @@
};
fish = buildGrammar {
language = "fish";
version = "0.0.0+rev=aa074a0";
version = "0.0.0+rev=fa2143f";
src = fetchFromGitHub {
owner = "ram02z";
repo = "tree-sitter-fish";
rev = "aa074a0bacde8b5823c592574d7138f156a95776";
hash = "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=";
rev = "fa2143f5d66a9eb6c007ba9173525ea7aaafe788";
hash = "sha256-n6eGMdbW1Rsn5XbszLSSSG3F8jh+loYnPEiabNY+jfk=";
};
meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
};
@@ -1181,12 +1181,12 @@
};
groovy = buildGrammar {
language = "groovy";
version = "0.0.0+rev=8691159";
version = "0.0.0+rev=a88865a";
src = fetchFromGitHub {
owner = "murtaza64";
repo = "tree-sitter-groovy";
rev = "86911590a8e46d71301c66468e5620d9faa5b6af";
hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0=";
rev = "a88865a3301a538e2060af5b401f4f431f71406e";
hash = "sha256-v2z9BNIKIsJKf1JSmh6EQ+HxotI5wqTpVUIai+mLybc=";
};
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
};
@@ -1592,12 +1592,12 @@
};
julia = buildGrammar {
language = "julia";
version = "0.0.0+rev=dd7f707";
version = "0.0.0+rev=8454f26";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-julia";
rev = "dd7f707577585ade7a488d32dbfb366246ea3837";
hash = "sha256-GFR48voa5DDMq5QKKjhYepipao2lTu5VIUze20pW+FM=";
rev = "8454f266717232525ed03c7b09164b0404a03150";
hash = "sha256-o4yep2RJU53lWajxfPgAk/m+DpMIeYCHYAHsR3FZMT8=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-julia";
};
@@ -1647,12 +1647,12 @@
};
kitty = buildGrammar {
language = "kitty";
version = "0.0.0+rev=f821c16";
version = "0.0.0+rev=fa6ab3f";
src = fetchFromGitHub {
owner = "OXY2DEV";
repo = "tree-sitter-kitty";
rev = "f821c16397ffab5b776d8781245215811438a624";
hash = "sha256-vjfKJng2AkVfnpQsJM86XrbVT3s0JXkwWEqEQS57n0M=";
rev = "fa6ab3fd32d890a0217495c96b35761e6d2dcb5b";
hash = "sha256-hyzwZfnslyxqL+98BWejCyLwwJMcj6O8EGuBYrCKn4o=";
};
meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
};
@@ -1669,12 +1669,12 @@
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=48c964a";
version = "0.0.0+rev=cbed96a";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "48c964a9ddfe4387968d1b6412d7b39106fb7f39";
hash = "sha256-m8oAv6W06MzFgJ7coaaypuElsrIVLFuIxBtSi08LuKI=";
rev = "cbed96ab13dbc082eeeb2e8333c342a62829c29d";
hash = "sha256-BEjXsVUfEJJVTaW9ZpTAuAUOtWxRfToywfDH4TssaeM=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
@@ -1758,23 +1758,23 @@
};
liquid = buildGrammar {
language = "liquid";
version = "0.0.0+rev=d6ebde3";
version = "0.0.0+rev=fa11c7b";
src = fetchFromGitHub {
owner = "hankthetank27";
repo = "tree-sitter-liquid";
rev = "d6ebde3974742cd1b61b55d1d94aab1dacb41056";
hash = "sha256-rcRbo6iyO2uC2OS0dR20xJlDlBdCoyIUc9nEv0KPWxI=";
rev = "fa11c7ba45038b61e03a8a00ad667fb5f3d72088";
hash = "sha256-zDBaW8Tb5MgdLJTIJmZzkR0KqAqmEortAI6jbEspgqE=";
};
meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
};
liquidsoap = buildGrammar {
language = "liquidsoap";
version = "0.0.0+rev=d092c65";
version = "0.0.0+rev=abd0ecc";
src = fetchFromGitHub {
owner = "savonet";
repo = "tree-sitter-liquidsoap";
rev = "d092c65598e940564e12214ff7c2097528cfa159";
hash = "sha256-u36QnHiZtFldMmWuwlsahXh+PW8WEEmWnMS4ZATFej8=";
rev = "abd0eccddd680102064e0eca82ef954bd8d1a301";
hash = "sha256-1PSVm2FD17TxWwZwS2m0TK6ACS6NzVQUQChu8bg01Lc=";
};
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
};
@@ -1791,12 +1791,12 @@
};
lua = buildGrammar {
language = "lua";
version = "0.0.0+rev=e40f5b6";
version = "0.0.0+rev=10fe005";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-lua";
rev = "e40f5b6e6df9c2d1d6d664ff5d346a75d71ee6b2";
hash = "sha256-tBD2Z+t0YafUeeV7xsFS9Cwe6dR9WewYh2yL/GcIfFw=";
rev = "10fe0054734eec83049514ea2e718b2a56acd0c9";
hash = "sha256-VzaaN5pj7jMAb/u1fyyH6XmLI+yJpsTlkwpLReTlFNY=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-lua";
};
@@ -1849,23 +1849,23 @@
};
make = buildGrammar {
language = "make";
version = "0.0.0+rev=5e9e8f8";
version = "0.0.0+rev=70613f3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-make";
rev = "5e9e8f8ff3387b0edcaa90f46ddf3629f4cfeb1d";
hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0=";
rev = "70613f3d812cbabbd7f38d104d60a409c4008b43";
hash = "sha256-gyshhqVYiL0qSsMp38BM20FYc4uPgr2de5/DWsAJZGc=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-make";
};
markdown = buildGrammar {
language = "markdown";
version = "0.0.0+rev=cee71b8";
version = "0.0.0+rev=f969cd3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-markdown";
rev = "cee71b8288f2ec09c29415219ac15a654bd571b9";
hash = "sha256-8ZNPVaJoiTh1RSVwMsH8d6zG/asbNvDA2DOqHhKd3k0=";
rev = "f969cd3ae3f9fbd4e43205431d0ae286014c05b5";
hash = "sha256-WUVN7+lzDI+VC5PuJjhHiS4JpVr1x0Ic30i2tVrI6W8=";
};
location = "tree-sitter-markdown";
passthru.requires = [
@@ -1875,12 +1875,12 @@
};
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "0.0.0+rev=cee71b8";
version = "0.0.0+rev=f969cd3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-markdown";
rev = "cee71b8288f2ec09c29415219ac15a654bd571b9";
hash = "sha256-8ZNPVaJoiTh1RSVwMsH8d6zG/asbNvDA2DOqHhKd3k0=";
rev = "f969cd3ae3f9fbd4e43205431d0ae286014c05b5";
hash = "sha256-WUVN7+lzDI+VC5PuJjhHiS4JpVr1x0Ic30i2tVrI6W8=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
@@ -1931,12 +1931,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=e4d1566";
version = "0.0.0+rev=1cff1bf";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "e4d15660e9984f742aa4bde95012d7e809ddb4d4";
hash = "sha256-/X443+X6X4NXd8qhLMDm+19HFHGKiIAqVQtCwWzWJR0=";
rev = "1cff1bf79135f8effef87d7cee9d3b26d1970ee9";
hash = "sha256-wjlVfSbsnJklPCdQPMYfImHVT0OeJSKjuzA1iebWNjc=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2224,12 +2224,12 @@
};
pkl = buildGrammar {
language = "pkl";
version = "0.0.0+rev=0be2b56";
version = "0.0.0+rev=a02fc36";
src = fetchFromGitHub {
owner = "apple";
repo = "tree-sitter-pkl";
rev = "0be2b56dec91cf03d6b653dcbb24188dd5c44dd6";
hash = "sha256-KFXJR346h4ZR53EzhQRkThL7eFn0kb0z622jDHuHkEw=";
rev = "a02fc36f6001a22e7fdf35eaabbadb7b39c74ba5";
hash = "sha256-t+N4oxqZpzm3qHkbjUVyGzeVS56u1oFVx0MtgTBe0bk=";
};
meta.homepage = "https://github.com/apple/tree-sitter-pkl";
};
@@ -2279,12 +2279,12 @@
};
powershell = buildGrammar {
language = "powershell";
version = "0.0.0+rev=7212f47";
version = "0.0.0+rev=da65ba3";
src = fetchFromGitHub {
owner = "airbus-cert";
repo = "tree-sitter-powershell";
rev = "7212f47716ced384ac012b2cc428fd9f52f7c5d4";
hash = "sha256-xzDM1CdBY95XgLsEjqKWrwuIf/s6/2Q0XbxJRvOuL2o=";
rev = "da65ba3acc93777255781b447f5e7448245df4bf";
hash = "sha256-ETuZcVSvHF5ILN6+xjWlQM5IiT/+dtxdSckrHJSJSWk=";
};
meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
};
@@ -2361,12 +2361,12 @@
};
proto = buildGrammar {
language = "proto";
version = "0.0.0+rev=0e122d8";
version = "0.0.0+rev=f0e7676";
src = fetchFromGitHub {
owner = "coder3101";
repo = "tree-sitter-proto";
rev = "0e122d8444fd67cd8fb72fc927323b36807e7ace";
hash = "sha256-fSloTD0QrV36YaB6e5zn/NkQVoZEWKTiK0PN+3DznuY=";
rev = "f0e767689c6e9efe7ff2e4b8680db71411915588";
hash = "sha256-JE8SRs39GWjEH9dnIbugv7UJXDh/aI+dwLfSqJiwbD8=";
};
meta.homepage = "https://github.com/coder3101/tree-sitter-proto";
};
@@ -2486,12 +2486,12 @@
};
query = buildGrammar {
language = "query";
version = "0.0.0+rev=6350ad7";
version = "0.0.0+rev=fc5409c";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-query";
rev = "6350ad724e7b17a7eea712d4860b4d2ae892e0b6";
hash = "sha256-/nibZKIEeZFL0k5NkSnYVP0Eujojge5Hsw2jSoI6ncw=";
rev = "fc5409c6820dd5e02b0b0a309d3da2bfcde2db17";
hash = "sha256-51dMHH50zVP/N0ljZs7J2wh0EiNtsr2+UvM/S3LkP10=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query";
};
@@ -2618,12 +2618,12 @@
};
rescript = buildGrammar {
language = "rescript";
version = "0.0.0+rev=3159c94";
version = "0.0.0+rev=43c2f1f";
src = fetchFromGitHub {
owner = "rescript-lang";
repo = "tree-sitter-rescript";
rev = "3159c949c15096b02b470bd4025754806fc7a17d";
hash = "sha256-A1u3CCJw6Rqsr6SLqVjYIr6spd7prLF4AMmA79N+8tQ=";
rev = "43c2f1f35024918d415dc933d4cc534d6419fedf";
hash = "sha256-QG4LvF/ix7wKHrZ1pUNXzG6ibbITUYAZYb4a39qJF/o=";
};
meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
};
@@ -2651,12 +2651,12 @@
};
robot = buildGrammar {
language = "robot";
version = "0.0.0+rev=e34def7";
version = "0.0.0+rev=v1.2.0";
src = fetchFromGitHub {
owner = "Hubro";
repo = "tree-sitter-robot";
rev = "e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a";
hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0=";
tag = "v1.2.0";
hash = "sha256-YvhRF2G8qNCkCp/XMuwV8qDGBYq+3d/XF0nCJdEGoXM=";
};
meta.homepage = "https://github.com/Hubro/tree-sitter-robot";
};
@@ -2820,12 +2820,12 @@
};
slint = buildGrammar {
language = "slint";
version = "0.0.0+rev=a6e4e1c";
version = "0.0.0+rev=4d7ad06";
src = fetchFromGitHub {
owner = "slint-ui";
repo = "tree-sitter-slint";
rev = "a6e4e1c656429e5df52dcfcd92da87b642f6678b";
hash = "sha256-A4m3jG7VjGws7pVzd7ulbhINe783shv4pc3tH8EDji0=";
rev = "4d7ad0617c30f865f051bbac04a9826bea29f987";
hash = "sha256-u/nVbZEJPMbBzYCgXpE8L1KJyWJmB27uofSkeOMSOnI=";
};
meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
};
@@ -2943,12 +2943,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=c686d57";
version = "0.0.0+rev=851e9cb";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "c686d575d6ee585c404c30dd1cf2a0f42d687460";
hash = "sha256-fI4Le/4OIxDJrQ0uzJaKMejhDkPY7Ew6DuhJFya8t4k=";
rev = "851e9cb257ba7c66cc8c14214a31c44d2f1e954e";
hash = "sha256-VP9W8X+S51oEAc2MMl5ALf7aglYZ2Ai38MGSo/FOL98=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@@ -3065,12 +3065,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=12bacf3";
version = "0.0.0+rev=30e18c7";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "12bacf3ee30f6c39e7cfa6ca6625cac012589236";
hash = "sha256-2rhH2sbl2CQv3meOC+s3NNsJIfV2KKqzybH4p596gXU=";
rev = "30e18c7b0210b33ffd6e8a7028e170a9dc90825b";
hash = "sha256-223uxZ8mqY3m5774voRThth2bEa3sM5GHkKLo6ewd7k=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -3099,12 +3099,12 @@
};
systemverilog = buildGrammar {
language = "systemverilog";
version = "0.0.0+rev=7c4b01b";
version = "0.0.0+rev=2939285";
src = fetchFromGitHub {
owner = "gmlarumbe";
repo = "tree-sitter-systemverilog";
rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2";
hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc=";
rev = "293928578cb27fbd0005fcc5f09c09a1e8628c89";
hash = "sha256-bvnJlEiaHtcmvNw3yyiysKMvdz919Fvr+/fyH8GcEYs=";
};
meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
};
@@ -3396,12 +3396,12 @@
};
unison = buildGrammar {
language = "unison";
version = "0.0.0+rev=16650de";
version = "0.0.0+rev=10365cc";
src = fetchFromGitHub {
owner = "kylegoetz";
repo = "tree-sitter-unison";
rev = "16650de9f519e41f8e88b22b4c401d50fa0ac8ca";
hash = "sha256-gdTjLC7J+x99EjWYdwOSzPGnnAMri1Q7luwvRE4AzQ0=";
rev = "10365cc70ab2b2de85ea7ab35cf6b7636c36ce8b";
hash = "sha256-l6X2x5lGlUhyf6Pr6lWd4aWacz7vmvtHVyM4qqPO8zg=";
};
generate = true;
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
@@ -3464,12 +3464,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=674ed9f";
version = "0.0.0+rev=7e0d014";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "674ed9fe6c13c79c0e7407daaf4518d053e6f0f4";
hash = "sha256-7j5eU9nIRTMs1U7mbXgtUqag9UV0JLUsTxHbW/hhn74=";
rev = "7e0d014691c1b8c25e8fe8f30cc3ac4649df3f57";
hash = "sha256-r3fMnexbbIniZA75ZIJ+ay39/JCCb3b3J5F6bYMK4YY=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3486,12 +3486,12 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=1cd0a08";
version = "0.0.0+rev=3092fcd";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-vim";
rev = "1cd0a0892b389bd314a9bd09545160e5ee3c9137";
hash = "sha256-u//XZ9jTkbcABv4rJ+zii22/oaEQfKF0V7rCG+zdBFE=";
rev = "3092fcd99eb87bbd0fc434aa03650ba58bd5b43b";
hash = "sha256-MnLBFuJCJbetcS07fG5fkCwHtf/EcNP+Syf0Gn0K39c=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim";
};
@@ -3611,12 +3611,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=8ec70e2";
version = "0.0.0+rev=v1.0.0";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "8ec70e2171025d09146afd2cce9712affe9ff3dd";
hash = "sha256-ZK1R+8LrrHMsw5T9O3xHuLamFETsjwyCifwBPquMQew=";
tag = "v1.0.0";
hash = "sha256-Ov/EKPw4HW0QVQahYb17CM7cJjTya+B1x45ET4jUo1E=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -3701,12 +3701,12 @@
};
zsh = buildGrammar {
language = "zsh";
version = "0.0.0+rev=v0.53.0";
version = "0.0.0+rev=v0.56.0";
src = fetchFromGitHub {
owner = "georgeharker";
repo = "tree-sitter-zsh";
tag = "v0.53.0";
hash = "sha256-xDivWiJYwuydadkyin6jsc9FFwhgHQ+EBa/YQRiAM/s=";
tag = "v0.56.0";
hash = "sha256-fU2cU0fuIxlJpvep7y+aSIPSMJE5lEWi1M+bb9/fOfk=";
};
meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh";
};
@@ -4,10 +4,14 @@
makeWrapper,
rustPlatform,
stdenv,
codelldb-launch,
pname,
src,
version,
cargoHash,
standalone ? false,
}:
let
# debugservers on macOS require the 'com.apple.security.cs.debugger'
@@ -24,17 +28,19 @@ rustPlatform.buildRustPackage {
pname = "${pname}-adapter";
inherit version src;
cargoHash = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8=";
inherit cargoHash;
# Environment variables, based on <https://github.com/vadimcn/codelldb/blob/master/cargo_config.unix.toml>
# The LLDB_* variables are used in adapter/lldb/build.rs.
"CC_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/cc";
"CXX_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/c++";
LLDB_DYLIB = "${lib.getLib lldb}/lib/liblldb${stdenv.hostPlatform.extensions.sharedLibrary}";
LLDB_INCLUDE = "${lib.getDev lldb}/include";
LLDB_LINK_LIB = "lldb";
LLDB_LINK_SEARCH = "${lib.getLib lldb}/lib";
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
]
++ lib.optional standalone codelldb-launch;
buildAndTestSubdir = "adapter";
@@ -54,6 +60,10 @@ rustPlatform.buildRustPackage {
ln -s ${lib.getLib lldb} $out/share/lldb
makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \
--set-default LLDB_DEBUGSERVER_PATH "${lldbServer}"
${lib.optionalString standalone ''
cp ${codelldb-launch}/bin/codelldb-launch $out/share/adapter/codelldb-launch
''}
'';
# Tests fail to build (as of version 1.11.4).
@@ -0,0 +1,22 @@
{
makeBinaryWrapper,
rustPlatform,
pname,
src,
version,
cargoHash,
}:
rustPlatform.buildRustPackage {
pname = "${pname}-codelldb-launch";
inherit version src cargoHash;
nativeBuildInputs = [ makeBinaryWrapper ];
cargoBuildFlags = [
"--package=codelldb-launch"
];
# Tests fail to build (as of version 1.12.0).
doCheck = false;
}
@@ -0,0 +1,22 @@
{
makeWrapper,
rustPlatform,
pname,
src,
version,
cargoHash,
}:
rustPlatform.buildRustPackage {
pname = "${pname}-codelldb-types";
inherit version src cargoHash;
nativeBuildInputs = [ makeWrapper ];
cargoBuildFlags = [
"--package=codelldb-types"
];
# Tests fail to build (as of version 1.12.0).
doCheck = false;
}
@@ -10,14 +10,13 @@
nodejs,
python3,
rustc,
stdenv,
unzip,
}:
assert lib.versionAtLeast python3.version "3.5";
let
publisher = "vadimcn";
pname = "vscode-lldb";
version = "1.11.4";
version = "1.12.1";
vscodeExtUniqueId = "${publisher}.${pname}";
vscodeExtPublisher = publisher;
@@ -27,10 +26,13 @@ let
owner = "vadimcn";
repo = "codelldb";
rev = "v${version}";
hash = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI=";
hash = "sha256-B8iCy4NXG7IzJVncbYm5VoAMfhMfxGF+HW7M5sVn5b0=";
};
lldb = llvmPackages_19.lldb;
stdenv = llvmPackages_19.libcxxStdenv;
cargoHash = "sha256-fuUTLdavMiYfpyxctXes2GJCsNZd5g1d4B/v+W/Rnu8=";
adapter = (
callPackage ./adapter.nix {
@@ -38,15 +40,16 @@ let
# based on the provided CMake toolchain files.
# <https://github.com/vadimcn/codelldb/tree/master/cmake>
rustPlatform = makeRustPlatform {
stdenv = llvmPackages_19.libcxxStdenv;
inherit cargo rustc;
inherit stdenv cargo rustc;
};
stdenv = llvmPackages_19.libcxxStdenv;
inherit
pname
src
version
stdenv
cargoHash
codelldb-launch
;
}
);
@@ -61,6 +64,36 @@ let
}
);
codelldb-types = (
callPackage ./codelldb-types.nix {
rustPlatform = makeRustPlatform {
inherit stdenv cargo rustc;
};
inherit
pname
src
version
cargoHash
;
}
);
codelldb-launch = (
callPackage ./codelldb-launch.nix {
rustPlatform = makeRustPlatform {
inherit stdenv cargo rustc;
};
inherit
pname
src
version
cargoHash
;
}
);
in
stdenv.mkDerivation {
pname = "vscode-extension-${publisher}-${pname}";
@@ -79,6 +112,8 @@ stdenv.mkDerivation {
makeWrapper
nodejs
unzip
codelldb-types
codelldb-launch
];
patches = [ ./patches/cmake-build-extension-only.patch ];
@@ -118,6 +153,11 @@ stdenv.mkDerivation {
wrapProgram $ext/adapter/codelldb \
--prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \
--set-default LLDB_DEBUGSERVER_PATH "${adapter.lldbServer}"
# Used by VSCode
mkdir -p $ext/bin
cp ${codelldb-launch}/bin/codelldb-launch $ext/bin/codelldb-launch
# Mark that all components are installed.
touch $ext/platform.ok
@@ -132,7 +172,8 @@ stdenv.mkDerivation {
'';
passthru = {
inherit lldb adapter;
inherit lldb;
adapter = adapter.override { standalone = true; };
updateScript = ./update.sh;
};
@@ -16,7 +16,7 @@ buildNpmPackage {
pname = "${pname}-node-deps";
inherit version src;
npmDepsHash = "sha256-Efeun7AFMAnoNXLbTGH7OWHaBHT2tO9CodfjKrIYw40=";
npmDepsHash = "sha256-TCeIBrlsNuphW2gVsX97+Wu1lOG5gDwS7559YA1d10M=";
nativeBuildInputs = [
python3
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cab8b1..0b500d5 100644
index 3e4f955..2ca59d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,13 +16,6 @@ endif()
@@ -13,27 +13,32 @@ index 5cab8b1..0b500d5 100644
- message(FATAL_ERROR "LLDB_PACKAGE not set." )
-endif()
-
if (CMAKE_SYSROOT)
set(CMAKE_C_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_CXX_FLAGS}")
@@ -116,16 +109,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_CTEST_ARGUMENTS "--output-on-failure" CACHE INTERNAL "CTest arguments")
set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]")
@@ -120,12 +113,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
# We still need to resolve codelldb schema $ref's in it, but we'll do this during the build.
file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.pre.json)
file(COPY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json)
-# Install node_modules
-execute_process(
- COMMAND ${NPM} --loglevel verbose ci # like install, but actually respects package-lock file.
- COMMAND ${NPM} install
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- RESULT_VARIABLE Result
- COMMAND_ERROR_IS_FATAL ANY
-)
-if (NOT ${Result} EQUAL 0)
- message(FATAL_ERROR "npm install failed: ${Result}")
-endif()
-
# Resolve $refs
execute_process(
COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json
@@ -183,6 +166,7 @@ add_custom_target(adapter_tests
# So we can commit any changes
file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json)
@@ -133,7 +120,7 @@ file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOU
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/package.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
DEPENDS ${CMAKE_SOURCE_DIR}/package.json ${CMAKE_SOURCE_DIR}/src/codelldb-types/src/lib.rs
- COMMAND cargo run --package codelldb-types -- ${CMAKE_BINARY_DIR}/codelldb.schema.json
+ COMMAND codelldb-types ${CMAKE_BINARY_DIR}/codelldb.schema.json
COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js
${CMAKE_CURRENT_BINARY_DIR}/package.pre.json ${CMAKE_CURRENT_BINARY_DIR}/package.json
COMMAND ${NPM} run json2ts -- ${CMAKE_BINARY_DIR}/codelldb.schema.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
@@ -158,6 +145,7 @@ add_custom_target(update_lockfiles
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_BINARY_DIR}/README.md)
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md ${CMAKE_CURRENT_BINARY_DIR}/CHANGELOG.md)
@@ -41,7 +46,7 @@ index 5cab8b1..0b500d5 100644
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/lldb.png ${CMAKE_CURRENT_BINARY_DIR}/images/lldb.png)
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/user.svg ${CMAKE_CURRENT_BINARY_DIR}/images/user.svg)
add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/users.svg ${CMAKE_CURRENT_BINARY_DIR}/images/users.svg)
@@ -199,6 +183,7 @@ add_custom_target(dev_debugging
@@ -174,6 +162,7 @@ add_custom_target(dev_debugging
set(PackagedFilesBootstrap
README.md
CHANGELOG.md
@@ -36,13 +36,13 @@
"vendorHash": "sha256-c4eCY/iQ8v/gBX55j22TRxWIeoevi5EJs4TtN9xXfKA="
},
"akamai_akamai": {
"hash": "sha256-WXIx2/1EiamjolyPy+d3Gwp4hOguJrmxKwgLZqzQqDg=",
"hash": "sha256-vC7hVV/p28y7cv9PONEfRVj5uKgumtbq4HpbOYq9vBQ=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v9.3.0",
"rev": "v10.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-6sVapd0vqL4xGLqTQS4zQIlnMA8HRmjufDi1lOgldlU="
"vendorHash": "sha256-btxzZZtvgeih+OUhc5QnF8ac22TxpGibffGNkljjq6c="
},
"aliyun_alicloud": {
"hash": "sha256-XSXK7PH5MezbtQfrDh+z7nRUFsgiXwCtNbI4clbtozU=",
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
url = "http://www.6809.org.uk/evilwm/";
free = true;
}; # like BSD/MIT, but Share-Alike'y; See README.
maintainers = with lib.maintainers; [ amiloradovsky ];
maintainers = [ ];
platforms = lib.platforms.all;
mainProgram = "evilwm";
};
@@ -44,6 +44,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
homepage = "https://ansible.readthedocs.io/projects/navigator/";
changelog = "https://github.com/ansible/ansible-navigator/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ melkor333 ];
maintainers = with lib.maintainers; [
melkor333
ilkecan
];
};
})
+2 -2
View File
@@ -35,7 +35,7 @@
clangStdenv.mkDerivation (finalAttrs: {
pname = "aseprite";
version = "1.3.16.1";
version = "1.3.17";
srcs = [
(fetchFromGitHub {
@@ -44,7 +44,7 @@ clangStdenv.mkDerivation (finalAttrs: {
repo = "aseprite";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-s2lWg5udg/8pXjOcj2nXDS2uE3urkg1iC0Div7wkxUY=";
hash = "sha256-mBFwcf+Q/h1t7HDuiX6NTAiq0BCZZk6MUid1MuA67LY=";
})
# Translation strings
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "automatic-timezoned";
version = "2.0.118";
version = "2.0.120";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = "automatic-timezoned";
rev = "v${finalAttrs.version}";
sha256 = "sha256-gbXxzEp734lSiVJLBPZzL3H7gwwW/BNnKPJ4Hetcx8o=";
sha256 = "sha256-L3+tDhobD1j3X63181mLEVSwDUmcwkPDnW1vZ8W6vTU=";
};
cargoHash = "sha256-in4vQVIHfdWOX/wHunUdoUFZkK5Y19PCWe8UuvUs+/I=";
cargoHash = "sha256-vta5xn8x/TZopgVCvc/RzQhMzM9OnLd3HeTrRO8ePOI=";
nativeInstallCheckInputs = [ versionCheckHook ];
+5 -5
View File
@@ -39,7 +39,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "beekeeper-studio";
version = "5.5.5";
version = "5.5.7";
src =
let
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
fetchurl {
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";
hash = selectSystem {
x86_64-linux = "sha256-XV7PXoXA99BwPolg20vUVAAWhs3eBTmgLOEWZrq6Mq4=";
aarch64-linux = "sha256-lfW7gjes/Kn8zCKh2LNItu4kwSr9dxYGviUjgXFiHzU=";
x86_64-darwin = "sha256-EGsfHUYAxjgMBye+D8XzPdUqtXIG7X+DpJoViVcYGHU=";
aarch64-darwin = "sha256-JfxhOS74xQP8MK2nBz3V0VPxHbXF5m9OtRI2m4ZWjk0=";
x86_64-linux = "sha256-YKGMDX6rMNS6sYTsV/9sLpLvVkFcjEFdxO9hhb7SprU=";
aarch64-linux = "sha256-PFVUaXt0spYX4F1WElNmNY6ltzTCDJO2WA9LfB0MNiQ=";
x86_64-darwin = "sha256-btcEFZPz//qZ+3msrzjIt1wGYtjSDz2rKSQK5rTp4B8=";
aarch64-darwin = "sha256-JTgGXrWADaiqvRbqruOpEHtTVS8pYQpsXYKAblHGlIk=";
};
};
+5 -5
View File
@@ -17,7 +17,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
version = "1.3.9";
version = "1.3.10";
pname = "bun";
src =
@@ -81,19 +81,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-aarch64.zip";
hash = "sha256-zeak7fGc9kkJFY+lpGShICb9fw15pKlQwQzwrwQmbYU=";
hash = "sha256-ggNOh8nZtDmOphmu4u7V0qaMgVfppq4tEFLYTVM8zY0=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip";
hash = "sha256-osKGK8wf0cCzqNzcjH77XirNhx6yDtLxdheITt6ByEQ=";
hash = "sha256-+l7LJcr6jo9ch6D4M3GdRt0K8KhseDfYBlMSEtVWNtM=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip";
hash = "sha256-puFYIapgeV9UHOGPzha8qfKpThkwaLd/bzMzD00KOtU=";
hash = "sha256-+WhsTk52DbTN53oPH60F5VJki5ycv6T3/Jp+wmufMmc=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip";
hash = "sha256-RoDoDkTjKqcYVgzq6F0i7Pvy77jzZBeC415Lfv1loao=";
hash = "sha256-9XvAGH45Yj3nFro6OJ/aVIay175xMamAulTce3M9Lgg=";
};
};
updateScript = writeShellScript "update-bun" ''
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "cameradar";
version = "6.0.2";
version = "6.1.0";
src = fetchFromGitHub {
owner = "Ullaakut";
repo = "cameradar";
tag = "v${finalAttrs.version}";
hash = "sha256-XmCpd7ptPU26EMn+WDH2Y9hKRsYV0GdbU4T26TUsp6U=";
hash = "sha256-C1GScKbOgHAU57B3q7A8Rv37Ny+7p+/L3ZwyiDN0kA0=";
};
vendorHash = "sha256-A8SJRky4dQHJoYpOaUBae89kHXwbdA+gnF/p7oRxcYo=";
vendorHash = "sha256-jIOQwVnlXbvzqGLPv/zTuSg5GaEWpmTyXEZO73jFGxM=";
nativeBuildInputs = [ pkg-config ];
+9 -4
View File
@@ -1,4 +1,9 @@
[
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.3",
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
},
{
"pname": "Serilog",
"version": "4.0.0",
@@ -16,8 +21,8 @@
},
{
"pname": "Serilog",
"version": "4.3.0",
"hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
"version": "4.3.1",
"hash": "sha256-TY+GaQYnyDfOGl0gi67xDyUMOuV/mjz8BU66/UsmStI="
},
{
"pname": "Serilog.Sinks.Async",
@@ -36,7 +41,7 @@
},
{
"pname": "Tmds.DBus",
"version": "0.23.0",
"hash": "sha256-BwWQSqOOMS+Cf2fM8MIuiHey8QnGH4WvYjOn9haq5e0="
"version": "0.90.3",
"hash": "sha256-/yBQpjsIqbY4JFBxxVKXPR2S/N1TMLG5QPXvScSCdEk="
}
]
@@ -20,7 +20,7 @@ buildDotnetModule rec {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-qVKlch9GxEfB9thqXdiwWgF25ljX+b5on+bZmcAjAzw=";
hash = "sha256-CRP3u3ChP587yHgoi49yPiozcPB6juVNZLVVknkqvKo=";
};
projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj";
@@ -47,8 +47,8 @@ buildDotnetModule rec {
dotnetFlags = [ "-p:Version=${version}" ];
postInstall = ''
install -Dm644 scripts/assets/org.crossmacro.policy \
$out/share/polkit-1/actions/org.crossmacro.policy
install -Dm644 scripts/assets/io.github.alper_han.crossmacro.policy \
$out/share/polkit-1/actions/io.github.alper_han.crossmacro.policy
install -Dm644 scripts/assets/50-crossmacro.rules \
$out/share/polkit-1/rules.d/50-crossmacro.rules
+28 -53
View File
@@ -1,13 +1,8 @@
[
{
"pname": "Avalonia",
"version": "11.3.11",
"hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
"version": "2.1.25547.20250602",
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
"version": "11.3.12",
"hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
},
{
"pname": "Avalonia.BuildServices",
@@ -16,63 +11,48 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.3.11",
"hash": "sha256-Ki6O9HYbseQPV3DsvwmJ+ERimi/WmvzelNJDKP6loo0="
},
{
"pname": "Avalonia.Desktop",
"version": "11.3.11",
"hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
"version": "11.3.12",
"hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.3.11",
"hash": "sha256-p38+O0VDqZ8u5VOzImP21/U5wyP1BUp2UrLLc9HSfwE="
"version": "11.3.12",
"hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "11.3.11",
"hash": "sha256-S0DWwcZHulVUIckiv2HM1Vbqno64c/Xt+mPhZp1tfsA="
"version": "11.3.12",
"hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.11",
"hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
},
{
"pname": "Avalonia.Native",
"version": "11.3.11",
"hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
"version": "11.3.12",
"hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.11",
"hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
"version": "11.3.12",
"hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.11",
"hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
"version": "11.3.12",
"hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.11",
"hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
"version": "11.3.12",
"hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.3.11",
"hash": "sha256-AJS5Ls0tJ6PCr2mnr1PpxGWX4sII8mpe2R+VCFYRg44="
},
{
"pname": "Avalonia.Win32",
"version": "11.3.11",
"hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
"version": "11.3.12",
"hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
},
{
"pname": "Avalonia.X11",
"version": "11.3.11",
"hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
"version": "11.3.12",
"hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
},
{
"pname": "CommunityToolkit.Mvvm",
@@ -111,13 +91,13 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "10.0.2",
"hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ="
"version": "10.0.3",
"hash": "sha256-h/wiSaVtRCIGdkv6/soA41Dhdlmu2I9hjv/swP8OjDk="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.2",
"hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
"version": "10.0.3",
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
},
{
"pname": "Serilog",
@@ -136,8 +116,8 @@
},
{
"pname": "Serilog",
"version": "4.3.0",
"hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
"version": "4.3.1",
"hash": "sha256-TY+GaQYnyDfOGl0gi67xDyUMOuV/mjz8BU66/UsmStI="
},
{
"pname": "Serilog.Sinks.Async",
@@ -164,11 +144,6 @@
"version": "2.88.9",
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
},
{
"pname": "SkiaSharp.NativeAssets.Linux.NoDependencies",
"version": "2.88.9",
"hash": "sha256-WjpcM78Q6kaW0eU5iqDR5+fGcF+06/tawWHsJRK57Es="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.9",
@@ -186,8 +161,8 @@
},
{
"pname": "Tmds.DBus",
"version": "0.23.0",
"hash": "sha256-BwWQSqOOMS+Cf2fM8MIuiHey8QnGH4WvYjOn9haq5e0="
"version": "0.90.3",
"hash": "sha256-/yBQpjsIqbY4JFBxxVKXPR2S/N1TMLG5QPXvScSCdEk="
},
{
"pname": "Tmds.DBus.Protocol",
+2 -2
View File
@@ -35,10 +35,10 @@ buildDotnetModule rec {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-qVKlch9GxEfB9thqXdiwWgF25ljX+b5on+bZmcAjAzw=";
hash = "sha256-CRP3u3ChP587yHgoi49yPiozcPB6juVNZLVVknkqvKo=";
};
projectFile = "src/CrossMacro.UI/CrossMacro.UI.csproj";
projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
+7 -7
View File
@@ -19,23 +19,23 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "25.3.4";
version = "25.3.5";
src =
let
inherit (stdenvNoCC.hostPlatform) system;
selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}");
suffix = selectSystem {
x86_64-linux = "linux.gtk.x86_64.tar.gz";
aarch64-linux = "linux.gtk.aarch64.tar.gz";
x86_64-linux = "linux-x86_64.tar.gz";
aarch64-linux = "linux-aarch64.tar.gz";
x86_64-darwin = "macos-x86_64.dmg";
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
x86_64-linux = "sha256-iqbpvXSn0jsHNdsn6/C1RV28Xc54o2XnvtG8WujpJFE=";
aarch64-linux = "sha256-fku9iDSyM5COrCAy9sIBZUCo7E8/2nIQmlhKAtBbmcw=";
x86_64-darwin = "sha256-DJpME9xxFSlRIgJuLtemIdnaskim7S1wPWLlrF0doxo=";
aarch64-darwin = "sha256-q/IZHXSAV7TR3EjKoxoB06zLnhEvb6A5TywgEK9uL8o=";
x86_64-linux = "sha256-pUjLM2tPIVuGiYpv0UgfUnINPRxzdbBvAPfeX4Vsrn8=";
aarch64-linux = "sha256-26RZrqpciHOgn6CGJhrxvyghxaIDojv1GkC7Df9KwyA=";
x86_64-darwin = "sha256-GWro2heKUny7psNym2bA8m8Hvk96GiDVhYDG9wgoJig=";
aarch64-darwin = "sha256-K2gjVHKYSLwAl0JuaZy5ZDLEXpsmHHLPfZUkuuTUoo4=";
};
in
fetchurl {
+2 -2
View File
@@ -16,8 +16,8 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
fi
for i in \
"x86_64-linux linux.gtk.x86_64.tar.gz" \
"aarch64-linux linux.gtk.aarch64.tar.gz" \
"x86_64-linux linux-x86_64.tar.gz" \
"aarch64-linux linux-aarch64.tar.gz" \
"x86_64-darwin macos-x86_64.dmg" \
"aarch64-darwin macos-aarch64.dmg"
do
+37
View File
@@ -0,0 +1,37 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
boost,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dealii";
version = "9.7.1";
src = fetchFromGitHub {
owner = "dealii";
repo = "dealii";
tag = "v${finalAttrs.version}";
hash = "sha256-hy7Z9DUcSv/k5UU5TOfYzCIEiKXBZZEUrRnJ7jN1gus=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
meta = {
homepage = "https://dealii.org/";
description = "C++ software library supporting the creation of finite element codes";
longDescription = ''
deal.II is a C++ program library targeted at the computational solution of
partial differential equations using adaptive finite elements.
It uses state-of-the-art programming techniques to offer you a modern interface
to the complex data structures and algorithms required.
'';
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ neural-blade ];
platforms = lib.platforms.unix;
};
})
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "dnsproxy";
version = "0.78.2";
version = "0.79.0";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
tag = "v${finalAttrs.version}";
hash = "sha256-BZ9yiw5EoSLTZux/MC8MJLV9eifQYnz+ZBzAPZaxOPI=";
hash = "sha256-R/TBsge+Jd11EvDEx3B9FD/bHdi2BQZTpXLNlvEyERk=";
};
vendorHash = "sha256-NS7MsK7QXg8tcAytYd9FGvaYZcReYkO5ESPpLbzL0IQ=";
+2 -2
View File
@@ -6,12 +6,12 @@
buildDotnetGlobalTool {
pname = "docfx";
version = "2.78.4";
version = "2.78.5";
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
nugetHash = "sha256-VvrKQjOnQ7RGp1hP+Bldi7CaM6qpfp4InB5rESISqEg=";
nugetHash = "sha256-kkoQQHXkv36ulSAUfsEKgJ6CqEOOwzAQRYHSGUNZaMU=";
meta = {
description = "Build your technical documentation site with docfx, with landing pages, markdown, API reference docs for .NET, REST API and more";
+3 -3
View File
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
stdenvNoCC.mkDerivation
{
inherit pname;
version = "0-unstable-2026-02-15";
version = "0-unstable-2026-02-26";
src = fetchFromGitLab {
owner = "aiyahm";
repo = "FairyWren-Icons";
rev = "2bfc2dc20a6bf4d763cdd6633b6dcfa826903756";
hash = "sha256-9e7BNDcr4/lW0zwhkz1aUZbI3lzaVs5elF6WGXSDO4g=";
rev = "fcffa4ea729bd046836d7b5430d112663eee36f5";
hash = "sha256-3hAd0Z4f9Gbo+dFv3Ci3j3RRAwVdNobFlD0WtD+Z8gw=";
};
propagatedBuildInputs = [
+69
View File
@@ -0,0 +1,69 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
makeWrapper,
perl,
perlPackages,
flac,
lame,
}:
let
runtimeDeps = [
flac
lame
];
in
stdenv.mkDerivation (finalAttrs: {
pname = "flac2mp3";
version = "1.0.1";
src = fetchFromGitHub {
owner = "robinbowes";
repo = "flac2mp3";
tag = finalAttrs.version;
hash = "sha256-mzZAlCMQYcKEkeJ0464zE1+F5KwA9IjvAbx6aZVCaxI=";
};
patches = [
(fetchpatch {
url = "https://github.com/sktt/flac2mp3/commit/c81cb6f300445f2383562991b35d8622197635d7.patch";
hash = "sha256-vLXo+PfRQ97cNQnMoBrxA7K35C1EdedXXSL8wmWpPOs=";
})
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl ];
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -r lib/* $out/lib/
install -Dm755 flac2mp3.pl $out/bin/flac2mp3
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/flac2mp3 \
--prefix PERL5LIB : "$out/lib" \
--prefix PATH : ${lib.makeBinPath finalAttrs.passthru.runtimeDeps}
'';
passthru = {
inherit runtimeDeps;
};
meta = {
mainProgram = "flac2mp3";
description = "Tool to convert audio files from flac to mp3 format including the copying of tags";
homepage = "https://github.com/robinbowes/flac2mp3";
changelog = "https://github.com/robinbowes/flac2mp3/releases/tag/${finalAttrs.version}";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ lilahummel ];
};
})
+32
View File
@@ -0,0 +1,32 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "gh-token";
version = "2.0.7";
src = fetchFromGitHub {
owner = "Link-";
repo = "gh-token";
rev = "v${version}";
hash = "sha256-ufpQQgXaL28lPPLotZZneJPWWAy80Jd6hNeKX81aa98=";
};
vendorHash = "sha256-gUPNHSeI8B5hwnIo7gwGo5aP4j7rzgveZIksyNe65jM=";
ldflags = [
"-s"
"-w"
];
meta = {
description = "Manage installation access tokens for GitHub apps from your terminal";
homepage = "https://github.com/Link-/gh-token";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ norbertwnuk ];
mainProgram = "gh-token";
};
}
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "grafana-image-renderer";
version = "5.5.1";
version = "5.6.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-image-renderer";
tag = "v${finalAttrs.version}";
hash = "sha256-1SntOvAoHf0GwWG3wS2OLY9eiBXhS1mA0OEtKSFOApU=";
hash = "sha256-54ZW81QSsun7t0HhLTub2QVz7jA7PsueoAUeXuQXOqM=";
};
vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs=";
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "haven";
version = "1.2.0";
version = "1.2.2";
src = fetchFromGitHub {
owner = "bitvora";
repo = "haven";
tag = "v${finalAttrs.version}";
hash = "sha256-1rGOZVzlzijyxqjAnp2uvxy9KPr3uuRD8+48x38lQwg=";
hash = "sha256-gpfTgaO3VK65GBy/W/rR8181yHlvgTx9UyWReo7s2gQ=";
};
vendorHash = "sha256-VXx6uoOUKk/BkjDS3Ykf/0Xc2mUPm8dgyRArIb2I8X4=";
+3 -3
View File
@@ -4,7 +4,7 @@
lib,
}:
let
version = "0.17.7";
version = "0.17.9";
in
buildGoModule {
pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
owner = "dadrus";
repo = "heimdall";
tag = "v${version}";
hash = "sha256-LpBnWzEQK+hr0XTB03rUAQ4YJ1r51nS+lK3/PL7jvNw=";
hash = "sha256-x1Whe2EPGFwsiLxrkKalNUWXwgXHKDBJyzbjtWMx/PY=";
};
vendorHash = "sha256-GUk+nCmrk0vSFf8nt0evWKVRuwWcWmwVcLKCgVHt9GA=";
vendorHash = "sha256-Gu+fBeo6uUYBSWYXsrWD5yI1eGR8QVpAW7jkCod4IpY=";
tags = [ "sqlite" ];
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hydra-check";
version = "2.0.5";
version = "2.1.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "hydra-check";
tag = "v${finalAttrs.version}";
hash = "sha256-rOqLAI0r11Tfi6crKAxnj/HHBgUKcCGb4MCdxqLv4uE=";
hash = "sha256-5nZnY/EA5SF3KNZbsvNGn77cOgEZsBpxBJwiREyF/fE=";
};
cargoHash = "sha256-B5shiONb9XTbi6/T9pDHmx6Bvz6kkj/VhaJvupuHNEQ=";
cargoHash = "sha256-DN2LSYCR9QL1090C6dt21EOq9aUtZkAvxh4B6KYXPAU=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -9,13 +9,13 @@
}:
buildGoModule (finalAttrs: {
pname = "ipp-usb";
version = "0.9.30";
version = "0.9.31";
src = fetchFromGitHub {
owner = "openprinting";
repo = "ipp-usb";
rev = finalAttrs.version;
sha256 = "sha256-LcThjiN/MRk4ISWWRT4g/eLvuhzM8pIDAcSlM5us3nQ=";
sha256 = "sha256-WoJa00dSTXknoEjRO/L1yZc6pA0SfAhKsG6QqS6aDSc=";
};
postPatch = ''
+2 -2
View File
@@ -23,11 +23,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "kreya";
version = "1.18.0";
version = "1.19.0";
src = fetchurl {
url = "https://stable-downloads.kreya.app/${finalAttrs.version}/Kreya-linux-x64.tar.gz";
hash = "sha256-oXDR1vwU0ikDq4eHFOXTlDgpODH6kVQu/2Ghed9c508=";
hash = "sha256-JyUdTLW6dYwYTVlyhCph7LDuCF4mdrQTnhcv/qmeuIc=";
};
nativeBuildInputs = [
+10
View File
@@ -3,7 +3,9 @@
buildGoModule,
fetchurl,
nixosTests,
stdenv,
callPackage,
installShellFiles,
}:
buildGoModule rec {
@@ -44,6 +46,8 @@ buildGoModule rec {
"systemd_unit_hardened"
];
nativeBuildInputs = [ installShellFiles ];
postPatch = ''
substituteInPlace 'misc/systemd/ipfs.service' \
--replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs"
@@ -59,6 +63,12 @@ buildGoModule rec {
install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket"
install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket"
install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service"
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd ipfs \
--bash <($out/bin/ipfs commands completion bash) \
--fish <($out/bin/ipfs commands completion fish) \
--zsh <($out/bin/ipfs commands completion zsh)
'';
meta = {
+2 -2
View File
@@ -20,11 +20,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lunacy";
version = "11.6";
version = "12.3";
src = fetchurl {
url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb";
hash = "sha256-VDd2qBNjCyfOy3vZFaVc3BI8zhQmzEIxYDNws7DIYCc=";
hash = "sha256-Sa6LnB+YGkHpNpETjGHYUChCFu6Ginz+VQO8dPKVRBE=";
};
buildInputs = [
+2 -2
View File
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microcode-intel";
version = "20260210";
version = "20260227";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
tag = "microcode-${finalAttrs.version}";
hash = "sha256-c5DAcaXO8FuZtbzrNwjS5E8JEKHb4rFo0CVm1xfDtcY=";
hash = "sha256-xTCSFxhOqHo64GrtZPlUVOd83SwiUUSZQ6JMziTgWcU=";
};
nativeBuildInputs = [ libarchive ];
+1 -1
View File
@@ -241,7 +241,7 @@ stdenvUsed.mkDerivation (finalAttrs: {
homepage = "http://nethack.org/";
license = lib.licenses.ngpl;
platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix;
maintainers = [ ];
maintainers = with lib.maintainers; [ olduser101 ];
mainProgram = "nethack";
broken = if qtMode then stdenv.hostPlatform.isDarwin else false;
};
@@ -1,4 +1,5 @@
{
stdenv,
lib,
fetchFromGitHub,
rustPlatform,
@@ -31,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeBuildInputs = [ pkg-config ];
doCheck = stdenv.hostPlatform.isLinux;
nativeCheckInputs = [
bubblewrap
elfutils
@@ -48,8 +50,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed";
homepage = "https://github.com/symphorien/nixseparatedebuginfod2";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.symphorien ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
symphorien
feyorsh
];
platforms = lib.platforms.unix;
mainProgram = "nixseparatedebuginfod2";
};
})
+7 -7
View File
@@ -10,20 +10,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oo7";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "bilelmoussaoui";
owner = "linux-credentials";
repo = "oo7";
rev = finalAttrs.version;
hash = "sha256-FIHXjbxAqEH3ekTNL0/TBFZoeDYZ84W2+UeJDxcauk8=";
tag = finalAttrs.version;
hash = "sha256-FPt37KEap7z1ant+6VHqqFBRwwE4YV3yQrc0V/kd+Mo=";
};
# TODO: this won't cover tests from the client crate
# Additionally cargo-credential will also not be built here
buildAndTestSubdir = "cli";
cargoHash = "sha256-4ibhHCRBsEcwG5+6Gf/uuswA/k9zJLj+RcMdmBcmvD4=";
cargoHash = "sha256-79bSlSbDaOtAXsJe1suMhvhsC/LoSDMZ+G/dhTTQ4EA=";
nativeBuildInputs = [ pkg-config ];
@@ -35,8 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "James Bond went on a new mission as a Secret Service provider";
homepage = "https://github.com/bilelmoussaoui/oo7";
changelog = "https://github.com/bilelmoussaoui/oo7/releases/tag/${finalAttrs.src.rev}";
homepage = "https://github.com/linux-credentials/oo7";
changelog = "https://github.com/linux-credentials/oo7/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
getchoo
+3 -3
View File
@@ -14,13 +14,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "openasar";
version = "0-unstable-2025-11-21";
version = "0-unstable-2026-02-23";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "5b259e4efaf9eee69aeca7b2ef153e5bfedc35d0";
hash = "sha256-HNdZK7r0nC3r1SLojmZXQFVI/1/wLnAhrkQZMJJChH8=";
rev = "31dfb7bcc0dfecc9e4ef62b65fbc5dcbc34d04fc";
hash = "sha256-/Uc5u7YT2LxRkUtPyZ9Y9MQvKDmwQUSmexQFby9MWzI=";
};
postPatch = ''
+1 -1
View File
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.lgpl21; # essentially...
# The special exception defined in the file OCCT_LGPL_EXCEPTION.txt
# are basically about making the license a little less share-alike.
maintainers = with lib.maintainers; [ amiloradovsky ];
maintainers = [ ];
platforms = lib.platforms.all;
};
})
@@ -0,0 +1,58 @@
{
lib,
stdenv,
fetchurl,
mpi,
}:
let
mpiDev = lib.getDev mpi;
in
stdenv.mkDerivation (finalAttrs: {
pname = "osu-micro-benchmarks";
version = "7.5.2";
src = fetchurl {
url = "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-${finalAttrs.version}.tar.gz";
hash = "sha256-YY3j0LESL3OpIpF30toeXNYuQxGQWAy5FfJgWEnLu9w=";
};
nativeBuildInputs = [ mpi ];
buildInputs = [ mpi ];
configureFlags = [
"CC=${mpiDev}/bin/mpicc"
"CXX=${mpiDev}/bin/mpicxx"
];
enableParallelBuilding = true;
postInstall = ''
mkdir -p $out/bin
find $out/libexec -name 'osu_*' -type f -executable | while read -r f; do
ln -s "$f" "$out/bin/"
done
'';
meta = {
description = "OSU Micro-Benchmarks for MPI";
longDescription = ''
The OSU microbenchmark suite is a collection of independent message passing interface (MPI) performance
benchmarks. It includes performance measures such as latency, bandwidth, and host overhead.
Common benchmarks:
- osu_latency: Point-to-point latency
- osu_bw: Point-to-point bandwidth
- osu_bibw: Bidirectional bandwidth
- osu_allreduce: Collective allreduce
- osu_alltoall: Collective all-to-all
'';
homepage = "https://mvapich.cse.ohio-state.edu/benchmarks/";
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ spaghetti-stack ];
mainProgram = "osu_latency";
};
})
+25 -19
View File
@@ -32,6 +32,7 @@
gsettings-desktop-schemas,
gtk3,
libdbusmenu-gtk2,
libgbm,
libxdamage,
nss,
udev,
@@ -39,25 +40,24 @@
let
pname = "pcloud";
version = "1.14.18";
code = "XZ2gJM5Z8pdJVlCT0s5FI1aTKxxgt48aEr8k";
version = "2.0.3";
code = "XZ8opl5ZaaYsnBeCX3fLU3v8ngqAv8VMqq7k";
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
hash = "sha256-YDXmna1SZaDLK1EEdHvWm9+PgYKjYUsa2lvdzFGmyIU=";
};
appimageContents = appimageTools.extractType2 {
inherit pname version;
src = "${src}/pcloud";
hash = "sha256-Few8BsMUwL5qfdtFyezoWifZcZufAhUthxQXEQwm52w=";
};
in
stdenv.mkDerivation {
inherit pname version;
src = appimageContents;
src = appimageTools.extractType2 {
inherit pname version;
src = "${src}/pCloud.AppImage";
};
dontConfigure = true;
dontBuild = true;
@@ -73,6 +73,7 @@ stdenv.mkDerivation {
fuse
gtk3
libdbusmenu-gtk2
libgbm
libxdamage
nss
udev
@@ -83,12 +84,17 @@ stdenv.mkDerivation {
cp -ar . "$out/app"
cd "$out"
# Remove the AppImage runner, since users are not supposed to use it; the
# actual entry point is the `pcloud` binary
# Remove AppImage runner, users are not supposed to use it - `pcloud` binary
# itself is the correct entrypoint
rm app/AppRun
# Adjust directory structure, so that the `.desktop` etc. files are
# properly detected
# Remove random stuff that causes patchelf to complain about missing deps
# that are not, in fact, missing deps, because those files don't get
# executed in the first place
rm app/resources/app.asar.unpacked/node_modules/koffi/build/koffi/musl_x64/koffi.node
rm app/resources/app.asar.unpacked/node_modules/koffi/build/koffi/openbsd_x64/koffi.node
# Adjust the directory structure, so that `.desktop` etc. files are detected
mkdir bin
mv app/usr/share .
mv app/usr/lib .
@@ -99,23 +105,23 @@ stdenv.mkDerivation {
substitute \
app/pcloud.desktop \
share/applications/pcloud.desktop \
--replace 'Name=pcloud' 'Name=pCloud' \
--replace 'Exec=AppRun' 'Exec=${pname}'
# Build the main executable
# Adjust the icons
ln -snf $out/share/icons/hicolor/512x512/apps/pcloud.png app/.DirIcon
ln -snf $out/share/icons/hicolor/512x512/apps/pcloud.png app/pcloud.png
# Build the entrypoint
cat > bin/pcloud <<EOF
#! $SHELL -e
# This is required for the file picker dialog - otherwise pcloud just
# crashes
# Required for the file picker dialog - otherwise pcloud crashes
export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud"
EOF
chmod +x bin/pcloud
ln -snf $out/share/icons/hicolor/512x512/apps/pcloud.png $out/app/pcloud.png
'';
meta = {
+29
View File
@@ -0,0 +1,29 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule (finalAttrs: {
pname = "picoleaf";
version = "1.4.0";
src = fetchFromGitHub {
owner = "tessro";
repo = "picoleaf";
tag = "v${finalAttrs.version}";
hash = "sha256-o1REM8Gfv+hJGVlo+c4gYr9U2MiTDwHLAx5SaBAN39s=";
};
vendorHash = "sha256-6/4xKZ/G8kTmQwdYmUOlZNQMJ/I8yThfLYjOPzyhlyQ=";
meta = {
description = "A tiny CLI tool for controlling Nanoleaf";
mainProgram = "picoleaf";
homepage = "https://github.com/tessro/picoleaf";
changelog = "https://github.com/tessro/picoleaf/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sfrijters ];
};
})
+1 -1
View File
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "planner";
homepage = "https://gitlab.gnome.org/World/planner";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ amiloradovsky ];
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
+6 -10
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pokefinder";
version = "4.2.1";
version = "4.3.1";
src = fetchFromGitHub {
owner = "Admiral-Fish";
repo = "PokeFinder";
rev = "v${finalAttrs.version}";
sha256 = "wjHqox0Vxc73/UTcE7LSo/cG9o4eOqkcjTIW99BxsAc=";
hash = "sha256-tItPvA0f2HnY7SUSnb7A5jGwbRs7eQoS4vibBomZ9pw=";
fetchSubmodules = true;
};
@@ -27,20 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
./set-desktop-file-name.patch
];
postPatch = ''
patchShebangs Source/Core/Resources/
'';
installPhase = ''
runHook preInstall
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin) ''
mkdir -p $out/Applications
cp -R Source/PokeFinder.app $out/Applications
cp -R PokeFinder.app $out/Applications
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
install -D Source/PokeFinder $out/bin/PokeFinder
icoFileToHiColorTheme $src/Source/Form/Images/pokefinder.ico pokefinder $out
install -D PokeFinder $out/bin/PokeFinder
icoFileToHiColorTheme $src/Form/Images/pokefinder.ico pokefinder $out
''
+ ''
runHook postInstall
@@ -49,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
qt6.wrapQtAppsHook
python3
(python3.withPackages (ps: [ ps.zstandard ]))
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
copyDesktopItems
@@ -1,7 +1,7 @@
diff --git a/Source/main.cpp b/Source/main.cpp
diff --git a/main.cpp b/main.cpp
index 3e58a381..2e7e4a86 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
--- a/main.cpp
+++ b/main.cpp
@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+2 -2
View File
@@ -6,11 +6,11 @@
}:
let
pname = "proxyman";
version = "3.7.0";
version = "3.9.0";
src = fetchurl {
url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
hash = "sha256-ntOIFvt4XwcmE4QloGD1KfbTpehpO/3SjTciMSKoWIs=";
hash = "sha256-hv0TYlCHoiWrMRLcPrruI09SC24Pafo9B5kkUpFDyKI=";
};
appimageContents = appimageTools.extract {
+3 -2
View File
@@ -79,8 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm555 release/qcad-bin $out/bin/qcad
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad
mkdir -p $out/lib
mkdir -p $out/{Applications,bin,lib}
mv release/QCAD.app $out/Applications
ln -s $out/Applications/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad
''
+ ''
install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary}
+1 -1
View File
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
mv $out/bin/raze $out/share/raze
makeWrapper $out/share/raze/raze $out/bin/raze \
--set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]}
install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png
install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/icons/hicolor/256x256/apps/org.zdoom.Raze.png
install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop
install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2
'';
+1 -1
View File
@@ -20,7 +20,7 @@ appimageTools.wrapType2 {
install -Dm444 ${appimageContents}/remnote.desktop -t $out/share/applications
substituteInPlace $out/share/applications/remnote.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=remnote %u'
install -Dm444 ${appimageContents}/remnote.png -t $out/share/pixmaps
install -Dm444 ${appimageContents}/remnote.png -t $out/share/icons/hicolor/512x512/apps
'';
passthru.updateScript = writeScript "update.sh" ''
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "repomix";
version = "1.11.1";
version = "1.12.0";
src = fetchFromGitHub {
owner = "yamadashy";
repo = "repomix";
tag = "v${version}";
hash = "sha256-LmQtgVrWZQFGTxU6Sz6RjPQqVERDWc4A7r6PS0Y7xYc=";
hash = "sha256-ymceZ6HUtHfsJrUc1g2OprO5cNjCzL1QYn4QbZ2rFo4=";
};
npmDepsHash = "sha256-C/b/RFMuI5HeVHH24GFupJU1x7Kinoq6tocVHgsWw1w=";
npmDepsHash = "sha256-DJH7ogNZNqqnA1M9n0v6Oj5FcSHaOifAyCVjibN/2fU=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rt-tests";
version = "2.9";
version = "2.10";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-tests-${finalAttrs.version}.tar.gz";
sha256 = "sha256-Zmb0RqGvS4bHy+6Krs3of1WUWOqJMOH0FHAXIqlteys=";
sha256 = "sha256-LHlihC7otuP/yXXiZ0XdQ4gSpyGKX6qVvGoouWq7CyM=";
};
env.NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow";
+3 -3
View File
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sandhole";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "EpicEric";
repo = "sandhole";
tag = "v${finalAttrs.version}";
hash = "sha256-gIKBqHGwIvskxHCKG91HHO1/AwoRb3+NNpgFDNo0Yfc=";
hash = "sha256-HsTH3/j3S5pZ+StGElMjkBoqWKsixAP/TDWpPTO/h3M=";
};
cargoHash = "sha256-FNtJK3OlkL8dWSdIPd9EI7/RS2sG6BRlnPjDkpBApJM=";
cargoHash = "sha256-pGA1Q5gx1xNRpH3DGkJndLZkhm6ws52EBQKlIpWNOMo=";
# All integration tests require networking.
postPatch = ''
+4 -7
View File
@@ -7,25 +7,22 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "scdl";
version = "2.12.4";
version = "3.0.4";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-5+3ok7UcJEdUW45bdPGkkvk+k/NYIpEi0URNuQ6e0vk=";
hash = "sha256-r7cvsoKTWE0W/pbjmbaGqra9+qb1MDxf2B5C/rdrCdU=";
};
build-system = [ python3Packages.setuptools ];
dependencies = with python3Packages; [
curl-cffi
docopt-ng
mutagen
termcolor
requests
tqdm
pathvalidate
soundcloud-v2
filelock
yt-dlp
];
# Ensure ffmpeg is available in $PATH:
+3 -3
View File
@@ -69,13 +69,13 @@ in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "servo";
version = "0.0.4";
version = "0.0.5";
src = fetchFromGitHub {
owner = "servo";
repo = "servo";
tag = "v${finalAttrs.version}";
hash = "sha256-KKZDz0NTIEx1NpTjDtrZdZD2RLxtZYarwn54RbPPeCA=";
hash = "sha256-XBaILyWIM1BecnJrkoFy4Q/zf7+n65Mv/wOxT4OheiU=";
# Breaks reproducibility depending on whether the picked commit
# has other ref-names or not, which may change over time, i.e. with
# "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
};
cargoHash = "sha256-huQ3dq5tTLN53fOhj458aH00jFnt6CWZQhJ9MogktJM=";
cargoHash = "sha256-iGS56vh4tgpJDLoXp7ou0/4+9onb3W3MEBzjcEOXjsw=";
# set `HOME` to a temp dir for write access
# Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
+3 -3
View File
@@ -5,12 +5,12 @@
}:
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "seventeenlands";
version = "0.1.43";
version = "0.1.44";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-oTF4dtMKhx2YR80goKTcyq2P0mxAKLE2Ze5HbMNvyGg=";
hash = "sha256-yz+HGovKIuu3Ou1jo+aNJPiNiERVZvsTtiy9tVhySwI=";
};
# No tests
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pythonImportsCheck = [ "seventeenlands" ];
build-system = with python3.pkgs; [ setuptools ];
build-system = with python3.pkgs; [ hatchling ];
dependencies = with python3.pkgs; [
python-dateutil
+5 -5
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation {
inherit pname;
version = "1.2.78.418";
version = "1.2.84.476";
src =
# WARNING: This Wayback Machine URL redirects to the closest timestamp.
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
# https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg
if stdenv.hostPlatform.isAarch64 then
(fetchurl {
url = "https://web.archive.org/web/20251212105149/https://download.scdn.co/SpotifyARM64.dmg";
hash = "sha256-/rrThZOpjzaHPX1raDe5X8PqtJeTI4GDS5sXSfthXTQ=";
url = "https://web.archive.org/web/20260228212834/https://download.scdn.co/SpotifyARM64.dmg";
hash = "sha256-Zj5qATaW1QPTInC/Y/jZx2xq5eHG/OQixpj8DWUpEXY=";
})
else
(fetchurl {
url = "https://web.archive.org/web/20251212105140/https://download.scdn.co/Spotify.dmg";
hash = "sha256-N2tQTS9vHp93cRI0c5riVZ/8FSaq3ovDqh5K9aU6jV0=";
url = "https://web.archive.org/web/20260228213541/https://download.scdn.co/Spotify.dmg";
hash = "sha256-4Lm4g0gAQ3EA7Sj2wDTbjEXRxcNoGWHLvdEx/57nry4=";
});
nativeBuildInputs = [ undmg ];
+7 -3
View File
@@ -52,7 +52,9 @@
pname,
meta,
harfbuzz,
libayatana-indicator,
libayatana-appindicator,
ayatana-ido,
libdbusmenu,
libGL,
# High-DPI support: Spotify's --force-device-scale-factor argument
@@ -79,7 +81,9 @@ let
glib
gtk3
harfbuzz
libayatana-indicator
libayatana-appindicator
ayatana-ido
libdbusmenu
libdrm
libgcrypt
@@ -119,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
version = "1.2.74.477.g3be53afe";
version = "1.2.82.428.g0ac8be2b";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
@@ -127,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "89";
rev = "92";
# fetch from snapcraft instead of the debian repository most repos fetch from.
# That is a bit more cumbersome. But the debian repository only keeps the last
@@ -140,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
name = "spotify-${finalAttrs.version}-${finalAttrs.rev}.snap";
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${finalAttrs.rev}.snap";
hash = "sha512-mn1w/Ylt9weFgV67tB435CoF2/4V+F6gu1LUXY07J6m5nxi1PCewHNFm8/11qBRO/i7mpMwhcRXaiv0HkFAjYA==";
hash = "sha512-/9lB4gLotYvM2QkHt8cKS8P4IXrBVzgoXEk4bWR3GQum0OnJqK/qCC9evmCZ7PAqbbyh5/8vSblM+QXXXiQiMA==";
};
nativeBuildInputs = [
+49 -27
View File
@@ -55,8 +55,10 @@
udevCheckHook,
cudaSupport ? config.cudaSupport,
cudaPackages ? { },
apple-sdk_15,
}:
let
inherit (stdenv.hostPlatform) isDarwin isLinux;
stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
@@ -92,11 +94,10 @@ stdenv'.mkDerivation (finalAttrs: {
'';
};
postPatch = # remove upstream dependency on systemd and udev
postPatch = # don't look for npm since we build webui separately
''
substituteInPlace cmake/packaging/linux.cmake \
--replace-fail 'find_package(Systemd)' "" \
--replace-fail 'find_package(Udev)' ""
substituteInPlace cmake/targets/common.cmake \
--replace-fail 'find_program(NPM npm REQUIRED)' ""
''
# use system boost instead of FetchContent.
# FETCH_CONTENT_BOOST_USED prevents Simple-Web-Server from re-finding boost
@@ -105,10 +106,11 @@ stdenv'.mkDerivation (finalAttrs: {
--replace-fail 'set(BOOST_VERSION "1.87.0")' 'set(BOOST_VERSION "${boost.version}")'
echo 'set(FETCH_CONTENT_BOOST_USED TRUE)' >> cmake/dependencies/Boost_Sunshine.cmake
''
# don't look for npm since we build webui separately
+ ''
substituteInPlace cmake/targets/common.cmake \
--replace-fail 'find_program(NPM npm REQUIRED)' ""
# remove upstream dependency on systemd and udev
+ lib.optionalString isLinux ''
substituteInPlace cmake/packaging/linux.cmake \
--replace-fail 'find_package(Systemd)' "" \
--replace-fail 'find_package(Udev)' ""
substituteInPlace packaging/linux/dev.lizardbyte.app.Sunshine.desktop \
--subst-var-by PROJECT_NAME 'Sunshine' \
@@ -128,6 +130,8 @@ stdenv'.mkDerivation (finalAttrs: {
pkg-config
python3
makeWrapper
]
++ lib.optionals isLinux [
wayland-scanner
# Avoid fighting upstream's usage of vendored ffmpeg libraries
autoPatchelfHook
@@ -139,6 +143,14 @@ stdenv'.mkDerivation (finalAttrs: {
];
buildInputs = [
boost
curl
miniupnpc
nlohmann_json
openssl
libopus
]
++ lib.optionals isLinux [
avahi
libevdev
libpulseaudio
@@ -148,16 +160,12 @@ stdenv'.mkDerivation (finalAttrs: {
libxrandr
libxtst
libxi
openssl
libopus
boost
libdrm
wayland
libffi
libevdev
libcap
libdrm
curl
pcre
pcre2
libuuid
@@ -176,15 +184,16 @@ stdenv'.mkDerivation (finalAttrs: {
svt-av1
libappindicator
libnotify
miniupnpc
nlohmann_json
]
++ lib.optionals cudaSupport [
cudaPackages.cudatoolkit
cudaPackages.cuda_cudart
]
++ lib.optionals isDarwin [
apple-sdk_15
];
runtimeDependencies = [
runtimeDependencies = lib.optionals isLinux [
avahi
libgbm
libxrandr
@@ -194,20 +203,28 @@ stdenv'.mkDerivation (finalAttrs: {
cmakeFlags = [
"-Wno-dev"
# upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead
(lib.cmakeBool "UDEV_FOUND" true)
(lib.cmakeBool "SYSTEMD_FOUND" true)
(lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d")
(lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user")
(lib.cmakeFeature "SYSTEMD_MODULES_LOAD_DIR" "lib/modules-load.d")
(lib.cmakeBool "BOOST_USE_STATIC" false)
(lib.cmakeBool "BUILD_DOCS" false)
(lib.cmakeFeature "SUNSHINE_PUBLISHER_NAME" "nixpkgs")
(lib.cmakeFeature "SUNSHINE_PUBLISHER_WEBSITE" "https://nixos.org")
(lib.cmakeFeature "SUNSHINE_PUBLISHER_ISSUE_URL" "https://github.com/NixOS/nixpkgs/issues")
]
# upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead
++ lib.optionals isLinux [
(lib.cmakeBool "UDEV_FOUND" true)
(lib.cmakeBool "SYSTEMD_FOUND" true)
(lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d")
(lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user")
(lib.cmakeFeature "SYSTEMD_MODULES_LOAD_DIR" "lib/modules-load.d")
]
++ lib.optionals (!cudaSupport) [
(lib.cmakeBool "SUNSHINE_ENABLE_CUDA" false)
]
++ lib.optionals isDarwin [
(lib.cmakeFeature "CMAKE_CXX_STANDARD" "23")
(lib.cmakeFeature "OPENSSL_ROOT_DIR" "${openssl.dev}")
(lib.cmakeFeature "SUNSHINE_ASSETS_DIR" "sunshine/assets")
(lib.cmakeBool "SUNSHINE_BUILD_HOMEBREW" true)
];
env = {
@@ -235,7 +252,7 @@ stdenv'.mkDerivation (finalAttrs: {
runHook postInstall
'';
postInstall = ''
postInstall = lib.optionalString isLinux ''
install -Dm644 ../packaging/linux/dev.lizardbyte.app.Sunshine.desktop $out/share/applications/dev.lizardbyte.app.Sunshine.desktop
'';
@@ -245,12 +262,14 @@ stdenv'.mkDerivation (finalAttrs: {
--set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]}
'';
doInstallCheck = true;
doInstallCheck = isLinux;
nativeInstallCheckInputs = [ udevCheckHook ];
nativeInstallCheckInputs = lib.optionals isLinux [ udevCheckHook ];
passthru = {
tests.sunshine = nixosTests.sunshine;
tests = lib.optionalAttrs isLinux {
sunshine = nixosTests.sunshine;
};
updateScript = ./updater.sh;
};
@@ -259,7 +278,10 @@ stdenv'.mkDerivation (finalAttrs: {
homepage = "https://github.com/LizardByte/Sunshine";
license = lib.licenses.gpl3Only;
mainProgram = "sunshine";
maintainers = with lib.maintainers; [ devusb ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
devusb
anish
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
})
+1 -1
View File
@@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://systemc.org/";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ amiloradovsky ];
maintainers = [ ];
};
})
+3 -3
View File
@@ -16,16 +16,16 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "2.7.7";
version = "2.7.9";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
tag = "v${version}";
hash = "sha256-ID5TQ0eHfsfS2Zma++HtKe2BitxCW4bB69UMJVTbc2c=";
hash = "sha256-4RHmalNBwRskChwooJ7anD9X49443WNW46QGHkzAEFQ=";
};
npmDepsHash = "sha256-3oJVRbdQpOWv3LHcUY8gaXl4g13NTkcOfTg/MrEeHqQ=";
npmDepsHash = "sha256-zE57TD25sV5EGwYLBBuJe6z4VpVQEAEZ4G0C88nF8yI=";
nativeBuildInputs = [
makeWrapper
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "trivy";
version = "0.69.0";
version = "0.69.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
tag = "v${finalAttrs.version}";
hash = "sha256-auCbZmVr7LzYrw+IOpXBZPUs2YmcPAzr5fo12vSyHeM=";
hash = "sha256-0BzqkLT4puBfBweu+3WIEepkpzr0LyHXL7/DrhjyxNs=";
};
# Hash mismatch on across Linux and Darwin
+2 -2
View File
@@ -12,7 +12,7 @@
nix-update-script,
}:
let
version = "4.19.13";
version = "4.19.15";
desktopItem = makeDesktopItem {
name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-8Y7ob7uC1hXESD2QnhbAUZQMCXSyroB9a3xO2o5sogc=";
hash = "sha256-RlKoiSxW0MPPFTDq72k6CvYTHIEZ0hR8/PhW0j8ERs8=";
};
dontUnpack = true;
-1
View File
@@ -103,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
thoughtpolice
amiloradovsky
];
};
})
+2 -2
View File
@@ -9,13 +9,13 @@
}:
buildGoModule (finalAttrs: {
pname = "waybar-lyric";
version = "0.14.3";
version = "0.15.0";
src = fetchFromGitHub {
owner = "Nadim147c";
repo = "waybar-lyric";
tag = "v${finalAttrs.version}";
hash = "sha256-bpc0AF/PcdmkVr791uT2PxgV59wTAAtFMFtKHKwtkQI=";
hash = "sha256-2zK0dQtqjbZJYqTOnDtTxnoXeW+zOhWK7RcinhZ5ob4=";
};
vendorHash = "sha256-TeAZDSiww9/v3uQl8THJZdN/Ffp+FsZ3TsRStE3ndKA=";
+3 -3
View File
@@ -18,18 +18,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waytrogen";
version = "0.8.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "nikolaizombie1";
repo = "waytrogen";
tag = finalAttrs.version;
hash = "sha256-zFRSWAVyTWvH6nxiacQbrrLRlu0Xac53XFaA6FcSf6M=";
hash = "sha256-airVCuwwh+FujJqBHXnRcwooUJWO/mrANbmzX9HciIM=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-/QCDxno0xZ9hLq0U6FNAZX7x+Kx5xaMtT/mR/GrNavs=";
hash = "sha256-FHLyVgBrTWOWyfILm7Gv9B6/WudvrwCNKoRJybKJBTM=";
};
nativeBuildInputs = [
+43 -5
View File
@@ -3,30 +3,68 @@
stdenv,
rustPlatform,
fetchFromGitHub,
fetchNpmDeps,
testers,
installShellFiles,
pkg-config,
openssl,
nodejs,
npmHooks,
python3,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "weaver";
version = "0.20.0";
version = "0.21.2";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "weaver";
tag = "v${finalAttrs.version}";
hash = "sha256-cZWxXcU5yn1ShLWVMZznVNBmhx5npUGc3lJuuchb/FA=";
hash = "sha256-LMDJg3IKrKRPDkprwlWmBVeaZeI2dZht0eHv7eVGqjo=";
};
cargoHash = "sha256-4ezcHKXmEmnkRG6/Pt0ENUlkga7SesMfI52txEH9ph0=";
cargoHash = "sha256-EzY7OtgPDxT3g2ISV0VZTKa9kLqtKJZH4zT9v2xN/s8=";
postPatch = ''
# Remove build.rs to build UI separately.
rm build.rs
'';
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/ui";
hash = "sha256-VOL2BLTfJ1nM2L3IZpixOuAaBUHVJX032MGb3+eousY=";
};
npmRoot = "ui";
buildInputs = [ openssl ];
nativeBuildInputs = [
installShellFiles
pkg-config
nodejs
npmHooks.npmConfigHook
python3
];
env = {
CXXFLAGS = "-std=c++20";
OPENSSL_NO_VENDOR = true;
};
preBuild = ''
pushd ui
npm run build
popd
'';
checkFlags = [
# Skip tests requiring network
"--skip=test_cli_interface"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
--bash <($out/bin/${finalAttrs.meta.mainProgram} completion bash) \
+10 -3
View File
@@ -26,14 +26,20 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "linuxwacom";
repo = "xf86-input-wacom";
rev = "xf86-input-wacom-${finalAttrs.version}";
sha256 = "sha256-12m9PL28NnqIwNpGHOFqjJaNrzBaagdG3Sp/jSLpgkE=";
tag = "xf86-input-wacom-${finalAttrs.version}";
hash = "sha256-12m9PL28NnqIwNpGHOFqjJaNrzBaagdG3Sp/jSLpgkE=";
};
preConfigure = ''
# See VERFILE in git-version-gen
echo ${finalAttrs.version} > version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
udevCheckHook
util-macros
];
buildInputs = [
@@ -45,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
libxrender
ncurses
udev
util-macros
pixman
xorgproto
xorg-server
@@ -59,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
"--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
];
strictDeps = true;
meta = {
maintainers = with lib.maintainers; [ moni ];
description = "Wacom digitizer driver for X11";
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Tiny screen magnifier for X11";
homepage = "https://gitlab.com/amiloradovsky/magnify";
license = lib.licenses.mit; # or GPL2+, optionally
maintainers = with lib.maintainers; [ amiloradovsky ];
maintainers = [ ];
mainProgram = "magnify";
platforms = lib.platforms.all;
};
+6 -1
View File
@@ -1,5 +1,6 @@
{
lib,
stdenvNoCC,
python3Packages,
atomicparsley,
deno,
@@ -13,6 +14,7 @@
javascriptSupport ? true,
rtmpSupport ? true,
withAlias ? false, # Provides bin/youtube-dl for backcompat
withSecretStorage ? !stdenvNoCC.hostPlatform.isDarwin,
nix-update-script,
}:
@@ -51,7 +53,10 @@ python3Packages.buildPythonApplication rec {
];
# expose optional-dependencies, but provide all features
dependencies = lib.concatAttrValues optional-dependencies;
dependencies =
optional-dependencies.default
++ optional-dependencies.curl-cffi
++ lib.optionals withSecretStorage optional-dependencies.secretstorage;
optional-dependencies = {
default = with python3Packages; [
+3 -5
View File
@@ -14,17 +14,15 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zeal";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "v${finalAttrs.version}";
hash = "sha256-9tlo7+namWNWrWVQNqaOvtK4NQIdb0p8qvFrrbUamOo=";
tag = "v${finalAttrs.version}";
hash = "sha256-13BscKZU/wzjstEQ8ffTGFJaDXO+p8IxNqNsyoEjQUc=";
};
patches = [ ./qt6_10.patch ];
nativeBuildInputs = [
cmake
extra-cmake-modules
-34
View File
@@ -1,34 +0,0 @@
diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp
index 8c9fe63..5c73480 100644
--- a/src/libs/ui/docsetsdialog.cpp
+++ b/src/libs/ui/docsetsdialog.cpp
@@ -360,7 +360,7 @@ void DocsetsDialog::downloadCompleted()
QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
if (!tmpFile) {
tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
- tmpFile->open();
+ (void)tmpFile->open();
m_tmpFiles.insert(docsetName, tmpFile);
}
@@ -403,7 +403,7 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total)
QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
if (!tmpFile) {
tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
- tmpFile->open();
+ (void)tmpFile->open();
m_tmpFiles.insert(docsetName, tmpFile);
}
diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
index 476c2f5..f49da88 100644
--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
@@ -42,6 +42,7 @@ elseif(UNIX AND X11_FOUND)
find_package(Qt5 COMPONENTS X11Extras REQUIRED)
target_link_libraries(QxtGlobalShortcut Qt5::X11Extras)
else()
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate)
endif()
+2 -10
View File
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
fetchurl,
cmake,
makeWrapper,
@@ -84,24 +83,17 @@ let
in
stdenv.mkDerivation rec {
pname = "zoneminder";
version = "1.36.36";
version = "1.36.38";
src = fetchFromGitHub {
owner = "ZoneMinder";
repo = "zoneminder";
tag = version;
hash = "sha256-q+LpM8JSjcroGa04CqQ7PUU/WvZ9YCVhGOhwBAhOFY0=";
hash = "sha256-c/Q+h0ntJ4XUuvgrLSlWfue4GL4nGARgmXt0En334Y4=";
fetchSubmodules = true;
};
patches = [
# Fix building against FFmpeg 8.0
# https://github.com/ZoneMinder/zoneminder/pull/4466
(fetchpatch {
url = "https://github.com/peat-psuwit/zoneminder/commit/15241687e9ccd97d7866cc7245324472ff6c7f0e.patch";
hash = "sha256-DXeoYOMI3Hcpwshg6wiBxaoTPOswLVV3Weq3Mh5Vaw0=";
})
./default-to-http-1dot1.patch
./0001-Don-t-use-file-timestamp-in-cache-filename.patch
];
+5 -5
View File
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
perl,
jq,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -13,25 +13,25 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "liquidaty";
repo = "zsv";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-6Gc9RDrQmayTnCoFHYN8B3gdqR3CPyyLWtO31WpnJ3o=";
};
nativeBuildInputs = [ perl ];
buildInputs = [ jq ];
configureFlags = [
"--jq-prefix=${lib.getLib jq}"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "World's fastest (simd) CSV parser, with an extensible CLI";
mainProgram = "zsv";
homepage = "https://github.com/liquidaty/zsv";
changelog = "https://github.com/liquidaty/zsv/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = [ ];
maintainers = with lib.maintainers; [ chillcicada ];
platforms = lib.platforms.all;
};
})
@@ -247,9 +247,11 @@ dart-bin.overrideAttrs (oldAttrs: {
runHook postInstall
'';
passthru.updateScript = writeShellScript "update-dart" ''
${lib.getExe nix-update} --version=$(${lib.getExe curlMinimal} --fail --location --silent https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION | ${lib.getExe jq} --raw-output .version)
'';
passthru = oldAttrs.passthru // {
updateScript = writeShellScript "update-dart" ''
${lib.getExe nix-update} --version=$(${lib.getExe curlMinimal} --fail --location --silent https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION | ${lib.getExe jq} --raw-output .version)
'';
};
meta = oldAttrs.meta // {
platforms = [
@@ -814,15 +814,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.2484-1";
version = "0.0.2516-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.2484-1.rockspec";
sha256 = "04cqaymz0h7wkv3mb0wzxzzmv3px380431fjrcyaxs8ppy5kdqqz";
url = "mirror://luarocks/fzf-lua-0.0.2516-1.rockspec";
sha256 = "0w4f1srklkg3jarl6nyp0inp31sl3ha7vz46jfiw632kkxwsmbnl";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/b2c0603216adb92c6bba81053bc996d7ae95b77a.zip";
sha256 = "0qqh74dbr88y4m9hvmd5v743iapz4f7d6k0s0afcwpy7mjsfvkgd";
url = "https://github.com/ibhagwan/fzf-lua/archive/29ee11c06e1b8c354cc5a3212e6d24c9b8ed4f22.zip";
sha256 = "1fv0jwyw8lic4zbz0wmvlj9j5xs07f9pr18wr74h0zc1brr8y9c9";
};
disabled = luaOlder "5.1";
@@ -906,15 +906,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "grug-far.nvim";
version = "1.6.60-1";
version = "1.6.61-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/grug-far.nvim-1.6.60-1.rockspec";
sha256 = "1p58vc0kaacrxgpcfsb2xbqgj4ndh1k2fjiv2c79pxb7kmyajj9g";
url = "mirror://luarocks/grug-far.nvim-1.6.61-1.rockspec";
sha256 = "1ray8bpww38rnbmxhs6sd62j5gxhv3d6xjmh0fpgdw0cmbsvb3qz";
}).outPath;
src = fetchzip {
url = "https://github.com/MagicDuck/grug-far.nvim/archive/14babc9b4520184d9696ef282eb7ac20687d4373.zip";
sha256 = "0qki472ri9h9y2n4q62kr4f2bpjdbmh67ljyxvps95y2czy3a4my";
url = "https://github.com/MagicDuck/grug-far.nvim/archive/9370422e5cdd55321c0b8c4880082c5fd4e52e99.zip";
sha256 = "1isd7jgm8wsc05fqp2srgyk3ikqsdb271x17dv8yky9p1j20gq52";
};
disabled = luaOlder "5.1";
@@ -937,15 +937,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "haskell-tools.nvim";
version = "7.0.1-1";
version = "7.0.3-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/haskell-tools.nvim-7.0.1-1.rockspec";
sha256 = "0iy3c8zdj5m0mcj11vw91458dgh4g7y7yz3pc312gbbjq89pi07h";
url = "mirror://luarocks/haskell-tools.nvim-7.0.3-1.rockspec";
sha256 = "0zmarh3ypsfnh22zm3mqr4padjkzmlz622jnm2s5n5xkvfqjc4q8";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.1.zip";
sha256 = "0ibd2cdmfagmdi0v0m0l4yssnx9pfvw0cgs0gz0zlb403jsgm394";
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.3.zip";
sha256 = "0hdd2qnhy0vki0qcj7xzs29xla0a1ccwmym163py45lhwlgnjxvw";
};
disabled = luaOlder "5.1";
@@ -3333,15 +3333,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "luautf8";
version = "0.2.0-1";
version = "0.2.1-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/luautf8-0.2.0-1.rockspec";
sha256 = "13lm2d7nc0igy739f3b9jrn4i4m373dqwkw41x0zzp0cm0v1c09m";
url = "mirror://luarocks/luautf8-0.2.1-1.rockspec";
sha256 = "0g4xkcikxd2n9scrlbjbdk9a1bbli6s5yw9l4n4b0ss49wgnmc2y";
}).outPath;
src = fetchurl {
url = "https://github.com/starwing/luautf8/archive/refs/tags/0.2.0.tar.gz";
sha256 = "0cmj4cp3sp3h2084qrix60vhrcg2xp56scn5qvsn8s5qjkci377p";
url = "https://github.com/starwing/luautf8/archive/refs/tags/0.2.1.tar.gz";
sha256 = "15455lyvjh5f6fgx41458nk7gak6q76k3aqjfp1xibk0v5f0flpa";
};
disabled = luaOlder "5.1";
@@ -3846,8 +3846,8 @@ final: prev: {
src = fetchFromGitHub {
owner = "leafo";
repo = "moonscript";
rev = "74e1e55cef028f7a1ef5dc80c116cea4cec45545";
hash = "sha256-iUQO3u16eB8ZhnTKwFt4gi8Y/U36ApQHTu1gWCALIb0=";
rev = "7b7899741c6c1e971e436d36c9aabb56f51dc3d5";
hash = "sha256-iFPbO5h5EU4KDW0BN6JhRCT9vqEzv4ozsZETbbXaqUM=";
};
disabled = luaOlder "5.1";
@@ -4643,21 +4643,21 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "rustaceanvim";
version = "8.0.1-2";
version = "8.0.3-2";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/rustaceanvim-8.0.1-2.rockspec";
sha256 = "0z68k6amqdk5nrj8zrz5a0084nmrx9y4lhr85996ln07877ah2hc";
url = "mirror://luarocks/rustaceanvim-8.0.3-2.rockspec";
sha256 = "0a8w3j7wibrj94cb10x2nnvkcjs2cn8vag1mnrh32f2cr6cwjg0y";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.1.zip";
sha256 = "1sizi01bll3bqgaf6fva5grsp5nlvmp5mj57qkbsm75iyj2cz1dp";
url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.3.zip";
sha256 = "1gq26185qagx9p3al6zamsbpkvfy1kgg4yks7jxxnmhz4ydylbmg";
};
disabled = lua.luaversion != "5.1";
meta = {
homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.1.zip";
homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.3.zip";
description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "GPL-2.0-only";
@@ -5285,7 +5285,6 @@ final: prev: {
buildLuarocksPackage,
fetchFromGitHub,
fetchurl,
luaAtLeast,
luaOlder,
}:
buildLuarocksPackage {
@@ -5303,7 +5302,7 @@ final: prev: {
hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.5";
disabled = luaOlder "5.1";
meta = {
homepage = "http://manoelcampos.github.io/xml2lua/";
@@ -963,6 +963,7 @@ in
rest-nvim = prev.rest-nvim.overrideAttrs {
strictDeps = false;
meta.broken = luaAtLeast "5.5";
};
rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs {
@@ -1139,5 +1140,9 @@ in
'';
});
xml2lua = prev.xml2lua.overrideAttrs {
meta.broken = luaAtLeast "5.5";
};
# keep-sorted end
}
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "django-pydantic-field";
version = "0.5.2";
version = "0.5.4";
pyproject = true;
src = fetchFromGitHub {
owner = "surenkov";
repo = "django-pydantic-field";
tag = "v${version}";
hash = "sha256-BqQurRjtA9AxvagmMIt+QjKKVdyFo+LVgn/vYS6+Ayc=";
hash = "sha256-pnB6kYfN67102Z3R41BHIWnWoJQgd/ixyT+bbtY9PC8=";
};
postPatch = ''
@@ -23,6 +23,8 @@ buildPythonPackage rec {
hash = "sha256-EmetMnWJcfvPmRRCQXo5Nce8nlJVDnNiLg5WulXqHUA=";
};
pythonRelaxDeps = [ "docutils" ];
build-system = [
setuptools-scm
wheel
@@ -40,6 +42,10 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlags = [
"-Wignore::PendingDeprecationWarning"
];
pythonImportsCheck = [ "doc8" ];
meta = {
@@ -6,6 +6,7 @@
pytestCheckHook,
mako,
decorator,
stdenv,
stevedore,
typing-extensions,
}:
@@ -34,6 +35,19 @@ buildPythonPackage rec {
mako
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# AssertionError: <dogpile.cache.api.NoValue object> != 'some value 1'
"test_expire_override"
# flaky
"test_get_value_plus_created_long_create"
"test_get_value_plus_created_registry_safe_cache_quick"
"test_get_value_plus_created_registry_safe_cache_slow"
"test_get_value_plus_created_registry_unsafe_cache"
"test_quick"
"test_return_while_in_progress"
"test_slow"
];
meta = {
description = "Caching front-end based on the Dogpile lock";
homepage = "https://github.com/sqlalchemy/dogpile.cache";
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
six,
}:
buildPythonPackage (finalAttrs: {
pname = "fspath";
version = "20230629";
pyproject = true;
src = fetchFromGitHub {
owner = "return42";
repo = "fspath";
tag = finalAttrs.version;
hash = "sha256-OtJ6PODEYEiUnJriTAKTThSsEtiF7sjMFEu7wFqRR54=";
};
build-system = [
setuptools
];
dependencies = [
six
];
pythonImportsCheck = [ "fspath" ];
meta = {
description = "Handling path names and executables more comfortable";
homepage = "https://github.com/return42/fspath";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ skohtv ];
};
})
@@ -33,14 +33,14 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.62.0";
version = "3.58.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-spanner";
tag = "v${version}";
hash = "sha256-3WmfDwbdhYY1xaA5RnrAuD1+EDrJ3KMBsonQkuFkgcA=";
hash = "sha256-bIagQjQv+oatIo8mkA8t5wP9igMnorkiudgyWkVnJcg=";
};
build-system = [ setuptools ];
@@ -14,8 +14,27 @@
setuptools,
pytestCheckHook,
six,
writeText,
}:
let
opensslConf = writeText "openssl.conf" ''
openssl_conf = openssl_init
[openssl_init]
providers = provider_sect
[provider_sect]
default = default_sect
legacy = legacy_sect
[default_sect]
activate = 1
[legacy_sect]
activate = 1
'';
in
buildPythonPackage rec {
pname = "impacket";
version = "0.13.0";
@@ -46,7 +65,12 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "impacket" ];
makeWrapperArgs = [ "--set-default OPENSSL_CONF ${opensslConf}" ];
pythonImportsCheck = [
"impacket"
"impacket.msada_guids"
];
disabledTestPaths = [
# Skip all RPC related tests
@@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
fspath,
docutils,
sphinx,
}:
buildPythonPackage (finalAttrs: {
pname = "linuxdoc";
version = "20240924";
pyproject = true;
src = fetchFromGitHub {
owner = "return42";
repo = "linuxdoc";
tag = finalAttrs.version;
hash = "sha256-UOOIl+HWI7bK6iWrADTgrGvom++178yPYmyI+qTwVlg=";
};
build-system = [
setuptools
];
dependencies = [
fspath
docutils
sphinx
];
pythonImportsCheck = [ "linuxdoc" ];
meta = {
description = "Sphinx-doc extensions for sophisticated C developer";
homepage = "https://github.com/return42/linuxdoc";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ skohtv ];
};
})
@@ -5,16 +5,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "logboth";
version = "0.1.0";
version = "0.2.0";
pyproject = true;
src = fetchFromGitLab {
owner = "zehkira";
repo = "logboth";
tag = "v${version}";
hash = "sha256-z62atvFYrRqjcGQbTlWadoG1TPrNl8WwDBclzhqQtPA=";
tag = "v${finalAttrs.version}";
hash = "sha256-R4FrZK8yxCZ5BFBFp/Fj/WyWa6+rIM6GHl3HZGgp5TI=";
};
build-system = [ setuptools ];
@@ -35,4 +35,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd0;
maintainers = with lib.maintainers; [ aleksana ];
};
}
})
@@ -1,6 +1,6 @@
{
lib,
aioquic,
aioquic_1_2,
argon2-cffi,
asgiref,
bcrypt,
@@ -9,7 +9,6 @@
certifi,
cryptography,
fetchFromGitHub,
fetchPypi,
flask,
h11,
h2,
@@ -29,7 +28,6 @@
pytest-timeout,
pytest-xdist,
pytestCheckHook,
pythonRelaxDepsHook,
requests,
ruamel-yaml,
setuptools,
@@ -40,18 +38,6 @@
zstandard,
}:
let
# Workaround for https://github.com/mitmproxy/mitmproxy/pull/7953
# nixpkgs' aioquic was updated to 1.3.0, which contains breaking changes that are unpatched in mitmproxy as of right now
aioquic' = aioquic.overrideAttrs (old: rec {
version = "1.2.0";
src = fetchPypi {
pname = "aioquic";
inherit version;
hash = "sha256-+RJjuz9xlIxciRW01Q7jcABPIKQW9n+rPcyQVWx+cZk=";
};
});
in
buildPythonPackage rec {
pname = "mitmproxy";
version = "12.2.1";
@@ -81,7 +67,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [
aioquic'
aioquic_1_2
argon2-cffi
asgiref
brotli
@@ -66,7 +66,8 @@ buildPythonPackage (finalAttrs: {
pandas
pyarrow
];
pipelines = finalAttrs.optional-dependencies.connect ++ finalAttrs.optional-dependencies.sql;
pipelines =
finalAttrs.passthru.optional-dependencies.connect ++ finalAttrs.passthru.optional-dependencies.sql;
sql = [
pandas
pyarrow
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "python-barbicanclient";
version = "7.2.0";
version = "7.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "python-barbicanclient";
tag = version;
hash = "sha256-HhWWUM0lK0B0ySItrT6z5QCXzStuiJzDZFoEb+WRodA=";
hash = "sha256-SFAldyA/M0rkKb2o6ePp+9ITWrUszyTz5jvCnUadufo=";
};
env.PBR_VERSION = version;
@@ -9,8 +9,9 @@
keystoneauth1,
requests,
warlock,
oslo-utils,
openstacksdk,
oslo-i18n,
oslo-utils,
wrapt,
pyopenssl,
stestr,
@@ -21,7 +22,7 @@
}:
let
pname = "python-glanceclient";
version = "4.10.0";
version = "4.11.0";
disabledTests = [
# Skip tests which require networking.
@@ -51,7 +52,7 @@ buildPythonPackage {
src = fetchPypi {
pname = "python_glanceclient";
inherit version;
hash = "sha256-/2wtQqF2fFz6PNHSKjcy04qxE9RxrSLE7mShvTlBsQM=";
hash = "sha256-XOIRi/50YpNIBZFmF+U3vFsA/UyrP7e7iKT5JTlwVi0=";
};
postPatch = ''
@@ -74,10 +75,11 @@ buildPythonPackage {
];
nativeCheckInputs = [
ddt
openstacksdk
requests-mock
stestr
testscenarios
ddt
requests-mock
];
checkPhase = ''
@@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "python-magnumclient";
version = "4.9.0";
version = "4.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "python-magnumclient";
tag = version;
hash = "sha256-Ok211QgvsKqkotXrC4HwMyonLv7LzuCjs2hjruGDEvY=";
hash = "sha256-kOnx2Fsx6WK7Z3z7O6so1LOjjyPiEB0jDFzOl7WlMS0=";
};
env.PBR_VERSION = version;
@@ -1,34 +1,33 @@
{
lib,
buildPythonPackage,
callPackage,
debtcollector,
fetchPypi,
pbr,
keystoneauth1,
openstackdocstheme,
osc-lib,
oslo-config,
oslo-log,
oslo-serialization,
oslo-utils,
pbr,
prettytable,
requests,
setuptools,
sphinxHook,
sphinxcontrib-programoutput,
babel,
osc-lib,
python-keystoneclient,
debtcollector,
callPackage,
}:
buildPythonPackage rec {
pname = "python-manilaclient";
version = "5.7.1";
version = "6.0.0";
pyproject = true;
src = fetchPypi {
pname = "python_manilaclient";
inherit version;
hash = "sha256-BdFUVnvSX7yitHSlP/GzD2jzvF8vh9B4QVVQrqYwW9Q=";
hash = "sha256-EQwsbwZzFXE+KKDH2SxlC6G8oFvdXo2bK4bJKJZfrVw=";
};
build-system = [
@@ -41,17 +40,16 @@ buildPythonPackage rec {
sphinxBuilders = [ "man" ];
dependencies = [
pbr
debtcollector
keystoneauth1
osc-lib
oslo-config
oslo-log
oslo-serialization
oslo-utils
pbr
prettytable
requests
babel
osc-lib
python-keystoneclient
debtcollector
];
# Checks moved to 'passthru.tests' to workaround infinite recursion
@@ -1,11 +1,13 @@
{
buildPythonPackage,
python-manilaclient,
stestr,
ddt,
tempest,
mock,
fixtures,
python-manilaclient,
python-openstackclient,
requests-mock,
stestr,
tempest,
testtools,
}:
buildPythonPackage {
@@ -17,12 +19,14 @@ buildPythonPackage {
dontInstall = true;
nativeCheckInputs = [
python-manilaclient
stestr
ddt
tempest
mock
fixtures
python-manilaclient
python-openstackclient
requests-mock
stestr
tempest
testtools
];
checkPhase = ''
@@ -1,35 +1,56 @@
{
lib,
buildPythonPackage,
fetchPypi,
ddt,
iso8601,
fetchFromGitHub,
pbr,
setuptools,
# direct
keystoneauth1,
openssl,
openstackdocstheme,
iso8601,
oslo-i18n,
oslo-serialization,
pbr,
oslo-utils,
prettytable,
stevedore,
# tests
stestrCheckHook,
versionCheckHook,
coverage,
fixtures,
requests-mock,
setuptools,
sphinxcontrib-apidoc,
sphinxHook,
stestr,
openstacksdk,
osprofiler,
openssl,
testscenarios,
testtools,
tempest,
# docs
sphinxHook,
openstackdocstheme,
sphinxcontrib-apidoc,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "python-novaclient";
version = "18.11.0";
version = "18.12.0";
pyproject = true;
src = fetchPypi {
pname = "python_novaclient";
inherit version;
hash = "sha256-CjGuIHedTNFxuynB/k5rIrnH2Xx5Zw21FJu9+sA/V9w=";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-novaclient";
tag = finalAttrs.version;
hash = "sha256-ZVJXGGceY7tnD/rkMkZjn5zifATeLYRGEVI2iLKERJ8=";
};
patches = [
./fix-setup-cfg.patch
];
env.PBR_VERSION = finalAttrs.version;
nativeBuildInputs = [
openstackdocstheme
sphinxcontrib-apidoc
@@ -38,43 +59,57 @@ buildPythonPackage rec {
sphinxBuilders = [ "man" ];
build-system = [ setuptools ];
build-system = [
pbr
setuptools
];
dependencies = [
iso8601
keystoneauth1
iso8601
oslo-i18n
oslo-serialization
oslo-utils
pbr
prettytable
stevedore
];
nativeCheckInputs = [
ddt
openssl
stestrCheckHook
coverage
fixtures
requests-mock
stestr
openstacksdk
osprofiler
openssl
testscenarios
testtools
tempest
];
checkPhase = ''
runHook preCheck
stestr run -e <(echo "
novaclient.tests.unit.test_shell.ParserTest.test_ambiguous_option
novaclient.tests.unit.test_shell.ParserTest.test_not_really_ambiguous_option
novaclient.tests.unit.test_shell.ShellTest.test_osprofiler
novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler
")
runHook postCheck
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
pythonImportsCheck = [ "novaclient" ];
pythonImportsCheck = [
"novaclient"
"novaclient.v2"
"novaclient.tests"
"novaclient.tests.functional"
"novaclient.tests.functional.api"
"novaclient.tests.functional.v2"
"novaclient.tests.functional.v2.legacy"
"novaclient.tests.unit"
"novaclient.tests.unit.fixture_data"
"novaclient.tests.unit.v2"
];
meta = {
description = "Client library for OpenStack Compute API";
mainProgram = "nova";
homepage = "https://github.com/openstack/python-novaclient";
homepage = "https://docs.openstack.org/python-novaclient/latest/";
downloadPage = "https://github.com/openstack/python-novaclient/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
teams = [ lib.teams.openstack ];
};
}
})

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