Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2025-04-26 08:03:45 +03:00
commit e9ed2cb3d5
131 changed files with 1687 additions and 1018 deletions

View file

@ -9484,12 +9484,6 @@
name = "Martin Hardselius";
keys = [ { fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; } ];
};
harrisonthorne = {
email = "harrisonthorne@proton.me";
github = "muni-corn";
githubId = 33523827;
name = "Harrison Thorne";
};
harryposner = {
email = "nixpkgs@harryposner.com";
github = "harryposner";
@ -16598,6 +16592,14 @@
githubId = 5047140;
name = "Victor Collod";
};
municorn = {
name = "municorn";
email = "municorn@musicaloft.com";
github = "muni-corn";
githubId = 33523827;
matrix = "@municorn:matrix.org";
keys = [ { fingerprint = "2686 7D83 CD74 CCEF 192F 052E 4B21 310A 52B1 5162"; } ];
};
munksgaard = {
name = "Philip Munksgaard";
email = "philip@munksgaard.me";
@ -18224,6 +18226,12 @@
githubId = 111265;
name = "Ozan Sener";
};
oskardotglobal = {
email = "me@oskar.global";
github = "oskardotglobal";
githubId = 52569953;
name = "Oskar Manhart";
};
osnyx = {
email = "os@flyingcircus.io";
github = "osnyx";
@ -18839,6 +18847,11 @@
githubId = 939420;
name = "Petros Angelatos";
};
petrzjunior = {
github = "petrzjunior";
githubId = 7000918;
name = "Petr Zahradnik";
};
petterstorvik = {
email = "petterstorvik@gmail.com";
github = "storvik";

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
version = "0-unstable-2025-04-10";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
rev = "51ca5126ee67e88827c87c761a097a6318ad25e7";
hash = "sha256-OBC8y53ljmgmfow7qBWIJYgjAiyv2bVa3CqQFkaJRhQ=";
rev = "d3b7313d232156a1f60ce31749fe68e498ad3bf4";
hash = "sha256-rU2HA0ap8O02qJHHksKigjAeRgnkV6F6z5JIusWlDZM=";
};
hardeningDisable = [ "format" ];

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2025-04-15";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "ffdacc6a7ce719b6371ad0a6143ce46726ed5d25";
hash = "sha256-Pdp/pPsZujbAK6pEE5LT6KCdJ/RFW1zR67bWvI/efJI=";
rev = "8a1e2d68b1065cb1d3686e37b2643f54ab50f527";
hash = "sha256-X1GWOHcIUnazno4ZkqlB+ugOtsAgADQqXFFBZy5OV4g=";
};
makefile = "Makefile";

View file

@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2025-04-15";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "25a882341d5ebbf8124ddd2a7421592678dfac2e";
hash = "sha256-N/7JZbEzYaOAoUShkmQd1G61ke1U3OSeFMXS0lqftYU=";
rev = "b04f0eb530c09f4b2a7402bd7f3b82e5daa4d173";
hash = "sha256-JCQEMfQDvnhUcSNiaVwDXAQmkFhgtwtW5XjAD/CBYjo=";
fetchSubmodules = true;
};

View file

@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2025-04-15";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "599edb24f01bbb7ce0e685e3c5585a02781549c7";
hash = "sha256-cPalfNXV6U2jLCTqXedQzn9pyWiscaZrrQM32D70uYE=";
rev = "a39eb4dc4ba05f5c7d292f7547a1502986b07e9f";
hash = "sha256-MlNQMQY+0XDftaEOiiE+uZePYLsCzG4auRfqpw8Qzw4=";
fetchSubmodules = true;
};

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "stella";
version = "0-unstable-2025-03-29";
version = "0-unstable-2025-04-19";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = "b753f6eefa4bf02af20eacae98caab7d5aabc4a8";
hash = "sha256-uPRNa7Ofaonyp1ErFel12DyKox9ETYGoT1s3aG96VkU=";
rev = "7b5c19ff5e28dfeb814e912d028cb34b53c01f10";
hash = "sha256-RdRdmvUZB1jGgeuNBGhqztZadag0/8USTjtTAKjaxSo=";
};
makefile = "Makefile";

View file

@ -26,6 +26,6 @@ mkDerivation {
description = "Single-player jigsaw puzzle game";
mainProgram = "palapeli";
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ harrisonthorne ];
maintainers = with lib.maintainers; [ municorn ];
};
}

View file

@ -90,13 +90,13 @@
"vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
},
"auth0": {
"hash": "sha256-NBY9f1/VGU6VyPwy7LqgmsulLlzz17Ie8nU7JOirlFo=",
"hash": "sha256-ZSbanDR9PpvHHVr7uObGbf0nQD3CzKzT5QKCEwJojH8=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.15.0",
"rev": "v1.16.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Tfkk3+PWzlC7nZlhnD7rEYO+6OKps6pXgi+eqfmRSic="
"vendorHash": "sha256-ZBvIfLUMgGXJM5VgsOrerfN3TiMou3VFUrMqzMAwWaA="
},
"avi": {
"hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",
@ -135,11 +135,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-pbXkGKym7amioTZlguwBpoFvfvYnCGOxZ7PIT8I3dxY=",
"hash": "sha256-r2ttKyaV/cjIXYECwYmKuTe2Z1HYgiJFfMzd58Se99g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v4.26.0",
"rev": "v4.27.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -180,13 +180,13 @@
"vendorHash": "sha256-XD7xvp8P9zaDJ5J07+cc+mFZA3F1JQDvK+1Tgqb6k/o="
},
"bitwarden": {
"hash": "sha256-fUmwIfRiLpbhENPZwc9CWZsIugppfc68qGR1Iy1UyBE=",
"hash": "sha256-pEvTdaXuxsfrmJmgYo9mC3OSzU7q0DHEj2esXiumpMk=",
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
"owner": "maxlaverse",
"repo": "terraform-provider-bitwarden",
"rev": "v0.13.5",
"rev": "v0.13.6",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oO9+r/CSVSsD+xnJrAhNReWQjUNnHl6qCkoAQfD/VOg="
"vendorHash": "sha256-nL0kii/BGihXiNp/69Kk/2J5o4lmYPHx6IqTF/IyWaU="
},
"brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@ -271,13 +271,13 @@
"vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0="
},
"cloudinit": {
"hash": "sha256-RRvLQXgF/g+jIn8hO+Ma/tNsRaZEETWu/jNqDADVYGI=",
"hash": "sha256-xDHp2bG0/T4pE3j8L4zTVnaQ9te5MuAbiGmopFedOpk=",
"homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit",
"owner": "hashicorp",
"repo": "terraform-provider-cloudinit",
"rev": "v2.3.6",
"rev": "v2.3.7",
"spdx": "MPL-2.0",
"vendorHash": "sha256-YdzNaMJcDiV194HiDBt+5RHw/BLn8H+wNcrpFSxqDOY="
"vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw="
},
"cloudscale": {
"hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=",
@ -335,13 +335,13 @@
"vendorHash": "sha256-mJXQVfCmW7ssFCrrRSiNb5Vg2QnS9NoBCgZlDDPMoEU="
},
"dexidp": {
"hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=",
"hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=",
"homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp",
"owner": "marcofranssen",
"repo": "terraform-provider-dexidp",
"rev": "v0.6.1",
"rev": "v0.7.0",
"spdx": "MIT",
"vendorHash": "sha256-3swcRmm+JZ4ZQX0hvXZosYDGwk0KSyZcqEdNGDYcyYE="
"vendorHash": "sha256-0yoaiVn6j6g//iTPgX/y6M0A+cWAASDIuWMIHi/4w1o="
},
"dhall": {
"hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=",
@ -390,13 +390,13 @@
"vendorHash": "sha256-WZqwBkVXoFmDikIyt9GWszLA/9YBoQHAdBuWbGKZBZw="
},
"docker": {
"hash": "sha256-0GMZnrmuRKWnI3Fu97MPtKiNh9XSUkFO/U35+ym2xLk=",
"hash": "sha256-dhHhalHUHvM5vIyqXBmmYSYWPVXfYZEkQeREg17Clu8=",
"homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
"owner": "kreuzwerker",
"repo": "terraform-provider-docker",
"rev": "v3.1.2",
"rev": "v3.3.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-YTxWawv5KbitMD9CoiDLt8FjZUvjyIjcoqQVmz9xZGs="
"vendorHash": "sha256-yxa2MTNsmbcZTG8QjnYHkWhow6s1IeutPmww/A0K3zw="
},
"doppler": {
"hash": "sha256-VzdtksB/zrsf3z3J/1UEehiuQYM7cyxTef892PGYrxo=",
@ -561,13 +561,13 @@
"vendorHash": "sha256-6kK9FMT+Ew6RBzNNR9OxYaCz1NjzKRv75Aa9l+p+B5E="
},
"hcloud": {
"hash": "sha256-wst3+LIcybM3VZlAzbkacJtAjl08je4rdeIJz1632yM=",
"hash": "sha256-DSTxn4t6YWxRBimMlqkP1VLqqxk1Kox+h0u9i9rSdhc=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.50.0",
"rev": "v1.50.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ealJRIeNapOteRsRzEN5FayhG629gJ+eAV2ohTwHWL0="
"vendorHash": "sha256-jbNkhNSSO9jT20J6dVhBEbN9cwtNrvx5EUcyOZcMd4Y="
},
"helm": {
"hash": "sha256-LCvsZNeGQb4wWIASnQxXbH/3YJJaUZS9nY8mHq6M4FM=",
@ -606,13 +606,13 @@
"vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs="
},
"http": {
"hash": "sha256-eNF6OQZmJfzVXfvrhjtMJZG7mNYjS61Bplff+VaxrCA=",
"hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/http",
"owner": "hashicorp",
"repo": "terraform-provider-http",
"rev": "v3.4.5",
"rev": "v3.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
"vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM="
},
"huaweicloud": {
"hash": "sha256-MzXzdUzhYB7eDW7sNag4PIlz4Z7Q4GZDeHsjLSnc9Ck=",
@ -750,13 +750,13 @@
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
},
"linode": {
"hash": "sha256-yMLX72T2TG1wyGrn0pmpgPFPNVIVMSkiqAAl3OAvEuA=",
"hash": "sha256-4LtP1mgLXT0MEAeszT+lFQ4wiCpUaK5s9ww41uJR+SU=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.37.0",
"rev": "v2.38.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-hp2gtyC+AXlsbYJlloDnRRvbaF1s/cAc2XIniKdUf08="
"vendorHash": "sha256-rQtSLqOsro/PERvykaNwRfW9zWN9o9I9MQP39P6FnoQ="
},
"linuxbox": {
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
@ -858,13 +858,13 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-ybOBWUxboRw+KTnWcDPPXo/oZVJs4qyWEekYoIB8bsI=",
"hash": "sha256-2Bmk1b84oL8DkPShff4RPQSlAu6ufwcb7sp6mJGeo84=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.60.2",
"rev": "v3.61.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-WmrqA3wVUStJunm1eiftKekHJaPRvCAua5guqskd6CE="
"vendorHash": "sha256-wqraBQqxpD69iIM45MZLWhgIEiyu300bok3OST+Hegs="
},
"nexus": {
"hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=",
@ -876,13 +876,13 @@
"vendorHash": "sha256-wOpR+AJYW7YiARSIACta8Tr4bmGLUONRTEBLxHyHZZk="
},
"nomad": {
"hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=",
"hash": "sha256-0ShkpPAxCT9lmfrVUoyjx7DhwlSYz9uEIujsKSB+dgA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
"owner": "hashicorp",
"repo": "terraform-provider-nomad",
"rev": "v2.4.0",
"rev": "v2.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-YmZvHzrEZVvXI8CIcjX40s+MHTThPeXNQ05cnqkNbbE="
"vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ="
},
"ns1": {
"hash": "sha256-Ufj6mrxeTVpc9rWJX3hpzoBGNnNxOMMb8TgC39Z1vqo=",
@ -894,13 +894,13 @@
"vendorHash": "sha256-QmL/LghZgOtdkgy102/76zFD+1lxnxn2d/11WaETIE4="
},
"null": {
"hash": "sha256-zvzBWnxWVXNOebnlgaP8lzwk6DMwwkGxx4i1QKCLSz0=",
"hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/null",
"owner": "hashicorp",
"repo": "terraform-provider-null",
"rev": "v3.2.3",
"rev": "v3.2.4",
"spdx": "MPL-2.0",
"vendorHash": "sha256-btTvl9WcqWMa5YGkY0PT8c64H6ToNghLKX03dN/3IPs="
"vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg="
},
"nutanix": {
"deleteVendor": true,
@ -913,11 +913,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-S3OsFoSPYOcD+mjOy1gBAVGpqd61G5S2Zl2GGknKA5o=",
"hash": "sha256-4e73gmiMF95V3E63kUofImW+E6lvQcpMvBTuViAARjM=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v6.34.0",
"rev": "v6.35.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1003,11 +1003,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-7C1oVVLrv1yoBVngUdBAjjLrGeaQhbiLp/g+5danDo4=",
"hash": "sha256-zY5aBpr/XPuGnRIsDgh4vzug6kUVJ76iF6tLhck2uGY=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v3.24.0",
"rev": "v3.24.2",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1084,13 +1084,13 @@
"vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA="
},
"random": {
"hash": "sha256-bbqTCLPjL1EowsEIx9SiwKAUt11LYxOOtj3syW/7gjQ=",
"hash": "sha256-tdTVqSJmQ6Ht3kdoYMxhoRN+XJqvu8BPVB0VQghcDVs=",
"homepage": "https://registry.terraform.io/providers/hashicorp/random",
"owner": "hashicorp",
"repo": "terraform-provider-random",
"rev": "v3.7.1",
"rev": "v3.7.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ILdu9D/SQ39zDcvl13IMhN+aocbTZO5SI8n6wvdS9I8="
"vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE="
},
"remote": {
"hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=",
@ -1345,13 +1345,13 @@
"vendorHash": "sha256-0o7WKJm4IesxparbbWhzXJNL80qxCUkJvQFypMobR1A="
},
"tls": {
"hash": "sha256-MK75g9gbi+f994hKHBAQRXrPG+hbZqnlyrK8WROiG5Y=",
"hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tls",
"owner": "hashicorp",
"repo": "terraform-provider-tls",
"rev": "v4.0.6",
"rev": "v4.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-qsbB7Scw9W4our6B+9NzsK4hrbWP34na7/eNLC99yKc="
"vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U="
},
"triton": {
"deleteVendor": true,
@ -1391,11 +1391,11 @@
"vendorHash": "sha256-rHJabyfgu3wU79h3DHHYQauFmcR/SDuikauBF+CybZA="
},
"vault": {
"hash": "sha256-GlRaV9CYm8IuIzeN/KRJWLCHIhc7Fdb5DL4fTA/dzV0=",
"hash": "sha256-6gCpXzvF4p2otwo3dJ8c+EvzbsMZfzVZymb41+hEZoM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"repo": "terraform-provider-vault",
"rev": "v4.7.0",
"rev": "v4.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-5e6WQ0lByT3BWcuJvG/LYRVeiiIYQDkV4A74CJhiUBA="
},
@ -1409,13 +1409,13 @@
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
},
"venafi": {
"hash": "sha256-/fRqTu/M3OHR5v7pWAE04ijq70F7MxRILP1Ab2hw7gs=",
"hash": "sha256-vMZH0BQMkoizbME1pYCn+iMqwI8aSvhe0Dcrvstzots=",
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
"owner": "Venafi",
"repo": "terraform-provider-venafi",
"rev": "v0.21.2",
"rev": "v0.22.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-kZ0JLjAYu3b01zHfp+VWTZ8sUCivfaS1Ld2/SDMOrks="
"vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA="
},
"vinyldns": {
"hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=",
@ -1454,13 +1454,13 @@
"vendorHash": null
},
"vsphere": {
"hash": "sha256-ce3nKSBvF7Enk3wsW4ackEBIDPKPP0qkjZ7Dm9SGKV4=",
"hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
"owner": "hashicorp",
"repo": "terraform-provider-vsphere",
"rev": "v2.11.1",
"rev": "v2.12.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3RylkFRnCG5Z9G/4iV8YJgBnNKYS4T3AhA2JdI+1FEY="
"vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4="
},
"vultr": {
"hash": "sha256-1ZzydEpNF06NUC0wYtFcPHpdj4FFPI+qF6pVRNsUxTs=",

View file

@ -16,7 +16,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
inherit pname;
inherit (unwrapped) version meta passthru;
inherit (finalAttrs.unwrapped) version meta passthru;
inherit unwrapped;

View file

@ -1,13 +0,0 @@
diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
index ebdc552..3e37573 100644
--- a/platform/qt/MLVApp.pro
+++ b/platform/qt/MLVApp.pro
@@ -120,7 +120,7 @@ win32{
# Linux
linux-g++*{
- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize
QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize
LIBS += -lgomp
}

View file

@ -1,65 +0,0 @@
{
fetchFromGitHub,
lib,
mkDerivation,
qmake,
qtbase,
qtmultimedia,
stdenv,
}:
mkDerivation rec {
pname = "mlv-app";
version = "1.14";
src = fetchFromGitHub {
owner = "ilia3101";
repo = "MLV-App";
rev = "QTv${version}";
sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU=";
};
patches = lib.optionals stdenv.hostPlatform.isAarch64 [
# remove optimization flags with x86 only instruction sets
./aarch64-flags.patch
];
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin mlvapp
install -Dm444 -t $out/share/applications mlvapp.desktop
install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
runHook postInstall
'';
qmakeFlags = [ "MLVApp.pro" ];
preConfigure = ''
export HOME=$TMPDIR
cd platform/qt/
'';
buildInputs = [
qtmultimedia
qtbase
];
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/mlvapp"
'';
nativeBuildInputs = [
qmake
];
meta = with lib; {
description = "All in one MLV processing app that is pretty great";
homepage = "https://mlv.app";
license = licenses.gpl3;
maintainers = [ ];
platforms = platforms.linux;
mainProgram = "mlvapp";
};
}

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ada";
version = "3.2.2";
version = "3.2.3";
src = fetchFromGitHub {
owner = "ada-url";
repo = "ada";
tag = "v${version}";
hash = "sha256-Qag6cWybRxbQC7LvQmxLVcCw4RtMJ5TOSDwCmNs2XFA=";
hash = "sha256-35vw/hGlOPhpjY43jWTrWxqazaYzhdviXxBe53cKEzg=";
};
nativeBuildInputs = [ cmake ];

View file

@ -25,6 +25,6 @@ crystal.buildCrystalPackage rec {
homepage = "https://crystal-ameba.github.io";
changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ kimburgess ];
maintainers = with maintainers; [ ];
};
}

View file

@ -27,13 +27,13 @@ in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "ani-cli";
version = "4.9";
version = "4.10";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ani-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY=";
hash = "sha256-R/YQ02ctTcAEzrVyWlaCHi1YW82iPrMBbbMNP21r0p8=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "apprun-cli";
version = "0.0.2";
version = "0.3.2";
src = fetchFromGitHub {
owner = "fujiwara";
repo = "apprun-cli";
tag = "v${version}";
hash = "sha256-SvFShjAHjIKhz/YolgmFeaAxflh3FRPEZDx57+AtXeQ=";
hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc=";
};
vendorHash = "sha256-pz97Eihc/6b2J+JuEZJQoqBkKtf1J5XbSFMQa1CJrRo=";
vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ=";
ldflags = [
"-s"

View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "astyle";
version = "3.6.8";
version = "3.6.9";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
hash = "sha256-WviuegXF5hbdH4TXWLSQnC0uz8F5+IP9EE0iPzTMbf8=";
hash = "sha256-tkRZdlTfW0AIe+SkZyPGUED3zlnzNp8bj2kPnBDKurw=";
};
nativeBuildInputs = [ cmake ];

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "bazel-gazelle";
version = "0.40.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
hash = "sha256-cGRE+AX62U6lZbUEid0QWb9zMTiIemop6Gqrqvz5+nk=";
hash = "sha256-jj2mAGzz5BOim008LNRH0tVLbJy/mNodsTENMVbjUbk=";
};
vendorHash = null;

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.44";
version = "2.9.45";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "sha256-5963iZ7fDNs+J96+GSoGcjKLCqu8u3obAWE9+9oEBGU=";
sha256 = "sha256-WOiUA2Bk6/ymV2wqPu4a4x0SL1TZXsZOTALta8ZMu6I=";
};
# these tests require network access that we're not going to give them

View file

@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec {
pname = "cyme";
version = "2.1.3";
version = "2.2.0";
src = fetchFromGitHub {
owner = "tuna-f1sh";
repo = "cyme";
rev = "v${version}";
hash = "sha256-7V/MExL1OJ+mBPlLcYiK6HTjvbHbIbrf13Rak+Za3d4=";
hash = "sha256-asg8ATzM2cwh+crnzqjWMsee1I9BPm9an8d3lzj6yS4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-4QxxwCBiPYd83rKEcoRJhHhQArzq9oQ287UBVrjbElg=";
cargoHash = "sha256-DFAlFEJfR6jUplQ50AK4SszdBIw0jbxFRgYNHg3sN8c=";
nativeBuildInputs =
[

View file

@ -1,35 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
libX11,
libXi,
libconfuse,
}:
stdenv.mkDerivation rec {
pname = "dispad";
version = "0.3.1";
src = fetchFromGitHub {
owner = "BlueDragonX";
repo = "dispad";
rev = "v${version}";
hash = "sha256-PtwvaNtnCm3Y+6vlxPDc21RyIA2v3vkMOHpoGFxNFng=";
};
buildInputs = [
libX11
libXi
libconfuse
];
meta = with lib; {
description = "Small daemon for disabling trackpads while typing";
homepage = "https://github.com/BlueDragonX/dispad";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ zimbatm ];
platforms = platforms.linux;
mainProgram = "dispad";
};
}

View file

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "dolt";
version = "1.51.4";
version = "1.52.2";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-UlFWGvrm2X54YZDywSiJne/i/6krQ61sJXEyt5cgVAM=";
sha256 = "sha256-bEF85lWebcpwz3rYEMqA4h0eMS5AzvuzDTXIrs0izJs=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-n4fS9QbtMIO1QtLoESzAjNrnzNH81xUBHYM9OomGia0=";
vendorHash = "sha256-wMnFzeZG2eBTddZt3abT4Q+X2getjcyd7JHmhywtyWs=";
proxyVendor = true;
doCheck = false;

View file

@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "dotenvx";
version = "1.39.1";
version = "1.41.0";
src = fetchFromGitHub {
owner = "dotenvx";
repo = "dotenvx";
tag = "v${version}";
hash = "sha256-viIW2bQTcfoMhppv96TxD+i85ltGzNrPzZAeYPNcHeI=";
hash = "sha256-qYigFqJF/+37bd8LPg8u9EkI/50ULxTs3LwjrcAYntk=";
};
npmDepsHash = "sha256-SVrsvl2Mw59hsh+RBZV5bZ5Qz5reg1hrDYRYq5y0UIw=";
npmDepsHash = "sha256-k+M3AdEHSrpl+rKTbxmTkcHVgwm5lHt3xjj2fQ4UFiI=";
dontNpmBuild = true;

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "eks-node-viewer";
version = "0.7.1";
version = "0.7.4";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
tag = "v${version}";
hash = "sha256-KdddfixQewj30rIC1qZzyS3h/jq+RdxId9WgQPqW8nE=";
hash = "sha256-VCRwGxH7adwB6p+UCF1GmAa5f/7GgJlJ7GvRSFOlOto=";
};
vendorHash = "sha256-yTF1PRRUlJ27ZrKO0FW4IztIE1Wo05qixTCFvETg358=";
vendorHash = "sha256-ZBkiiDAcgOkIezDHcDjqJ3w5+k5kXdfw2TCZoTx12hc=";
excludedPackages = [ "hack" ];

View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.13.278";
version = "2.13.279";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-/488GRkU3pQDEkQhLoKQ4ohv4olSnCaLAca/jvq/lsA=";
hash = "sha256-R8h69JspAUnDJaQdYNwZINH86FQIPKsFkw0d85uYQAg=";
};
vendorHash = "sha256-QulVxCaPvXlFwkxe15Et1+rReolABBssTxZspV8KzMs=";
vendorHash = "sha256-nhpgHC/gj72f6fk5Q2SGTN9kGU3HbfgiHg/MnC79Lzg=";
ldflags = [
"-s"

View file

@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "14.2.0";
version = "14.2.1";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-ga0UsU/VTDIoz88XxdQIGX+md1G21DgctYYmXPr3zbQ=";
hash = "sha256-3eAzLtVNlgjktnuQ1ZJIyE2CsKZISPRuGjUTHZxX/6k=";
};
npmDepsHash = "sha256-XiOLtZCm3qxd2Oq3vqMzxU64y37ZZfhivvkxT6m7ES4=";
npmDepsHash = "sha256-/mij1GjkRldQWaBv1YEwxMWoP6CG3ydLV2aI+K2R+t4=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json

View file

@ -28,25 +28,25 @@
rustPlatform.buildRustPackage rec {
pname = "firefoxpwa";
version = "2.13.3";
version = "2.14.1";
src = fetchFromGitHub {
owner = "filips123";
repo = "PWAsForFirefox";
rev = "v${version}";
hash = "sha256-u6zKB5+P/f3qM5Sqmhk2ts1AhgRN8Oq877uKQuJ6Uao=";
hash = "sha256-yYvQxz+lAxKXpAWeLiBnepGuwYfNLyIhu4vQ8NdH3pc=";
};
sourceRoot = "${src.name}/native";
buildFeatures = [ "immutable-runtime" ];
useFetchCargoVendor = true;
cargoHash = "sha256-23XTb+gAN0D67llZj8Er43cFfhLSdEA6X6V6Ds1rvV8=";
cargoHash = "sha256-elVthXdjlI9DSQgaIRzu3M72dgGNXGgMiUXEICaBJCQ=";
preConfigure = ''
sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock
sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.jsm
sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.sys.mjs
'';
nativeBuildInputs = [

View file

@ -0,0 +1,43 @@
{
lib,
fetchFromGitHub,
glib,
meson,
ninja,
nix-update-script,
pkg-config,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "flatpak-xdg-utils";
version = "1.0.6";
src = fetchFromGitHub {
owner = "flatpak";
repo = "flatpak-xdg-utils";
tag = finalAttrs.version;
hash = "sha256-j5A5msgKjQSIvCvFSZGL8QfwH+SJGJ4S3PPCHOmM/bk=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
glib
];
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/flatpak/flatpak-xdg-utils/releases/tag/${finalAttrs.version}";
description = "Commandline utilities for use inside Flatpak sandboxes";
homepage = "https://flatpak.org/";
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ michaelgrahamevans ];
platforms = lib.platforms.linux;
};
})

View file

@ -0,0 +1,175 @@
{
stdenv,
fetchFromGitHub,
lib,
fetchpatch,
cmake,
ninja,
python3,
openjdk,
mono,
openssl,
boost186,
pkg-config,
msgpack-cxx,
toml11,
jemalloc,
doctest,
}:
let
boost = boost186;
# Only even numbered versions compile on aarch64; odd numbered versions have avx enabled.
avxEnabled =
version:
let
isOdd = n: lib.trivial.mod n 2 != 0;
patch = lib.toInt (lib.versions.patch version);
in
isOdd patch;
in
stdenv.mkDerivation rec {
name = "foundationdb";
version = "7.3.42";
src = fetchFromGitHub {
owner = "apple";
repo = "foundationdb";
tag = version;
hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
};
patches = [
./disable-flowbench.patch
./don-t-use-static-boost-libs.patch
# GetMsgpack: add 4+ versions of upstream
# https://github.com/apple/foundationdb/pull/10935
(fetchpatch {
url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch";
hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
})
# Add a dependency that prevents bindingtester to run before the python bindings are generated
# https://github.com/apple/foundationdb/pull/11859
(fetchpatch {
url = "https://github.com/apple/foundationdb/commit/8d04c97a74c6b83dd8aa6ff5af67587044c2a572.patch";
hash = "sha256-ZLIcmcfirm1+96DtTIr53HfM5z38uTLZrRNHAmZL6rc=";
})
];
hardeningDisable = [ "fortify" ];
postPatch = ''
# allow using any msgpack-cxx version
substituteInPlace cmake/GetMsgpack.cmake \
--replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)'
# Use our doctest package
substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \
--replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include'
# Upstream upgraded to Boost 1.86 with no code changes; see:
# <https://github.com/apple/foundationdb/pull/11788>
substituteInPlace cmake/CompileBoost.cmake \
--replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost '
'';
buildInputs = [
boost
jemalloc
msgpack-cxx
openssl
toml11
];
checkInputs = [ doctest ];
nativeBuildInputs = [
cmake
mono
ninja
openjdk
pkg-config
python3
];
separateDebugInfo = true;
dontFixCmake = true;
cmakeFlags = [
"-DFDB_RELEASE=TRUE"
# Disable CMake warnings for project developers.
"-Wno-dev"
# CMake Error at fdbserver/CMakeLists.txt:332 (find_library):
# > Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a
"-DSSD_ROCKSDB_EXPERIMENTAL=FALSE"
"-DBUILD_DOCUMENTATION=FALSE"
# LTO brings up overall build time, but results in much smaller
# binaries for all users and the cache.
"-DUSE_LTO=ON"
# Gold helps alleviate the link time, especially when LTO is
# enabled. But even then, it still takes a majority of the time.
"-DUSE_LD=GOLD"
# FIXME: why can't openssl be found automatically?
"-DOPENSSL_USE_STATIC_LIBS=FALSE"
"-DOPENSSL_CRYPTO_LIBRARY=${openssl.out}/lib/libcrypto.so"
"-DOPENSSL_SSL_LIBRARY=${openssl.out}/lib/libssl.so"
];
# the install phase for cmake is pretty wonky right now since it's not designed to
# coherently install packages as most linux distros expect -- it's designed to build
# packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to
# cmake upstream to fix this, and if we do, i think most of this can go away.
postInstall = ''
mv $out/sbin/fdbmonitor $out/bin/fdbmonitor
mkdir $out/libexec && mv $out/usr/lib/foundationdb/backup_agent/backup_agent $out/libexec/backup_agent
mv $out/sbin/fdbserver $out/bin/fdbserver
rm -rf $out/etc $out/lib/foundationdb $out/lib/systemd $out/log $out/sbin $out/usr $out/var
# move results into multi outputs
mkdir -p $dev $lib
mv $out/include $dev/include
mv $out/lib $lib/lib
# python bindings
# NB: use the original setup.py.in, so we can substitute VERSION correctly
cp ../LICENSE ./bindings/python
substitute ../bindings/python/setup.py.in ./bindings/python/setup.py \
--replace 'VERSION' "${version}"
rm -f ./bindings/python/setup.py.* ./bindings/python/CMakeLists.txt
rm -f ./bindings/python/fdb/*.pth # remove useless files
rm -f ./bindings/python/*.rst ./bindings/python/*.mk
cp -R ./bindings/python/ tmp-pythonsrc/
tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
# java bindings
mkdir -p $lib/share/java
mv lib/fdb-java-*.jar $lib/share/java/fdb-java.jar
'';
outputs = [
"out"
"dev"
"lib"
"pythonsrc"
];
meta = {
description = "Open source, distributed, transactional key-value store";
homepage = "https://www.foundationdb.org";
license = lib.licenses.asl20;
platforms = [ "x86_64-linux" ] ++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ];
# Fails when cross-compiling with "/bin/sh: gcc-ar: not found"
broken = stdenv.buildPlatform != stdenv.hostPlatform;
maintainers = with lib.maintainers; [
thoughtpolice
lostnet
];
};
}

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.19.0";
version = "3.19.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
tag = "v${version}";
hash = "sha256-qxphyAAIacS0NY5nkmL8G4A4v/kJAXiH6ldjVeH7vY0=";
hash = "sha256-zU/OAiWc6H4YC5bnDFrqpfCT1HhDGCm+dkjriP2Wp3w=";
};
vendorHash = null;

View file

@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "glab";
version = "1.55.0";
version = "1.56.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-K1zjb4QCLBp7GwT2580DXYKx3yTaIyNytKObMbzjvlQ=";
hash = "sha256-dFyVhl4+WdQeoSZSY8JbkjJBhqOX/oN2b9q1CGlLhpc=";
};
vendorHash = "sha256-ODTyWArYcCxsWbN9fuppAcRYtKGxcadeRPIwfPiAuOE=";
vendorHash = "sha256-m4IWtK2PNjs2UxzVCT2oSx6Gic2flN4Fq8w0mNIhHxo=";
ldflags = [
"-s"

View file

@ -6,7 +6,7 @@
buildGoModule rec {
pname = "go-md2man";
version = "2.0.6";
version = "2.0.7";
vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0=";
@ -14,7 +14,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "cpuguy83";
repo = "go-md2man";
sha256 = "sha256-wJnHgp+NPchXkR71ARLMjo4VryzgGkz2tYWPsC+3eFo=";
sha256 = "sha256-DKqGvdidl6J4lPhIk3okhU4k6MvtSr+hJ9huU/JTai0=";
};
meta = with lib; {

View file

@ -7,16 +7,16 @@
buildGo124Module rec {
pname = "golangci-lint";
version = "2.1.2";
version = "2.1.5";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-CAO+oo3l3mlZIiC1Srhc0EfZffQOHvVkamPHzSKRSFw=";
hash = "sha256-wCBGtKlaKW6Btim9xe0K8IzdNVcBDEidhr6LCwLUx98=";
};
vendorHash = "sha256-2GQp/sgYRlDengx8uy3zzqi9hwHh4CQUHoj1zaxNNLE=";
vendorHash = "sha256-Dd4GTjkq1LTH7G1Qj8y+q0LW/8cQECN8o+3xHFtmpwI=";
subPackages = [ "cmd/golangci-lint" ];

View file

@ -0,0 +1,32 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
pname = "goverter";
version = "1.7.0";
src = fetchFromGitHub {
owner = "jmattheis";
repo = "goverter";
tag = "v${version}";
hash = "sha256-VgwmnB6FP7hlUrZpKun38T4K2YSDl9yYuMjdzsEhCF4=";
};
vendorHash = "sha256-uQ1qKZLRwsgXKqSAERSqf+1cYKp6MTeVbfGs+qcdakE=";
subPackages = [ "cmd/goverter" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Generate type-safe Go converters by defining function signatures.";
homepage = "https://github.com/jmattheis/goverter";
changelog = "https://goverter.jmattheis.de/changelog";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ krostar ];
mainProgram = "goverter";
};
}

View file

@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
libsodium,
openssl,
pkg-config,
rustPlatform,
@ -9,25 +8,24 @@
nixosTests,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "harmonia";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "harmonia";
tag = "harmonia-v${version}";
hash = "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY=";
tag = "harmonia-v${finalAttrs.version}";
hash = "sha256-Ch7CBPwSKZxCmZwFunNCA8E74TcOWp9MLbhe3/glQ6w=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3l+mRucDFc49Y96e2m5uixKvRSkrRaBWgJhPMIxuZvo=";
cargoHash = "sha256-7HZoXNL7nf6NUNnh6gzXsZ2o4eeEQL7/KDdIcbh7/jM=";
doCheck = false;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libsodium
openssl
];
@ -41,11 +39,11 @@ rustPlatform.buildRustPackage rec {
tests = { inherit (nixosTests) harmonia; };
};
meta = with lib; {
meta = {
description = "Nix binary cache";
homepage = "https://github.com/nix-community/harmonia";
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mic92 ];
mainProgram = "harmonia";
};
}
})

View file

@ -0,0 +1,51 @@
{
lib,
rustPlatform,
installShellFiles,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hl-log-viewer";
version = "0.30.3";
src = fetchFromGitHub {
owner = "pamburus";
repo = "hl";
tag = "v${finalAttrs.version}";
hash = "sha256-18FzXUvpMHu3EfECgcslhReinMM6Oa1qdTKbbqFiv1w=";
};
cargoHash = "sha256-qx3NxWgCsCurU+TObQIvn1Xyn5IRP/iNem3s201MD4A=";
useFetchCargoVendor = true;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd hl \
--bash <($out/bin/hl --shell-completions bash) \
--fish <($out/bin/hl --shell-completions fish) \
--zsh <($out/bin/hl --shell-completions zsh)
$out/bin/hl --man-page >hl.1
installManPage hl.1
'';
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/hl";
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };
meta = {
description = "JSON and logfmt log converter to human readable representation";
homepage = "https://github.com/pamburus/hl";
changelog = "https://github.com/pamburus/hl/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
mainProgram = "hl";
maintainers = with lib.maintainers; [ petrzjunior ];
};
})

View file

@ -20,14 +20,14 @@ let
in
stdenv.mkDerivation rec {
pname = "incus-ui-canonical";
version = "0.15.2";
version = "0.15.3";
src = fetchFromGitHub {
owner = "zabbly";
repo = "incus-ui-canonical";
# only use tags prefixed by incus- they are the tested fork versions
tag = "incus-${version}";
hash = "sha256-jcdjbrQsBshpSogPkDO2DHYIyWmxEOJbFFG25X2mni0=";
hash = "sha256-FsDdALcIXJFo0ScOA8YEzulefp8IfOSi2ZClrtcPo24=";
};
offlineCache = fetchYarnDeps {

View file

@ -0,0 +1,93 @@
diff --git a/internal/server/firewall/drivers/drivers_consts.go b/internal/server/firewall/drivers/drivers_consts.go
index 2790e07a605..944bca5930e 100644
--- a/internal/server/firewall/drivers/drivers_consts.go
+++ b/internal/server/firewall/drivers/drivers_consts.go
@@ -1,8 +1,6 @@
package drivers
import (
- "encoding/json"
- "fmt"
"net"
)
@@ -67,62 +65,12 @@ type NftListSetsOutput struct {
// NftListSetsEntry structure to read JSON output of nft set listing.
type NftListSetsEntry struct {
- Metainfo *NftMetainfo `json:"metainfo,omitempty"`
- Set *NftSet `json:"set,omitempty"`
-}
-
-// NftMetainfo structure representing metainformation returned by nft.
-type NftMetainfo struct {
- Version string `json:"version"`
- ReleaseName string `json:"release_name"`
- JSONSchemaVersion int `json:"json_schema_version"`
+ Set *NftSet `json:"set,omitempty"`
}
// NftSet structure to parse the JSON of a set returned by nft -j list sets.
type NftSet struct {
- Family string `json:"family"`
- Name string `json:"name"`
- Table string `json:"table"`
- Type string `json:"type"`
- Handle int `json:"handle"`
- Flags []string `json:"flags"`
- Elem ElemField `json:"elem"`
-}
-
-// ElemField supports both string elements (IP, MAC) and dictionary-based CIDR elements.
-// In order to parse it correctly a custom unsmarshalling is defined in drivers_nftables.go .
-type ElemField struct {
- Addresses []string // Stores plain addresses and CIDR notations as strings.
-}
-
-// UnmarshalJSON handles both plain strings and CIDR dictionaries inside `elem`.
-func (e *ElemField) UnmarshalJSON(data []byte) error {
- var rawElems []any
- err := json.Unmarshal(data, &rawElems)
- if err != nil {
- return err
- }
-
- for _, elem := range rawElems {
- switch v := elem.(type) {
- case string:
- // Plain address (IPv4, IPv6, or MAC).
- e.Addresses = append(e.Addresses, v)
- case map[string]any:
- // CIDR notation (prefix dictionary).
- prefix, ok := v["prefix"].(map[string]any)
- if ok {
- addr, addrOk := prefix["addr"].(string)
- lenFloat, lenOk := prefix["len"].(float64) // JSON numbers are float64 by default.
- if addrOk && lenOk {
- e.Addresses = append(e.Addresses, fmt.Sprintf("%s/%d", addr, int(lenFloat)))
- }
- }
-
- default:
- return fmt.Errorf("Unsupported element type in NFTables set: %v", elem)
- }
- }
-
- return nil
+ Family string `json:"family"`
+ Name string `json:"name"`
+ Table string `json:"table"`
}
diff --git a/internal/server/firewall/drivers/drivers_nftables.go b/internal/server/firewall/drivers/drivers_nftables.go
index fd9be2e2fbb..f803de9dff5 100644
--- a/internal/server/firewall/drivers/drivers_nftables.go
+++ b/internal/server/firewall/drivers/drivers_nftables.go
@@ -387,7 +387,7 @@ func (d Nftables) NetworkClear(networkName string, _ bool, _ []uint) error {
return fmt.Errorf("Failed clearing nftables rules for network %q: %w", networkName, err)
}
- err = d.RemoveIncusAddressSets("inet")
+ err = d.RemoveIncusAddressSets("bridge")
if err != nil {
return fmt.Errorf("Error in deletion of address sets: %w", err)
}

View file

@ -1,8 +1,11 @@
import ./generic.nix {
hash = "sha256-S6PTtgP4MFV+kiEgV8PBvek1SrVjLaCR9OJy/6jqJGE=";
version = "6.11.0";
vendorHash = "sha256-wKL+woCMjGJwCBG/JBhFbY4uc97/5K7OWPZRp0J+5DQ=";
patches = [ ];
hash = "sha256-hgZc30SRnmALTvuD32dNuO0r4pfpXXvN4CtJqn2fGuk=";
version = "6.12.0";
vendorHash = "sha256-/GwJG6kmjbiUUh0AWQ+IUbeK1kRcuWrwmNdTzH5LT38=";
patches = [
# fix nft, remove 6.13
./1995.diff
];
nixUpdateExtraArgs = [
"--override-filename=pkgs/by-name/in/incus/package.nix"
];

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "jaq";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
tag = "v${version}";
hash = "sha256-8RP895GXoQOgMAfkfHIxCm0R2lmG+W3/H+xjcqSc3JM=";
hash = "sha256-mVC2aggfcEpCtriuz/s4JL8mYkrlyAQLnaN5vyfcW3s=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-movx0ahUD20OvLPZiLfXwN5tEkytUk9Q3cOTV1SJcvw=";
cargoHash = "sha256-ZZLp3Vwq013MPxKy9gTZ1yMi2O0QcDPgFw5YnrYt90I=";
nativeInstallCheckInputs = [
versionCheckHook

View file

@ -0,0 +1,37 @@
diff --git a/add_trace_to_tabc.pl b/add_trace_to_tabc.pl
index 04be787..3186075 100644
--- a/add_trace_to_tabc.pl
+++ b/add_trace_to_tabc.pl
@@ -15,11 +15,11 @@
# COPYRIGHT
print <<EOF;
-extern elide_trace_reduce(int, int);
-extern elide_trace_shift(int,int);
-extern report_trace_shift(int);
-extern report_trace_reduce(int, int);
-extern report_trace_error(short *yyss, short *yyssp);
+extern void elide_trace_reduce(int, int);
+extern void elide_trace_shift(int,int);
+extern void report_trace_shift(int);
+extern void report_trace_reduce(int, int);
+extern void report_trace_error(short *yyss, short *yyssp);
EOF
while (<>) {
diff --git a/dfasyn/n2d.h b/dfasyn/n2d.h
index b2159ba..6c56abb 100644
--- a/dfasyn/n2d.h
+++ b/dfasyn/n2d.h
@@ -181,6 +181,10 @@ Expr * new_xor_expr(Expr *c1, Expr *c2);
Expr * new_cond_expr(Expr *c1, Expr *c2, Expr *c3);
Expr * new_sym_expr(char *sym_name);
+int yyparse(void);
+void yyerror(char *);
+int yylex(void);
+
void define_symbol(Evaluator *x, char *name, Expr *e);
void define_result(Evaluator *x, char *string, Expr *e, int early);
void define_symresult(Evaluator *x, char *string, Expr *e, int early);

View file

@ -7,17 +7,23 @@
perl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "jbofihe";
version = "0.43";
src = fetchFromGitHub {
owner = "lojban";
repo = "jbofihe";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98";
};
patches = [
# fix build with gcc14:
# https://github.com/lojban/jbofihe/pull/19
./fix-gcc14-errors.patch
];
nativeBuildInputs = [
bison
flex
@ -31,10 +37,10 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
meta = with lib; {
meta = {
description = "Parser & analyser for Lojban";
homepage = "https://github.com/lojban/jbofihe";
license = licenses.gpl2Only;
maintainers = with maintainers; [ chkno ];
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ chkno ];
};
}
})

View file

@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "jjui";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "idursun";
repo = "jjui";
tag = "v${version}";
hash = "sha256-9o7I4qk0flaFlrO5fBuntJO3XSEWAM9WuoPEA/Y+LXE=";
hash = "sha256-2M69r3r4VeESymiJzLr2tfKBsmTcAZJsCLEYQkRKoMw=";
};
vendorHash = "sha256-YlOK+NvyH/3uvvFcCZixv2+Y2m26TP8+ohUSdl3ppro=";

View file

@ -0,0 +1,29 @@
{
buildGoModule,
fetchFromGitHub,
lib,
nix-update-script,
}:
buildGoModule {
pname = "jqfmt";
version = "0-unstable-2024-08-15";
src = fetchFromGitHub {
owner = "noperator";
repo = "jqfmt";
rev = "8fc6f864c295e6bd6b08f36f503b3d809270da61";
hash = "sha256-tvFp1SJeosJdCHs3c+vceBfacypJc/aFYSj55mBfkB8=";
};
vendorHash = "sha256-avpZSgQKFZxLmYGj+2Gi+wSDHnAgF0/hyp4HtoQ0ZCo=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
meta = {
description = "Like gofmt, but for jq";
homepage = "https://github.com/noperator/jqfmt";
license = lib.licenses.mit; # Doesn't have Licence file, but Readme points to MIT
maintainers = with lib.maintainers; [ heisfer ];
mainProgram = "jqfmt";
};
}

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "katana";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "katana";
tag = "v${version}";
hash = "sha256-cRzLJcX7U9jhKMYnpOyo8S8hN6cIeUYFElcmOqbv0GY=";
hash = "sha256-KwnGEWWrWpano+5gSG0YO4UE2ceKvgXmrtlhlda2xq4=";
};
vendorHash = "sha256-NaPVrgFbw77kxl2sw1nHhqr1ePn5TYhS2rS0et7qJKs=";
vendorHash = "sha256-L7ycSzLbZUJ/4E+2lyN52xQFOJoxiRopgTfJkflFP9Q=";
subPackages = [ "cmd/katana" ];

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "kube-review";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "anderseknert";
repo = "kube-review";
tag = "v${version}";
hash = "sha256-0wDapaV1e6QNZWeHG86t12iu1yW1LW6mnpdWIrwvBFk=";
hash = "sha256-W+JF8MR+x6vova6hRw0omXXhT40qXmdZciAdt2bi6jM=";
};
vendorHash = "sha256-lzhjIX+67S+68erlJNHVXMKgRFUUyG+ymZEKVKRRpRc=";
vendorHash = "sha256-xHiHeSoiT/5h8pHTBTq1g/zJtnCbcUs+qMJ4vHjWzog=";
ldflags = [
"-X github.com/anderseknert/kube-review/cmd.version=v${version}"
];

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "kubelogin";
version = "0.2.7";
version = "0.2.8";
src = fetchFromGitHub {
owner = "Azure";
repo = pname;
rev = "v${version}";
sha256 = "sha256-upToPltob3P8EwDUbl9F3COGCxnz6NZNrZ/wxv5pBQU=";
sha256 = "sha256-aajo43ysA/ItOxFxZbw1i7VQpEm4aqfXFiMUTZt3QDk=";
};
vendorHash = "sha256-d4zXjMr34DUXHNBe8jGhlQ/gdsaR2hGWxZEfUKXvKCQ=";
vendorHash = "sha256-fILOPZnSsEX9f1nWxC1jTN2wNGmlz15fFmeVvXMA25w=";
ldflags = [
"-X main.gitTag=v${version}"

View file

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "kubeshark";
version = "52.6.0";
version = "52.7.0";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = "v${version}";
hash = "sha256-Mxj42D+MxYn0/csI/ZsMdU8xOz8P/IzsHr7vtmlQPa0=";
hash = "sha256-D3mHLYN6OVk7f1MCCWqSg/3qeg83EHcpqvkm1UTOaaM=";
};
vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo=";

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "lacus";
version = "1.13.1";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "ail-project";
repo = "lacus";
tag = "v${version}";
hash = "sha256-M9ZRlvQvDV5eiWOHh3LgezIN5gUgJ6w24OEo4RArip8=";
hash = "sha256-fk6NfBdUGGyOhVOJcGCRNldcw4JRHFr7p+tFuccYp7Y=";
};
pythonRelaxDeps = [

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.159.1";
version = "1.159.3";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-ASEGwcmSlUgR69wqc3h53abmKObowuVC6CFP2G+H/0s=";
hash = "sha256-ghUPbHwOEND/ab8PELCJn3ADBWBe2v8u5xMrp9wiwjY=";
};
patches = [
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-gu0Cxaw+Lpu2mGqX0lFTmK1MWHt0icM8BbA1yiKVpzs=";
hash = "sha256-S46y3By/81qEOY54JqMJtnb6zXvd+e7PG4THmxPRQcY=";
};
nativeBuildInputs =

View file

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "libmaddy-markdown";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "progsource";
repo = "maddy";
tag = finalAttrs.version;
hash = "sha256-cc0RggNYn0wZpeCn5QU9C+sqv7CTJkiQVB3LSQ/3YQw=";
hash = "sha256-FlERT2A5bxvLElBcqHCFTORFRK04rJjvRYguqZ+foVo=";
};
dontBuild = true;

View file

@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "mainsail";
version = "2.13.2";
version = "2.14.0";
src = fetchFromGitHub {
owner = "mainsail-crew";
repo = "mainsail";
rev = "v${version}";
hash = "sha256-rXavUkoFRw5fWCisdz/eD+wL1Sc+vExyjskVEIN4QNQ=";
hash = "sha256-hZgENY1Vb0wr6fqQfodjXQ+a/JAca0AQFKHlTc4EG68=";
};
npmDepsHash = "sha256-MzPXDy9sX7Y5dUm3qp3OORdEz8QyL5j4M4eXl0gtopo=";
npmDepsHash = "sha256-9pkcQS281OC9q9WadctQ/GAgbaeejrj7HLwKK/SDkAU=";
# Prevent Cypress binary download.
CYPRESS_INSTALL_BINARY = 0;

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2025-04-08T15-39-49Z";
version = "2025-04-16T18-13-26Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-H/iIlzdOLcE2xn96FuyyFcXC0is94MUYbfjA5b/hEqg=";
sha256 = "sha256-23shNQWVIuTLL0FLM00919JaT2QR4R0ou5ZA2/mQ4PA=";
};
vendorHash = "sha256-0Lfjhd4DlIpnbMp/4gObgeO9L1QC03FhJbFDLXW6UOQ=";
vendorHash = "sha256-MpLQZFrf2sBAweXtYeFi5j6p6GaXuN99x+r4UK8D9xM=";
subPackages = [ "." ];

View file

@ -0,0 +1,77 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
libsForQt5,
writableTmpDirAsHomeHook,
ffmpeg-headless,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mlv-app";
version = "1.15";
src = fetchFromGitHub {
owner = "ilia3101";
repo = "MLV-App";
rev = "QTv${finalAttrs.version}";
hash = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8=";
};
patches = [
(fetchpatch {
url = "https://github.com/ilia3101/MLV-App/commit/b7643b1031955f085ade30e27974ddd889a4641f.patch";
hash = "sha256-DQkoB+fjshWDLzKouhEQXzpqn78WL+eqo5oTfE9ltEk=";
})
];
postPatch = ''
substituteInPlace platform/qt/MainWindow.cpp \
--replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg-headless}"'
'';
qmakeFlags = [ "MLVApp.pro" ];
preConfigure = ''
cd platform/qt/
'';
nativeBuildInputs = [
libsForQt5.wrapQtAppsHook
libsForQt5.qmake
writableTmpDirAsHomeHook
];
buildInputs = [
libsForQt5.qtmultimedia
libsForQt5.qtbase
];
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/mlvapp"
'';
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin mlvapp
install -Dm444 -t $out/share/applications mlvapp.desktop
install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
runHook postInstall
'';
updateScript = nix-update-script { };
meta = {
description = "All in one MLV processing app that is pretty great";
homepage = "https://mlv.app";
downloadPage = "https://github.com/ilia3101/MLV-App";
changelog = "https://github.com/ilia3101/MLV-App/releases/tag/QTv${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "mlvapp";
};
})

View file

@ -35,13 +35,13 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "moonraker";
version = "0.9.3-unstable-2025-04-03";
version = "0.9.3-unstable-2025-04-22";
src = fetchFromGitHub {
owner = "Arksine";
repo = "moonraker";
rev = "7cdcca3cb4b7caf27d511d1c4e32fa3297391709";
sha256 = "sha256-fjmbmv+0y/NsgvrscaA2gv9Tv8esWiMpbA35LuzFfFg=";
rev = "1c124149720e24f52b80ce82ce906e69476b7724";
sha256 = "sha256-+Yk0TBU8dIa9mf0s+F+mTop8jLxdVDDCP8ST8pRgCiY=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -7,13 +7,13 @@
}:
buildGoModule rec {
pname = "mpls";
version = "0.13.3";
version = "0.14.0";
src = fetchFromGitHub {
owner = "mhersson";
repo = "mpls";
tag = "v${version}";
hash = "sha256-sr0NZGQoaJw8LYJy13iNNos06KDHXNPbYSw3UAHi6eg=";
hash = "sha256-z3miAbL3qQHusWoofUp8kNNZjoGANhPjeIj39KPYyvc=";
};
vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE=";

View file

@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "nextcloud-client";
version = "3.16.2";
version = "3.16.3";
outputs = [
"out"
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "nextcloud-releases";
repo = "desktop";
tag = "v${version}";
hash = "sha256-CBGvASIPN5xB2kgSDXg2vWpnsFBD3c3wudUAL6u64U8=";
hash = "sha256-C/IfCNOFsSnpJMVSVhOkfx1F2IhOM8ntgdKjr7MKdkc=";
};
patches = [

View file

@ -5,18 +5,18 @@
}:
rustPlatform.buildRustPackage rec {
pname = "pay-respects";
version = "0.7.5";
version = "0.7.6";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "iff";
repo = "pay-respects";
rev = "v${version}";
hash = "sha256-NmFuu6uS8maAoN9U2ZdEyeJeozR3ubhoMrhvWKDxbMI=";
hash = "sha256-+50MKpZgJqjuUvJeFFv8fMILkJ3cOAN7R7kmlR+98II=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-xqq4PXvon6edjJ4VhrhXD8QtDGWlMeJnl8mnH8rdIvU=";
cargoHash = "sha256-TJP+GPkXwPvnBwiF0SCkn8NGz/xyrYjbUZKCbUUSqHQ=";
meta = {
description = "Terminal command correction, alternative to `thefuck`, written in Rust";

View file

@ -24,7 +24,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "pdm";
version = "2.22.3";
version = "2.24.1";
pyproject = true;
disabled = python.pkgs.pythonOlder "3.8";
@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
owner = "pdm-project";
repo = "pdm";
tag = version;
hash = "sha256-+qUvVQJO/xfBZJuMBezu/LdKhKag1BCQ3To2qFXiOzY=";
hash = "sha256-YChgPJmHWJ4tftosa24SKB0J7uV/zR6VWX18poEEsLY=";
};
pythonRelaxDeps = [ "hishel" ];
@ -67,6 +67,7 @@ python.pkgs.buildPythonApplication rec {
tomlkit
truststore
unearth
id
virtualenv
]
++ httpx.optional-dependencies.socks;
@ -118,6 +119,9 @@ python.pkgs.buildPythonApplication rec {
"test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV"
"test_build_distributions"
"test_init_project_respect"
"test_use_python_write_file_multiple_versions"
"test_repository_get_token_from_oidc"
"test_repository_get_token_misconfigured_github"
];
__darwinAllowLocalNetworking = true;

View file

@ -7,13 +7,13 @@
buildGoModule {
pname = "pkgsite";
version = "0-unstable-2025-04-16";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "0a075a2cae6ac8ff829d0d7c7841d064d6833167";
hash = "sha256-kYmxR6ZzlHDBeAYFDlUN5EcgRDpB/S00Xx3N1MbKsIk=";
rev = "e863a039941fdd1a92fb694c3d9b3bb0ea0ba257";
hash = "sha256-wb451BDpKT404oMmyOXuZBGM7rWLiWJHTRTtphOgx9g=";
};
vendorHash = "sha256-JoPuNktN4OsdNJ0e8BRuuD0CKuWiFsAcLAS5h9rH/Z0=";

View file

@ -31,7 +31,7 @@ let
in
stdenv.mkDerivation rec {
pname = "powershell";
version = "7.5.0";
version = "7.5.1";
src =
passthru.sources.${stdenv.hostPlatform.system}
@ -92,19 +92,19 @@ stdenv.mkDerivation rec {
sources = {
aarch64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
hash = "sha256-EHv+NRyyMdIv+qwUpgJc/s7ONzW9ff8RZwWJ/V1+49U=";
hash = "sha256-0fAWzM5acQbjYJC/E65xtGEV8lZGWu4Hdgsm5gf00DM=";
};
aarch64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
hash = "sha256-o7ah0UiXl0rqcy2ClwyG3Rf/xXpfxPS/q/4t0nL/bEA=";
hash = "sha256-h5Y93+/2rHJmv/vgIbCK2u0mStSjq5Nqgg5tf0Wp7oo=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
hash = "sha256-9LxQACnZggsVxn+IXGWrvuCqlE8wV+XZng+GWMYA/Zs=";
hash = "sha256-SwXo6jVSZhFKmm8/A0yosaKamLGhbKYL2OVLNf+horM=";
};
x86_64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
hash = "sha256-frsASKOACd5aWdYgoQ8z17pJIKziN5sQSmf6+3nihBs=";
hash = "sha256-u5tff4BgAHNU112pL8ZDDHe6B0z4G/ohVvG6Nz/0d+U=";
};
};
tests.version = testers.testVersion {

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qtorganizer-mkcal";
version = "0-unstable-2025-02-19";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "dcaliste";
repo = "qtorganizer-mkcal";
rev = "312412de3f810fbedc7c4f27bd33adb2c3fbe967";
hash = "sha256-uv2cEs84bM614vg5K+t4vyXas+1b5Jm39tfGSwWj6n0=";
rev = "45906b1df8ad758a824369873f423d9e0c457fbf";
hash = "sha256-sgYCO8LxBFhMkjGnKVvOx2d4hyw9Oa5lbu6LKhuwl8s=";
};
postPatch = ''

View file

@ -7,7 +7,7 @@
rainfrog,
}:
let
version = "0.3.0";
version = "0.3.1";
in
rustPlatform.buildRustPackage {
inherit version;
@ -17,11 +17,11 @@ rustPlatform.buildRustPackage {
owner = "achristmascarl";
repo = "rainfrog";
tag = "v${version}";
hash = "sha256-dBsL91BK/OkLimBUnqOQu/bBqxNIjnZY5oI0lwMkfDo=";
hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-C5Wn/Qe+VSCFEma7IAmxGK2t2xugWOt2BaF7izsCU+I=";
cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys=";
passthru = {
tests.version = testers.testVersion {

View file

@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "release-plz";
version = "0.3.132";
version = "0.3.133";
src = fetchFromGitHub {
owner = "MarcoIeni";
repo = "release-plz";
rev = "release-plz-v${version}";
hash = "sha256-J2ViqVJEBGBiKfG9S7/p5RNjFNNp0A6b3Htv5c0On6M=";
hash = "sha256-WxuW5qz8ACaKoLOiKug1BRGiMqgS8fv1lL6gmJFdlRE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-z67GXNJ9QSRIafTCeVjr0T+EYdcT/Blr7pBGQJgobdc=";
cargoHash = "sha256-xWvQfPqLIisHtn1yxXkPcPlZGb0AV/e8aFbihxCQ8zA=";
nativeBuildInputs = [
installShellFiles

View file

@ -34,13 +34,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rerun";
version = "0.23.0";
version = "0.23.1";
src = fetchFromGitHub {
owner = "rerun-io";
repo = "rerun";
tag = finalAttrs.version;
hash = "sha256-ZMvX/9kz+tEiQ01GO7B+/wdxxkFkuExR9jA2KROIbgw=";
hash = "sha256-P4PNGguBlHlVRlABNDZGxdAKL0NkoROrcR+7+q7Ln4Q=";
};
# The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-2BMBfEunRRMX4++w0Fg9wTAeEmODtOTcruXCO9JKreo=";
cargoHash = "sha256-1DNrgptSeggyxS/JFaFinS2RqpKVJ8SoGgLtffaS9HU=";
cargoBuildFlags = [ "--package rerun-cli" ];
cargoTestFlags = [ "--package rerun-cli" ];

View file

@ -9,7 +9,7 @@
let
baseName = "scalafmt";
version = "3.9.2";
version = "3.9.4";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@ -19,7 +19,7 @@ let
cp $(< deps) $out/share/java/
'';
outputHashMode = "recursive";
outputHash = "sha256-IACG6fiunbLP5wLPMePpk0QQnDS18ale+Lppri4jBmU=";
outputHash = "sha256-F2906HrBEiCnv+7OfoFbLsIK1lJiE0cQCyjJ0EivSI0=";
};
in
stdenv.mkDerivation {

View file

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "slackdump";
version = "3.0.10";
version = "3.1.1";
src = fetchFromGitHub {
owner = "rusq";
repo = "slackdump";
tag = "v${version}";
hash = "sha256-+Q79DauC+hnUCxBa9muVsq03D9ph7lEB5pmU7ujv3Mo=";
hash = "sha256-DBIBOHoQIUp2WXj50w2ixhB9W8qBzdrBmNCKSuAJMGk=";
};
nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@ -32,7 +32,7 @@ buildGoModule rec {
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
];
vendorHash = "sha256-qtvUhxbkElMa6qrkicNrPn9Boh65sAH/vZn/FeO9o9A=";
vendorHash = "sha256-TEeYHT2jvU0ioMb3h/xjUg1fISsi5oHY5xKEcHwhC0Y=";
__darwinAllowLocalNetworking = true;

View file

@ -13,7 +13,7 @@
python3Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.8.0";
version = "8.8.1";
pyproject = true;
@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
tag = version;
hash = "sha256-54UOXEH3DxT1P/CRi09gEoq9si+x/1GHFuWRIyEvz3E=";
hash = "sha256-gn2roiwNLUFJsuen2qGPvl4DyE6gPUQibS1Cn7cj2L8=";
};
patches = [

View file

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "sshs";
version = "4.5.1";
version = "4.7.2";
src = fetchFromGitHub {
owner = "quantumsheep";
repo = "sshs";
rev = version;
hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc=";
hash = "sha256-Xr1S6KSw3a/+TIrw2hUPpUOd22+49YMuGK2TVxfwPHU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-U1E11NB+MVte31hfSAwhzXsId7U5uGy5C6Ubk6RPNvA=";
cargoHash = "sha256-Py85+zv54KHFXjhiThTPXgJQmCImXN42ePOjazjzxIQ=";
passthru.tests.version = testers.testVersion { package = sshs; };

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "texstudio";
version = "4.8.6";
version = "4.8.7";
src = fetchFromGitHub {
owner = "texstudio-org";
repo = "texstudio";
rev = finalAttrs.version;
hash = "sha256-PvxzG4VPhCmwc/Kh5g85fV/Mc7ih08pt/zUNBgldZiI=";
hash = "sha256-/0f8SIzF5OnVYfxS6Cb7VbN+IMc4VzCxfA7p93iQJ/w=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,36 @@
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "tombl";
version = "0.2.3";
src = fetchFromGitHub {
owner = "snyball";
repo = "tombl";
tag = "v${version}";
hash = "sha256-XHvAgJ8/+ZkBxwZpMgaDchr0hBa1FXAd/j1+HH9N6qw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Easily query TOML files from bash";
homepage = "https://github.com/snyball/tombl";
changelog = "https://github.com/snyball/tombl/releases/tag/v${version}";
mainProgram = "tombl";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ oskardotglobal ];
};
}

View file

@ -20,6 +20,8 @@ buildGoModule rec {
vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4=";
ldflags = [
"-s"
"-w"
"-X github.com/p4gefau1t/trojan-go/constant.Version=v${version}"
"-X github.com/p4gefau1t/trojan-go/constant.Commit=v${version}"
];

View file

@ -0,0 +1,41 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "unshieldv3";
version = "0.2.2";
src = fetchFromGitHub {
owner = "wfr";
repo = "unshieldv3";
tag = "v${finalAttrs.version}";
sha256 = "sha256-ScUlKuvkq4UglEVJL8NreAGDZFLVrEpEBQCZvu7XOrg=";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
postCheck = ''
for i in $src/test-data/*.Z; do
mkdir -p test
./unshieldv3 extract $i test
done
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Tool to extract .Z files from InstallShield V3 (Z) installers";
homepage = "https://github.com/wfr/unshieldv3";
changelog = "https://github.com/wfr/unshieldv3/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "unshieldv3";
maintainers = [ lib.maintainers.jchw ];
};
})

View file

@ -11,16 +11,16 @@ let
in
stdenv.mkDerivation rec {
pname = "urbit";
version = "3.1";
version = "3.2";
src = fetchzip {
url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
sha256 =
{
x86_64-linux = "sha256-51Zgv9QANQVMk/dc7/heYmCNfeu4k7mrYNke1/oz/94=";
aarch64-linux = "sha256-Tdn/ve9iCjsY/b39TZ7ErHV14mIAHdtmycgUPIzRihQ=";
x86_64-darwin = "sha256-y/FQIVcEn6dLWXPztC34+7+5eDMO7Xcx25D2+0p7Mxk=";
aarch64-darwin = "sha256-YJGRZlpTdm1x4P+GnZiKC1411tcEX+Jdnm+iyxUlsU0=";
x86_64-linux = "sha256-T5d9C2JSmN5y1PSpHLofTKOr32VxLDwjYH9UD0+wAXM=";
aarch64-linux = "sha256-wUVqz3VPJ/ZEkS+6MJbbSqqS9vhHPGxTdAty5mIyKgA=";
x86_64-darwin = "sha256-uPBTkOCZCpG3mb0D6S710vxaGRAaly5d3UHL1j/+uzo=";
aarch64-darwin = "sha256-wfgk3+Z16FThXJdD34vxitXYx/4TdwqboMlXs5IAFDs=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

View file

@ -4,7 +4,7 @@
set -euo pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
NIX_DRV="$ROOT/default.nix"
NIX_DRV="$ROOT/package.nix"
if [ ! -f "$NIX_DRV" ]; then
echo "ERROR: cannot find urbit in $ROOT"
exit 1

View file

@ -9,12 +9,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20250415151718";
version = "20250422055726";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-Q6/ZWwbsR8dFL6uBRFXKkuMGuWgH/VwHN3qxETbPq4k=";
hash = "sha256-mKnZOvFHzUNndbLDY9c9RCxtQQaELrHB4iHMvwucgzE=";
};
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
meta = with lib; {

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "wakatime-cli";
version = "1.112.1";
version = "1.115.1";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-cli";
tag = "v${version}";
hash = "sha256-J8hEQkTCaJhYYnuO8J2Tvgm/lWuPKHubKESb7WPzzkk=";
hash = "sha256-vvJzYUL9lGPxe2XzeooDJ09jT3/Zv5x8rf6T7Byb7TY=";
};
vendorHash = "sha256-Zy54fGyTvLfrFEiPIcNtx25EqaIaYq46DYBpbZXfOFQ=";
vendorHash = "sha256-1yqpz3DqWHXw3ihh7YAKtl5Co91VAbBMRu68S/igrMc=";
ldflags = [
"-s"

View file

@ -0,0 +1,72 @@
{
lib,
blueprint-compiler,
desktop-file-utils,
fetchFromGitHub,
flatpak,
flatpak-xdg-utils,
glib,
gobject-introspection,
gtk4,
libadwaita,
meson,
ninja,
nix-update-script,
pkg-config,
python3,
stdenv,
wrapGAppsHook4,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "warehouse";
version = "2.0.2";
src = fetchFromGitHub {
owner = "flattool";
repo = "warehouse";
tag = finalAttrs.version;
hash = "sha256-EcpHFS0EczUDFs0A/7IuNs1082hsuuS0J6wxSq47vaQ=";
};
nativeBuildInputs = [
blueprint-compiler
desktop-file-utils
meson
ninja
pkg-config
wrapGAppsHook4
gobject-introspection
];
buildInputs = [
flatpak
flatpak-xdg-utils
glib
gtk4
libadwaita
(python3.withPackages (
ps: with ps; [
pygobject3
]
))
];
preFixup = ''
gappsWrapperArgs+=(
--suffix PATH : "${lib.makeBinPath [ flatpak-xdg-utils ]}"
)
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/flattool/warehouse/releases/tag/${finalAttrs.version}";
description = "Manage all things Flatpak";
homepage = "https://github.com/flattool/warehouse";
license = lib.licenses.gpl3Plus;
mainProgram = "warehouse";
maintainers = with lib.maintainers; [ michaelgrahamevans ];
platforms = lib.platforms.linux;
};
})

View file

@ -19,8 +19,9 @@
autoPatchelfHook,
wayland-scanner,
rust-bindgen,
nix-update-script,
}:
llvmPackages.stdenv.mkDerivation rec {
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "waypipe";
version = "0.10.4";
@ -28,11 +29,11 @@ llvmPackages.stdenv.mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-O47b1CHCEwUSigjk0Ml3uLhRRxcPC6Phj2cnIlX1Hkg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
inherit (finalAttrs) pname version src;
hash = "sha256-c561GpU2XENILSzk0Zka0qrtXZm7xaq/hiJA4Iv++QI=";
};
@ -69,7 +70,9 @@ llvmPackages.stdenv.mkDerivation rec {
vulkan-loader
];
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Network proxy for Wayland clients (applications)";
longDescription = ''
waypipe is a proxy for Wayland clients. It forwards Wayland messages and
@ -77,10 +80,10 @@ llvmPackages.stdenv.mkDerivation rec {
makes application forwarding similar to ssh -X feasible.
'';
homepage = "https://mstoeckl.com/notes/gsoc/blog.html";
changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ mic92 ];
changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${finalAttrs.version}";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ mic92 ];
mainProgram = "waypipe";
};
}
})

View file

@ -18,12 +18,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "winbox";
version = "4.0beta19";
version = "4.0beta20";
src = fetchurl {
name = "WinBox_Linux-${finalAttrs.version}.zip";
url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip";
hash = "sha256-+hDhQT09mKaO65TK0AF6+o/FdmgdlNm1qUSkWZybj9s=";
hash = "sha256-mU+z7yRYKXnGAXHB5LS5SVUgIzRlR9nV2FzXispntF0=";
};
sourceRoot = ".";

View file

@ -5,6 +5,7 @@
fetchurl,
cmake,
nasm,
fetchpatch2,
# NUMA support enabled by default on NUMA platforms:
numaSupport ? (
@ -25,6 +26,9 @@
unittestsSupport ? stdenv.hostPlatform.isx86_64, # Unit tests - only testing x64 assembly
vtuneSupport ? false, # Vtune profiling instrumentation
werrorSupport ? false, # Warnings as errors
# NEON support is always enabled for aarch64
# this flag is only needed for armv7.
neonSupport ? false, # force enable the NEON fpu support for arm v7 CPUs
}:
let
@ -49,9 +53,18 @@ stdenv.mkDerivation rec {
hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk=";
};
patches = [
./darwin-__rdtsc.patch
];
patches =
[
./darwin-__rdtsc.patch
]
# TODO: remove after update to version 4.2
++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [
(fetchpatch2 {
url = "https://bitbucket.org/multicoreware/x265_git/commits/ddb1933598736394b646cb0f78da4a4201ffc656/raw";
hash = "sha256-ZH+jbVtfNJ+CwRUEgsnzyPVzajR/+4nDnUDz5RONO6c=";
stripLen = 1;
})
];
sourceRoot = "x265_${version}/source";
@ -88,7 +101,13 @@ stdenv.mkDerivation rec {
# Clang does not support the endfunc directive so use GCC.
++ lib.optional (
stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc";
) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"
# Neon support
++ lib.optionals (neonSupport && stdenv.hostPlatform.isAarch32) [
"-DENABLE_NEON=ON"
"-DCPU_HAS_NEON=ON"
"-DENABLE_ASSEMBLY=ON"
];
cmakeStaticLibFlags =
[

View file

@ -0,0 +1,39 @@
{
lib,
stdenv,
fetchFromGitHub,
zig_0_13,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zigimports";
version = "0.1.0";
src = fetchFromGitHub {
owner = "tusharsadhwani";
repo = "zigimports";
tag = "v${finalAttrs.version}";
hash = "sha256-2cri+5mhhTQqlkv9db/3CQ3rCMq4yW4drMoRTZBhndE=";
};
nativeBuildInputs = [
zig_0_13.hook
];
# Remove the system suffix on the program name.
postInstall = ''
mv $out/bin/zigimports{*,}
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Automatically remove unused imports and globals from Zig files";
homepage = "https://github.com/tusharsadhwani/zigimports";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.jmbaur ];
mainProgram = "zigimports";
inherit (zig_0_13.meta) platforms;
};
})

View file

@ -8,13 +8,13 @@
buildGoModule {
pname = "zoekt";
version = "3.7.2-2-unstable-2025-04-15";
version = "3.7.2-2-unstable-2025-04-22";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "zoekt";
rev = "0978c13fb6683be9908ee1a578360734e61cc8b5";
hash = "sha256-1Ris2GsZnHHrxvXxOCRSPvvk35YEhqDxNHkd7cjv0YY=";
rev = "45c1f08d3942c955f2ef0934518aafca5238df28";
hash = "sha256-Iy+5Of6Y4phATJrb3Hd8m9N9iDPkOA8Hgkyrir5x+Hg=";
};
vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo=";

View file

@ -1,19 +1,21 @@
{
fetchFromGitHub,
rebar3Relx,
lib,
rebar3Relx,
}:
rebar3Relx rec {
pname = "erlfmt";
version = "1.6.1";
version = "1.6.2";
releaseType = "escript";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "erlfmt";
sha256 = "sha256-O7+7dMgmnNd9hHuRcJqMAI0gmONz5EO3qSlUC3tufh0=";
rev = "v${version}";
hash = "sha256-tBgDCMPYXaAHODQ2KOH1kXmd4O31Os65ZinoU3Bmgdw=";
tag = "v${version}";
};
meta = with lib; {
homepage = "https://github.com/WhatsApp/erlfmt";
description = "Automated code formatter for Erlang";

View file

@ -396,6 +396,12 @@ stdenv.mkDerivation {
passthru = {
inherit (libglvnd) driverLink;
inherit llvmPackages;
inherit
eglPlatforms
galliumDrivers
vulkanDrivers
vulkanLayers
;
# for compatibility
drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" mesa;

View file

@ -2,50 +2,149 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
octave ? null,
libiconv,
}:
nix-update-script,
# Optionally build Python bindings
withPython ? false,
python3,
python3Packages,
# Optionally build Octave bindings
withOctave ? false,
octave,
# Optionally build Java bindings
withJava ? false,
jdk,
# Required for building the Python and Java bindings
swig,
# Optionally exclude Luksan solvers to allow licensing under MIT
withoutLuksanSolvers ? false,
# Build static on-demand
withStatic ? stdenv.hostPlatform.isStatic,
stdenv.mkDerivation rec {
# v2.8.0 introduced a regression where testing on Linux platforms fails with a buffer overflow
# when compiled with -D_FORTIFY_SOURCE=3.
# This was deemed to be a compiler false positive by the library's author in https://github.com/stevengj/nlopt/issues/563.
# Building with `clangStdenv` prevents this from occurring.
clangStdenv,
}:
let
buildPythonBindingsEnv = python3.withPackages (p: [ p.numpy ]);
buildDocsEnv = python3.withPackages (p: [
p.mkdocs
p.python-markdown-math
]);
in
clangStdenv.mkDerivation (finalAttrs: {
pname = "nlopt";
version = "2.7.1";
version = "2.10.0";
src = fetchFromGitHub {
owner = "stevengj";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TgieCX7yUdTAEblzXY/gCN0r6F9TVDh4RdNDjQdXZ1o=";
repo = "nlopt";
tag = "v${finalAttrs.version}";
hash = "sha256-mZRmhXrApxfiJedk+L/poIP2DR/BkV04c5fiwPGAyjI=";
};
nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
buildInputs = [ octave ];
outputs = [
"out"
"doc"
];
configureFlags =
[
"--with-cxx"
"--enable-shared"
"--with-pic"
"--without-guile"
"--without-python"
"--without-matlab"
patches = [
# 26-03-2025: `mkdocs.yml` is missing a link for the subpage related to the Java bindings.
# 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made
# 26-03-2025: part of a release.
(fetchpatch {
name = "missing-java-reference-mkdocs";
url = "https://github.com/stevengj/nlopt/commit/7e34f1a6fe82ed27daa6111d83c4d5629555454b.patch";
hash = "sha256-XivfZtgIGLyTtU+Zo2jSQAx2mVdGLJ8PD7VSSvGR/5Q=";
})
# 26-03-2025: The docs pages still list v2.7.1 as the newest version.
# 26-03-2025: This commit was merged after v2.10.0 was released, and has not been made
# 26-03-2025: part of a release.
(fetchpatch {
name = "update-index-md";
url = "https://github.com/stevengj/nlopt/commit/2c4147832eff7ea15d0536c82351a9e169f85e43.patch";
hash = "sha256-BXcbNUyu20f3N146v6v9cpjSj5CwuDtesp6lAqOK2KY=";
})
# 26-03-2025: There is an off-by-one error in the test/CMakeLists.txt
# 26-03-2025: that causes the tests to attempt to run disabled Luksan solver code,
# 26-03-2025: which in turn causes the test suite to fail.
# 26-03-2025: See https://github.com/stevengj/nlopt/pull/605
(fetchpatch {
name = "fix-nondisabled-luksan-algorithm";
url = "https://github.com/stevengj/nlopt/commit/7817ec19f21be6877a4b79777fc5315a52c6850b.patch";
hash = "sha256-KgdAMSYKOQuraun4HNr9GOx48yjyeQk6W3IgWRA44oo=";
})
];
postPatch = ''
substituteInPlace nlopt.pc.in \
--replace-fail 'libdir=''${exec_prefix}/@NLOPT_INSTALL_LIBDIR@' 'libdir=@NLOPT_INSTALL_LIBDIR@'
'';
nativeBuildInputs =
[ cmake ]
## Building the python bindings requires SWIG, and numpy in addition to the CXX routines.
## The tests also make use of the same interpreter to test the bindings.
++ lib.optionals withPython [
swig
buildPythonBindingsEnv
]
++ lib.optionals (octave != null) [
"--with-octave"
"M_INSTALL_DIR=$(out)/${octave.sitePath}/m"
"OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct"
];
## Building the java bindings requires SWIG, C++, JNI and Java
++ lib.optionals withJava [
swig
jdk
]
## Building octave bindings requires `mkoctfile` to be installed.
++ lib.optional withOctave octave;
# Python bindings depend on numpy at import time.
propagatedBuildInputs = lib.optional withPython python3Packages.numpy;
cmakeFlags =
[
(lib.cmakeBool "BUILD_SHARED_LIBS" (!withStatic))
(lib.cmakeBool "NLOPT_CXX" true)
(lib.cmakeBool "NLOPT_PYTHON" withPython)
(lib.cmakeBool "NLOPT_OCTAVE" withOctave)
(lib.cmakeBool "NLOPT_JAVA" withJava)
(lib.cmakeBool "NLOPT_SWIG" (withPython || withJava))
(lib.cmakeBool "NLOPT_FORTRAN" false)
(lib.cmakeBool "NLOPT_MATLAB" false)
(lib.cmakeBool "NLOPT_GUILE" false)
(lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers))
(lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
]
++ lib.optional withPython (
lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
);
postBuild = ''
${buildDocsEnv.interpreter} -m mkdocs build \
--config-file ../mkdocs.yml \
--site-dir $doc \
--no-directory-urls
'';
doCheck = true;
postFixup = ''
substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \
substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace-fail \
'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "'
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://nlopt.readthedocs.io/en/latest/";
changelog = "https://github.com/stevengj/nlopt/releases/tag/v${finalAttrs.version}";
description = "Free open-source library for nonlinear optimization";
license = lib.licenses.lgpl21Plus;
hydraPlatforms = lib.platforms.linux;
license = if withoutLuksanSolvers then lib.licenses.mit else lib.licenses.lgpl21Plus;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.bengsparks ];
};
}
})

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "curated-tokenizers";
version = "0.0.9";
version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "explosion";
repo = "curated-tokenizers";
tag = "v${version}";
hash = "sha256-P8kpPnaU3el7sc/vUn4waQN+JV7F9b49i6BtC4BFfIg=";
hash = "sha256-VkDV/9c5b8TzYlthCZ38ufbrne4rihtkmkZ/gyAQXLE=";
fetchSubmodules = true;
};
@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Lightweight piece tokenization library";
homepage = "https://github.com/explosion/curated-tokenizers";
changelog = "https://github.com/explosion/curated-tokenizers/releases/tag/v${version}";
changelog = "https://github.com/explosion/curated-tokenizers/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
};

View file

@ -2,12 +2,13 @@
lib,
buildPythonPackage,
fetchPypi,
hatchling,
}:
buildPythonPackage rec {
pname = "deep-chainmap";
version = "0.1.2";
format = "setuptools";
pyproject = true;
src = fetchPypi {
pname = "deep_chainmap";
@ -15,6 +16,8 @@ buildPythonPackage rec {
hash = "sha256-R7Pfh+1bYJ7LCU+0SyZi2XGOsgL1zWiMkp1z9HD1I1w=";
};
build-system = [ hatchling ];
# Tests are not published to pypi
doCheck = false;
@ -23,7 +26,7 @@ buildPythonPackage rec {
# See the guide for more information: https://nixos.org/nixpkgs/manual/#chap-meta
meta = with lib; {
description = "Recursive subclass of ChainMap";
homepage = "https://github.com/neutrinoceros/deep-chainmap";
homepage = "https://github.com/neutrinoceros/deep_chainmap";
license = licenses.mit;
maintainers = with maintainers; [ rehno-lindeque ];
};

View file

@ -37,6 +37,11 @@ buildPythonPackage rec {
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools<77.0.0" "setuptools"
'';
build-system = [ setuptools ];
pythonRelaxDeps = [

View file

@ -18,10 +18,10 @@ buildPythonPackage {
doCheck = false;
meta = with lib; {
meta = {
description = "Python bindings for FoundationDB";
homepage = "https://www.foundationdb.org";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ thoughtpolice ];
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ thoughtpolice ];
};
}

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "hf-xet";
version = "1.0.4";
version = "1.0.5";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "xet-core";
tag = "v${version}";
hash = "sha256-V1PeTgjVrJ4FquP/LkKnd8N41mca4zNPDP3M+dPbTyA=";
hash = "sha256-SBL2s5+hbB7G5Qzo/nF+PXp2zuce4HKWG2cgyY41G8I=";
};
sourceRoot = "${src.name}/hf_xet";

View file

@ -10,9 +10,11 @@
# dependencies
aiohttp,
docstring-parser,
jinja2,
jiter,
openai,
pydantic,
requests,
rich,
tenacity,
typer,
@ -22,7 +24,6 @@
diskcache,
fastapi,
google-generativeai,
jinja2,
pytest-asyncio,
pytestCheckHook,
python-dotenv,
@ -31,7 +32,7 @@
buildPythonPackage rec {
pname = "instructor";
version = "1.7.4";
version = "1.7.9";
pyproject = true;
disabled = pythonOlder "3.9";
@ -40,7 +41,7 @@ buildPythonPackage rec {
owner = "jxnl";
repo = "instructor";
tag = version;
hash = "sha256-TrNGTWnZShOYeMGonSEib7NiEbrwWNtujeWo2gaewf4=";
hash = "sha256-3IwvbepDrylOIlL+IteyFChqYc/ZIu6IieIkbAPL+mw=";
};
build-system = [ hatchling ];
@ -50,9 +51,11 @@ buildPythonPackage rec {
dependencies = [
aiohttp
docstring-parser
jinja2
jiter
openai
pydantic
requests
rich
tenacity
typer
@ -63,7 +66,6 @@ buildPythonPackage rec {
diskcache
fastapi
google-generativeai
jinja2
pytest-asyncio
pytestCheckHook
python-dotenv

View file

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "jupyterlab-git";
version = "0.51.0";
version = "0.51.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -29,7 +29,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "jupyterlab_git";
inherit version;
hash = "sha256-qWkkZsYgYq8uBZY2BJra3ef3H9ZWTOd6obdSaMYUF7M=";
hash = "sha256-t7zol5XVzojIqvDXnrepPQU1Yi+b5rAZyprk07mpymo=";
};
nativeBuildInputs = [

View file

@ -34,7 +34,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.6.1";
version = "2.6.2";
pyproject = true;
disabled = pythonOlder "3.9";
@ -43,7 +43,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "python";
tag = version;
hash = "sha256-FcvshADZVXIqq9dfNIozzhWT9h+3/b9BIOsveETVO74=";
hash = "sha256-v9Fr3J829x1KtzplzXF2yDYwra70xNcJfaHpyiNP4ME=";
};
pythonRelaxDeps = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "mkdocs-drawio-exporter";
version = "0.10.1";
version = "0.10.2";
pyproject = true;
disabled = !isPy3k;
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "mkdocs_drawio_exporter";
inherit version;
hash = "sha256-7DbJE5UHXRO3kQYM2HuzxQeEhWBKFE06WFSf5GTYGZ8=";
hash = "sha256-LbHnV6WLIgab6CrripZnnqc5kkVyF4E+Ls00h1bXjHc=";
};
build-system = [ poetry-core ];

View file

@ -0,0 +1,5 @@
{
toPythonModule,
pkgs,
}:
toPythonModule (pkgs.nlopt.override { withPython = true; })

View file

@ -3,37 +3,27 @@
buildPythonPackage,
docker,
fetchFromGitHub,
fetchpatch,
poetry-core,
pytest,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "pytest-docker-tools";
version = "3.1.3";
version = "3.1.9";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Jc2k";
repo = "pytest-docker-tools";
tag = version;
hash = "sha256-6F3aSUyDlBBYG1kwOQvey7rujDdK83uJ3Q1dr8Uo1pw=";
tag = "v${version}";
hash = "sha256-WYfgO7Ch1hCj9cE43jgI+2JEwDOzNvuMtkVV3PdMiBs=";
};
patches = [
# Switch to poetry-core, https://github.com/Jc2k/pytest-docker-tools/pull/48
(fetchpatch {
name = "switch-poetry-core.patch";
url = "https://github.com/Jc2k/pytest-docker-tools/pull/48/commits/a655e4a32b075e06e89dd907b06bc4ad90703988.patch";
hash = "sha256-CwCBld7p+bqBfxV9IyxcCvfxXfnUSzCLF2m0ZduIqkU=";
})
];
build-system = [ poetry-core ];
build-system = [ setuptools ];
buildInputs = [ pytest ];

View file

@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "pytorch-lightning";
version = "2.5.1";
version = "2.5.1.post0";
pyproject = true;
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "pytorch-lightning";
tag = version;
hash = "sha256-vGs+byt+/9tIMNYc2VmyN5vhj21ZFnaYsg4v2zeKzEM=";
hash = "sha256-Vp9RpoyqHiMw3BchmenXgfmmm95uIjuhkhyq1ZrBiiI=";
};
preConfigure = ''

View file

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "qbittorrent-api";
version = "2025.2.0";
version = "2025.4.0";
pyproject = true;
src = fetchPypi {
pname = "qbittorrent_api";
inherit version;
hash = "sha256-e7MMiDxgJxR72dMBqyZSXAsrL067ACs83WNszr+z0ms=";
hash = "sha256-E3kvY3zhxf7bbnkfBR4LnjlRfz+PKcWvt7M8uvIFoRg=";
};
build-system = [

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