mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
@@ -27367,6 +27367,13 @@
|
||||
github = "thattemperature";
|
||||
githubId = 125476238;
|
||||
};
|
||||
thbemme = {
|
||||
name = "Thomas Bemme";
|
||||
email = "thomas.bemme@gmail.com";
|
||||
matrix = "@riza:chaos.jetzt";
|
||||
github = "thbemme";
|
||||
githubId = 14074615;
|
||||
};
|
||||
thblt = {
|
||||
name = "Thibault Polge";
|
||||
email = "thibault@thb.lt";
|
||||
|
||||
@@ -189,7 +189,7 @@ in
|
||||
name = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = "davis";
|
||||
description = "Database name, only used when the databse is created locally.";
|
||||
description = "Database name, only used when the database is created locally.";
|
||||
};
|
||||
createLocally = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "hedgedoc";
|
||||
|
||||
meta.maintainers = [ ];
|
||||
nodes = {
|
||||
hedgedocSqlite =
|
||||
containers = {
|
||||
sqlite =
|
||||
{ ... }:
|
||||
{
|
||||
services.hedgedoc.enable = true;
|
||||
};
|
||||
|
||||
hedgedocPostgresWithTCPSocket =
|
||||
pgsqltcp =
|
||||
{ ... }:
|
||||
{
|
||||
systemd.services.hedgedoc.after = [ "postgresql.target" ];
|
||||
@@ -44,7 +44,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
hedgedocPostgresWithUNIXSocket =
|
||||
pgsqluds =
|
||||
{ ... }:
|
||||
{
|
||||
systemd.services.hedgedoc.after = [ "postgresql.target" ];
|
||||
@@ -78,22 +78,22 @@
|
||||
start_all()
|
||||
|
||||
with subtest("HedgeDoc sqlite"):
|
||||
hedgedocSqlite.wait_for_unit("hedgedoc.service")
|
||||
hedgedocSqlite.wait_for_open_port(3000)
|
||||
hedgedocSqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new")
|
||||
sqlite.wait_for_unit("hedgedoc.service")
|
||||
sqlite.wait_for_open_port(3000)
|
||||
sqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new")
|
||||
|
||||
with subtest("HedgeDoc postgres with TCP socket"):
|
||||
hedgedocPostgresWithTCPSocket.wait_for_unit("postgresql.target")
|
||||
hedgedocPostgresWithTCPSocket.wait_for_unit("hedgedoc.service")
|
||||
hedgedocPostgresWithTCPSocket.wait_for_open_port(5432)
|
||||
hedgedocPostgresWithTCPSocket.wait_for_open_port(3000)
|
||||
hedgedocPostgresWithTCPSocket.wait_until_succeeds("curl -sSf http://localhost:3000/new")
|
||||
pgsqltcp.wait_for_unit("postgresql.target")
|
||||
pgsqltcp.wait_for_unit("hedgedoc.service")
|
||||
pgsqltcp.wait_for_open_port(5432)
|
||||
pgsqltcp.wait_for_open_port(3000)
|
||||
pgsqltcp.wait_until_succeeds("curl -sSf http://localhost:3000/new")
|
||||
|
||||
with subtest("HedgeDoc postgres with UNIX socket"):
|
||||
hedgedocPostgresWithUNIXSocket.wait_for_unit("postgresql.target")
|
||||
hedgedocPostgresWithUNIXSocket.wait_for_unit("hedgedoc.service")
|
||||
hedgedocPostgresWithUNIXSocket.wait_for_open_port(5432)
|
||||
hedgedocPostgresWithUNIXSocket.wait_for_open_port(3000)
|
||||
hedgedocPostgresWithUNIXSocket.wait_until_succeeds("curl -sSf http://localhost:3000/new")
|
||||
pgsqluds.wait_for_unit("postgresql.target")
|
||||
pgsqluds.wait_for_unit("hedgedoc.service")
|
||||
pgsqluds.wait_for_open_port(5432)
|
||||
pgsqluds.wait_for_open_port(3000)
|
||||
pgsqluds.wait_until_succeeds("curl -sSf http://localhost:3000/new")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -93,6 +93,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
# used upstream for builds: https://github.com/anyproto/anytype-ts/blob/5d66657f764c0649410e37c9e9c06e3ff18487ee/.github/workflows/build.yml#L192.
|
||||
NODE_OPTIONS = "--max-old-space-size=8192";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.91.171";
|
||||
version = "1.91.175";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-a2FTFaICNqeoKwz8YKs4F16IFNibcyhCAFcpUdwPdqU=";
|
||||
hash = "sha256-7O7cK9Y0nqn60G/4J7Tit0Z1ndsEgs9WtwS1yrDGZ0Y=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-fiMT0JzhaGUlqgb1XO6L3yIpCna+An33c7bbVmEQBKE=";
|
||||
hash = "sha256-/+xaqBCYzo4bvYASoRgDHDIUb2aWX1DGxqfDifeWKSQ=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-o08YNk4iIzQezFcnOutVbHl4X4D7aDbaJZsUij6CWp4=";
|
||||
hash = "sha256-alVhPVmXZ41CI5ou77xk0QepFvyyJqJs8yexDVo1rzY=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-eOLBGLPcd8/WfZa/ndXPQSI1MtjND8593HXyU34mITE=";
|
||||
hash = "sha256-18l3fS7O/lieRpFtlZPmhICTVywrRCgD2ntoRrABmQA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clamav";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.clamav.net/downloads/production/clamav-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-2HTKvz1HZbNbUY71NWWKHm7HSAIAah1hP58SSqE0MhA=";
|
||||
hash = "sha256-HzwkAa97OIoT/+1+b3K15w8b7XyCw0whg3nQ7kVZVhY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3",
|
||||
"@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6",
|
||||
"@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848",
|
||||
"@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3",
|
||||
"@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d",
|
||||
"@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3",
|
||||
"@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021",
|
||||
"@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f",
|
||||
"@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689",
|
||||
"@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b",
|
||||
"@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a",
|
||||
"@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1",
|
||||
"@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d",
|
||||
"@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb",
|
||||
"@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0",
|
||||
"@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3",
|
||||
"@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41",
|
||||
"@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec",
|
||||
"@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745",
|
||||
"@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951",
|
||||
"@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029",
|
||||
"@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0"
|
||||
"@esbuild/aix-ppc64@npm:0.28.1": "98a9325bec976ebe1cbbf2441fdbe895b36733919b9df7d62e7b73a1e199810affeac17d172cc5cf61196c9b1ede8073ca5d088ca52b14800b76f49bacc480b3",
|
||||
"@esbuild/android-arm64@npm:0.28.1": "ec3e3c62bc684a09393ca10a0f64b166938f66e4b1972f6db63bf55463bf039736549d9808e50996eb0fedea70744b466aeb816c44e78f2b5d232aeb9929e3ac",
|
||||
"@esbuild/android-arm@npm:0.28.1": "cda56884826ac2aa5dd3be5df9e89834df3b46515cf14099ddfc5bcfc80122d4f8d74b3831a0ac447d87dda73ae90fba49dc4e352b11240c2b055cdca69a0a02",
|
||||
"@esbuild/android-x64@npm:0.28.1": "7f2ba14ba06fd3f2faff467e6fceb2466cd44d1d6039ae1c01f24336a5a1ad0f9c3721000331ded3f250587e4be5e7194d68dd33c55339dc26e1200e13e16d2d",
|
||||
"@esbuild/darwin-arm64@npm:0.28.1": "9798bd013921f8dc5126eb12eba4ddfce9198d11eba6ae844f66d25919d5d26be2aa46b4da8d442ad0e7673e88b2f3d9e505d71692cd030bda9a7b762921c05d",
|
||||
"@esbuild/darwin-x64@npm:0.28.1": "aaddefac25e025e309c71dc5c7074d8c295f44779e41add06dbf65d48b2a6a72b579266748e7f0ab3b2be1ed07be8d541e954f75dda2a2992f36f4c805d91fe1",
|
||||
"@esbuild/freebsd-arm64@npm:0.28.1": "a325b7833f978b62bf25157ea5a951e29b9b0a1db9665ee52498644c9b250977ab6f21c049137d0a271bb0442b3e6d6148c257bace84476196b46570ce837d62",
|
||||
"@esbuild/freebsd-x64@npm:0.28.1": "f092ddacd0bc715f443b62382dd8ba8f85d272f62caa47f603e85b9c5b14fef67c610523006ca88cae19e2829fe41a2a0ae92b7c158ef1038c714552dea57554",
|
||||
"@esbuild/linux-arm64@npm:0.28.1": "bfda225d3101bb3ed5a74f979d50564a17ccf3799ad65fb968c5b15c9ceb9077c105a9bb5763d42f33f1917ac709e5779cd2112e5420188963568e80ac8439f8",
|
||||
"@esbuild/linux-arm@npm:0.28.1": "b440cf89adf6dd1079bcf7d9aa915f70f467002bbb69bda21f4a3d160c9ae93bc6d8eb73b2831c8607fb1527d8ada288d907440e36969cb60000e4df85b7c549",
|
||||
"@esbuild/linux-ia32@npm:0.28.1": "4329d81cf06331e537c8ebb571a9d4ca968811bee7c7cb4f975b8343c9f7649a8b2b9902b0974be0e2224656b1a0d21f3b191304db8cec52d006b80061faf4c2",
|
||||
"@esbuild/linux-loong64@npm:0.28.1": "76b4d0f2cf716576181065e3fd2d6ffa9b0d0c39987e8d3d1b8d1e8aaa2563779cd4f861c881e3e7a9302f2d03d5543b8f726a99603e6aa754c8154772d0f434",
|
||||
"@esbuild/linux-mips64el@npm:0.28.1": "59825a73d04187818c6fb53b22e2915a4c0e6c8fee9017d75dcafbdc66699f2765377faf801495d69952230935557f58360481a7edd78073816270aa8bd0cbee",
|
||||
"@esbuild/linux-ppc64@npm:0.28.1": "3186d54b33d9b4849d6fe4fa2aeed4966a4117f9a27bf2d59f07f3ea651a9724a2eb9aaaf98813aac6dc726710a337bfc2472dd714262894fabf498a369fbd74",
|
||||
"@esbuild/linux-riscv64@npm:0.28.1": "f01572cf6398b466d44bfa68dbc5f56a37b74e645673198f7ba157d215ccba35ea46e220a2526008d5679cef47a4368dd46480d4ba4c7330a491d215fe3f649f",
|
||||
"@esbuild/linux-s390x@npm:0.28.1": "aad20d457c0441d7bf2f6c8dbe74297d4c3a3c90cf709a971a4a19b2c70497bf91ac4a80fa6168ccf6063eb284ea0f41f2293283e8351348369af551ffe6f3cf",
|
||||
"@esbuild/linux-x64@npm:0.28.1": "d361ac73388af397803dc26242265c8f00fce91d9dd587b04d230c686294585c541f43dee706e23f8d56754e3a3da653b00b3f55855182d60deabc024acf19f7",
|
||||
"@esbuild/netbsd-arm64@npm:0.28.1": "73e2d620958bcb61367849046397dee40dbd9bd6d0d4172bb87ef90ad644ed16e48386debd1ef0323648358fc617c0d8fae58be984774a2e8622712c7ab7f04b",
|
||||
"@esbuild/netbsd-x64@npm:0.28.1": "663a35913d3d3a2f566d31ec00477954cc570f386d56a5ffffa1d7bb58bccfbe241780fc429c2e41463cef5d1d422ca02fe174df970932b46d225ff0bd333b65",
|
||||
"@esbuild/openbsd-arm64@npm:0.28.1": "8add19644eca9a23cefc2a109644df802c626cc3460adef6f030ce72d1fcb127a4ff2b14a21cb51bbd68ec5a652f0bd7105c1a0d76a30f44fbf822c010096cd9",
|
||||
"@esbuild/openbsd-x64@npm:0.28.1": "ad12be1ed38cc61410aa6210f88b8aa8dc3e6ee717dce32dba6e7cbaa57414af6e5314e7cdf9baa4affafe2d6a88e230d361a0ddadf76d06070b63bbf0a97cb2",
|
||||
"@esbuild/openharmony-arm64@npm:0.28.1": "5ecd637058887c8458ebc7e95c67adee2397ebd8e5f6c302c17816eeb77963b1feeaff4e3f7823c0d85f0fc10771caa96175e2f0909b00e60ca5d90d22690a15",
|
||||
"@esbuild/sunos-x64@npm:0.28.1": "e3286191315e30471e9cc176281a5d7acf5b877a95ea2868195024548a984e08b0214ea90e504e5bb5c595f9d3da9a5b961b52f79988702036b59233378580c4",
|
||||
"@esbuild/win32-arm64@npm:0.28.1": "55e83fa2b63511bc3d2138ff84091b452936072b5b8e24405a5669f04355263b3f452861c13fc0c01ad80ebeb0df069da0318631386c9d66cda8ccbeca0fa82e",
|
||||
"@esbuild/win32-ia32@npm:0.28.1": "dcd2579f97b8b5217e807d3a069461635ff6c1f13bc6e678fb0e385db4bf569afbbfe9f54ee512f0e120c6cc2689889725b8e2efdb17e3bb1603cffb58a4b6b3",
|
||||
"@esbuild/win32-x64@npm:0.28.1": "1d7e7661663e2b0d814550e461fd06b814b3ac1ffda1e84468da3b7c29a1ad8a6067a8b7dcf6e66e38918b43a440c6302052f1bdb40c48a6d49a82c616e12f2d"
|
||||
}
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hedgedoc";
|
||||
version = "1.10.8";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hedgedoc";
|
||||
repo = "hedgedoc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9gKpjmE8z/9PUILCiVK1utNYKD8kscbCBKxerqTO3z4=";
|
||||
hash = "sha256-L27Rmd85+UbAbJYY2vxsWLbY+9nsWFmnEE4o3fK0UZU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes patches;
|
||||
hash = "sha256-AMTSCM8dNwAddI3QZMFDzxJmJPvJ9fGK79at2I0S/pE=";
|
||||
hash = "sha256-Vj1s8aA+L0GwJ6qr/5IXpYM5ZAY7qIiPn9BKadcO52E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,16 +35,21 @@
|
||||
let
|
||||
|
||||
pname = "hplip";
|
||||
version = "3.25.2";
|
||||
version = "3.26.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-6HL/KOslF3Balfbhg576HlCnejOq6JBSeN8r2CCRllM=";
|
||||
url = "mirror://sourceforge/hplip/hplip-${version}.tar.gz";
|
||||
hash = "sha256-ucYSUnVPNbSiNzlsqJYeez4MVtt21mpnEre/PjDmlGM=";
|
||||
};
|
||||
|
||||
plugin = fetchurl {
|
||||
url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${pname}-${version}-plugin.run";
|
||||
hash = "sha256-miz41WYehGVI27tZUjGlRIpctjcpzJPfjR9lLf0WelQ=";
|
||||
url = "https://developers.hp.com/sites/default/files/2026-05/hplip-${version}-plugin.run";
|
||||
# HTTP 403 otherwise
|
||||
curlOptsList = [
|
||||
"--user-agent"
|
||||
"Mozilla/5.0 Gecko/20100101 Firefox/150.0"
|
||||
];
|
||||
hash = "sha256-GZ94+K9/NolNcYDpCQljziVQp17HAfikujdmWpdG/fA=";
|
||||
};
|
||||
|
||||
hplipState = replaceVars ./hplip.state {
|
||||
@@ -85,7 +90,7 @@ python3Packages.buildPythonApplication {
|
||||
sh "$curSrc" --noexec --keep
|
||||
'';
|
||||
|
||||
sourceRoot = "${pname}-${version}";
|
||||
sourceRoot = "hplip-${version}";
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-B/ZAtf4pBZ6kjEL9qlJ4dYy7OHjMbtqqukjYvN3CC8c=";
|
||||
hash = "sha256-OXzxOraDgOBNpsbDAPpf5dGERiK/pkfsVtpzTZkXPQA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -36,7 +36,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "151.0.1-2";
|
||||
version = "152.0-1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
|
||||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-YqFUKUK4GoP2JAIa3aJqz/iAAmD8hh5UqVzbm4jjvm8=";
|
||||
aarch64-linux = "sha256-TIJEiffEa7X51RGmntCAR7NLP51qcJ08aTvKxVAYNsY=";
|
||||
x86_64-linux = "sha256-sIpyCpfo9igZ0PMd1Y7sdIoui88dC9DjlwjN5M5HLsQ=";
|
||||
aarch64-linux = "sha256-H1HtyZPcE8RpJTuqTnCOMC5gb+s1Dp80OE66KCdRM4g=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
@@ -106,7 +106,10 @@ stdenv.mkDerivation {
|
||||
description = "Fork of Firefox, focused on privacy, security and freedom (upstream binary release)";
|
||||
homepage = "https://librewolf.net";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ dwrege ];
|
||||
maintainers = with lib.maintainers; [
|
||||
azahi
|
||||
dwrege
|
||||
];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
mainProgram = "librewolf";
|
||||
hydraPlatforms = [ ];
|
||||
|
||||
@@ -29,9 +29,12 @@ in
|
||||
description = "Fork of Firefox, focused on privacy, security and freedom";
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [
|
||||
azahi
|
||||
dwrege
|
||||
fpletz
|
||||
hythera
|
||||
mBornand
|
||||
thbemme
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.buildPlatform.is32bit;
|
||||
@@ -40,9 +43,6 @@ in
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "librewolf";
|
||||
knownVulnerabilities = [
|
||||
"librewolf lacks an active committer in nixpkgs, consider using an alternative"
|
||||
];
|
||||
};
|
||||
tests = { inherit (nixosTests) librewolf; };
|
||||
updateScript = callPackage ./update.nix {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "151.0.2-1",
|
||||
"packageVersion": "152.0-1",
|
||||
"source": {
|
||||
"rev": "151.0.2-1",
|
||||
"hash": "sha256-Iq6Jf8Cw2AgkI5zehV5TJQBFHCGANtj4e13cy+ANoTo="
|
||||
"rev": "152.0-1",
|
||||
"hash": "sha256-T7ZRCmHx3jnFz7zzXS8btEepP9HRtKS8CWTehxdxIlM="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "151.0.2",
|
||||
"hash": "sha512-hzCJU+01SieZqaRb5AAzv5/42A+iIPA0qs+9bnVHFpAdQWTDf6VgMsZZslkRZgPguitWbB82UaucwINdUCzXOQ=="
|
||||
"version": "152.0",
|
||||
"hash": "sha512-LHrfNnAEBj7p8zheaS9hLY5cDBBmK/KUmWwRgAHkPewSyoy0/XDmeiWpA9v1rfg9IuSH8Evz+TDaKoFcgDeM6w=="
|
||||
}
|
||||
}
|
||||
|
||||
920
pkgs/by-name/ma/mastodon/gemset.nix
generated
920
pkgs/by-name/ma/mastodon/gemset.nix
generated
File diff suppressed because it is too large
Load Diff
@@ -1,29 +1,69 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.25.5": "fb872b34a2843293dc60e809968fedf93e0d8f7174b062decffae6ba861eb56aaea0cd0aba87ba99162ceb2a690f0cde4fc29c000b52c035e40c91ec7861d43e",
|
||||
"@esbuild/android-arm64@npm:0.25.5": "c818e799b19b5587466bf68a27b578ccaaf866c1d144573fbde7659e3fd3f555422ec3e67f5bd186a87648957d1b6e74df4f847edea7219c16979c9916f36e91",
|
||||
"@esbuild/android-arm@npm:0.25.5": "a5384933f9f2ffcadce2be49da6ff43249fe42f32a04071316434e9f633fc20c8d4029072e9a53555620c3531045786297607b852579eee30b6dbc3bc9d98cd9",
|
||||
"@esbuild/android-x64@npm:0.25.5": "8ce115dc7e1e6735f23b4aadb2dfca29c0abd8577ce34802ea3d017a64e388928949134fe225dfe190babdc5ec01be5fc7794eca84738cdefc12c5e3789ce43b",
|
||||
"@esbuild/darwin-arm64@npm:0.25.5": "a009eab62f2bd284a6f2001d5e08217059186ffc16907bbe873e1de40fe9b5ed92c0db2f4c4d0dc41545838850a430c8f2f35d7bdb9cd01a1a04293acd97afca",
|
||||
"@esbuild/darwin-x64@npm:0.25.5": "cac8021a7a0c549263e076913346b35a5bb81f76ffbc1abfad5e7b67303f013ac0c76f111bf624ea8447b327ec86c18a60c6ff307d743a2269f5d47313f5b2de",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.5": "d248e7103b7094eb4288db7c9a78b2905a25b4a957f2b945531ca88d3394f45ceca2343a7c84954734534af6159bc741eb3d5c1ed9df990f7395337a1b14192c",
|
||||
"@esbuild/freebsd-x64@npm:0.25.5": "8a7be0740f07f5dbb3e24bf782ca6ef518a8ce9b53e5d864221722045713586d41774cbd531df97dc868b291b3b303c12e50ca8611c3cb7b5fe09a30b38285eb",
|
||||
"@esbuild/linux-arm64@npm:0.25.5": "ce3c8fca47cf0a92148fb288eb35a5c4a4dcf7a700730b3a48fdd63c13e17c719eb6b350378203fba773477eb5be637f47a6d52c5d4ce5bdc0075ee917156006",
|
||||
"@esbuild/linux-arm@npm:0.25.5": "cc81ea76ab86ed2a837c9da329f7c63412d288dc0aa608c8dcdf51705dc93d5b7f966a429be4896babe611074e5898c7e6c8e07ad7f50123a05478975294fbb4",
|
||||
"@esbuild/linux-ia32@npm:0.25.5": "bfed6750923afd56148f658f6ec8995479f5115116dc212ecb9e4c556064422e22eda855177e7c02cbc945494e4db1167101918c5fa932278115db2c7025a3f6",
|
||||
"@esbuild/linux-loong64@npm:0.25.5": "e5c20140bbbdba53f0d86dd72961ed73e6255d2ada2d3a626f390b352170605644822ad7592f695b6e520edcefe0c5f6ba19d10694b5d11d725745d9792bde01",
|
||||
"@esbuild/linux-mips64el@npm:0.25.5": "6b3559517efd0dd1301debc7af7e275b055859c26facdda2e229b1aaab6ebea4c480a1da151c46211ee4035d95bfa7f0cdacf735b57ee99d41b69c77357310b9",
|
||||
"@esbuild/linux-ppc64@npm:0.25.5": "a1a1af99d758efce928335637924dcd8ddec4201af51014e1f831b012d53a0a673b1e0c31036ec9e8c5a0311439283419ec8abdfc67ecb245fa7f7b653006ed0",
|
||||
"@esbuild/linux-riscv64@npm:0.25.5": "6cd8dce6723b73e0f89898ab6cd52e0d009afdacdfc0d5529134de7b832c92c2e0421fbb5cbfc0e0c0b2b00a9b1ff2c4cdb9695b2c535ebc174960e986c727a7",
|
||||
"@esbuild/linux-s390x@npm:0.25.5": "31b86dbc93d19eb362bad3353e65d6da771118346e723582d06c05f1b6ffad1c3765001b5215ef1e8f0c2bb29130d98815359bbc88e5c08304354d5a92e6ea94",
|
||||
"@esbuild/linux-x64@npm:0.25.5": "f878a3e40edfd8a50de94bf982a9eaf03e636a0332af163a6c905490063aae652384fb392d4765c4338fb6f991034949c92ec768ee65c3b2fceeb494b89fe8b3",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.5": "941c5e28a63a93f19122271b5490e196db12815702c2266c6d66401b6909a4364ab889611ba81c5359624e3ce61f0505a680a1179ed9a555d1415fa1c485d75d",
|
||||
"@esbuild/netbsd-x64@npm:0.25.5": "edbefdd88ca24a373497a7c8d1fdab418827ff89c6eee1c574159dbb4d9174552aa87753f35525a894964b77c14b012164ec5582b9f19dd4d6c1f5d45df411c7",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.5": "d44633a374c109d2fb9c678882016e3ec3d79f0c5f21a6e6fb0114ea709bc539200b037a4e3ec52304eea2f8c5957bf16c6f0a7af5cfde41b652c4bac604bba6",
|
||||
"@esbuild/openbsd-x64@npm:0.25.5": "efc4641ea653dedc9886f0603c2e7cfc6fbe94c34d4cdaee9b060a8b9d8143d1192c45da93b3e802af2c26f72ab1ad3a3fad0e0cb297d06de55814fe83ccd32c",
|
||||
"@esbuild/sunos-x64@npm:0.25.5": "29860663381b6098c0fda6f69235407654dfad953e83b3f9f06a270950d5c37da4ca60a4b5915b8e2606d468b560be6179870f64a22d5b046e8a930c31a7b554",
|
||||
"@esbuild/win32-arm64@npm:0.25.5": "a77d395251c8a62ab0cec07d5230222823fa02fbf3ef008d94b5213a335c9f949872c3f1c2f947abaa28098b669018e429af42f59616e049860a0072f3b006de",
|
||||
"@esbuild/win32-ia32@npm:0.25.5": "ff1b6cbe835082aef5b93c3e2012d51be431d05c6ae5f90a5bc89687c687e8e2340c262dedddd124b27b511616bbc4088b5a4a949d3147f677084dc6ec572629",
|
||||
"@esbuild/win32-x64@npm:0.25.5": "266e69e8d37bd4deb77443588e49472e4e9791178cb39e1692eabb67cf65d8e85a932ac468e7ebb2072c8a9ee23ad413c8f0f7d954c474f643cedbbf7aad952a",
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "78d13201fd4d048d19955fc510db508b14b5fc1a38f4ea506469eac65db770c65fc3727df15b087778178fc8e3304df88559a7441d227451efd8a0b1a688a729",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "e8aded79b2f1f8841c082396f7476bee51c056ed468e438fe2ee00b6b73e96acd640d0b8d0cc13e63c972898f6cdd275483c36c562d4186f0efc01881672b08a",
|
||||
"@esbuild/android-arm@npm:0.27.2": "ac673502cf6672dabb4b82a26bb3cc120402acba1b87a92481c0a37c8fa06847fd16503714bb227f6351d836f6f60c644ab50fda95c896d8eeb3e5ec3af96226",
|
||||
"@esbuild/android-x64@npm:0.27.2": "dcf5c84443645af089e3b82421097c0288a4bdebabf231449ddd66e1b48952e5af975bd26954a50be0441605b91cfe779ca2192bc4b02b7b19192a2a86f912f1",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "cf08b03672941acbea8b509db79a7cb9cf8c81b563c75414c87b8c8442cb1178063eaa14b7cd1ae6cae95dba7e1de9343b721a6d19523a5f21c3d1367e3688b7",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "5d3207cf85674b01a817c43064525e39b215802a9ecf352d15e92e926c3e549d95b30e127c2d3f8196ac9472ecca87a861d9f270221ee55884c7a6d0aa636fe1",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "45f475fc6ab2f4760155ca2b50c4cf0ea8aef2bfad3ba4548f4547898d3cc785dcfc2ea58a190be3c20c715c771d1d694a9eb6ef5fb6b72d93b6abc94f366b98",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "7fb62475cb9cdf54d22f2fa984ef57f891d05f366143227efd1d28d507a3b1f2c723239b3e22b3ac418467e6284a08eaf6dcf0bfd2a0f1bea06d0ac73c2aa8de",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "89b8e94e2f4e7cf564623bb6b1d2e9ab218c6d4cafed93778fb797b552d3495f08c99e49d9a2573823bc62660353ce4b4cf17a2828359a3437a9caf8da99673b",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "fd7c845a5ee2073ef6c5bc9d914844b48b82006ebf00f5acb98a43f600ee83fda578034ed8eb6f7f462ed4e3ecd8b7c6570a78bb708ee7eb10b93751ab879ad6",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "23f67cfbab67aa860d7afa842e29fa75eb16af8577a811c54263fc3a276c05e468d532bcdb118d174624ed76a9e133d2520567937d4ed646caf9dd19aadbae15",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "b37e531c91346c7b5d31ce6664a334c391a27c3c9fb282136abf232111575387e9d066abf27f29436afc913270a8e2c2b09c1210fbf87e70f1028685d94ec4de",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "8b48a6c7dc8f16147c1087b56710685f3b89279498caab6b63cad3db9402308adf633111d773cfe31756d41fe46e895f2c1ece0fc1ed484ab02e92c28357f0c6",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "4f207f87bfc1253974e00d3cf27316d3e93b7e51fde46ed618367e62f2875dffd66812acb85e8d2949dffc73eed7b3939a42bb93f40ec8fca4a6988173709dab",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "837a0aa03e82a1b853632d153515d68035e57b39ccf730a778311c04e3429aa80f001d990392519a641945501f6ab3af331481eb4551e99718e7cd2ba5862089",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "426a4b9d9d4c58d61031a412c64c8cfb0db0e38da3cf4dade253c45a46dc539dccee24700e965e66c7c397a65fef765fc43bdc6b3f46d6bc6f289f79c4b6d7d5",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "febde9f6908220698cf72947534eca590c2b5ce8b0c9bc6170649c5f64f7f93808bb9be2caabd7c63068dc68e218741f27a17ffb8826d87fb487a0639888b90f",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "1f69c833bfc5d1d7c58f52fca35637df1686a5bff5c15af900c165b2561a809d805201dc8de712fa73c69205e96a078096cd00b00e9ca8fb5cd8741e4ec943b8",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "29c9cbd018788521145d719013020dfbf744185eaeaff845f0fc925c67630c66743b03486a2531493f79482d2315e910a27a31f89a791e0a9589e04d86d295d7",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "dccfe8ca6c0d648a26a626b5a4caf3325fed90d7ae343db2a86be9af2479391518c02d54470c2690aec23af1359debe7fbf125d979b5ea891a63fe4b206c2d6f",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "0bc581af266608ba01c530ec1fe2b475630dbd56538562f8b1748f7044727bd08d0784afa9aee8aa0a2afe843bb0b47572b4c6babb2a9953808d37263d730be1",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "1f04a6d690bd2ef231801b0c46b40359b4d4451409cf46a865613f3942835e7633286c328c31f3a10065491f314e6c7c47d7a8f79c1a1ec25f59ff46f5765c6f",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "9543db0acc86a762f9fd708a3226ebc45a1625885532d153928b9d2b0de90b6d78db0f9b77261d345b95c1ba7282ff3ab0fa37932c2dcd9b1c2b7da7cf39cd76",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "2bfe0fef3ace4a5b0f7647168ae21eda9344a8bef4924d60d1ca781b59eb1f7fef0858aef6e2fb8c185638117bfb7dc18c55a700db57799955c8f655eaaf1f44",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "c510d04bc11f11b7bd6bbf0ea28e2ba484e6232b7655b5cc8ccf8276ef7da760d54a79eaef87a1a40a81632a5ec4a9f7bb08f63920e5d145c8a893ae76d93094",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "d11933a70f9c908e3cd7202071dc23a9dea8afa58a4c2e22a3beab3516d0898345a5ebb2af47ffb2cc7f5d2a6d788ed4681fa7f37e121f1605149f124d632c67",
|
||||
"@oxc-parser/binding-android-arm-eabi@npm:0.132.0": "11d7e411090bbec8d07a867a7954aee5417c0ee9a985f1bb217aa6ff12e53d0a6919fc06e27c2d091dbfd02ffbf74edfcee0224b38e642a4138c4a522a1a861b",
|
||||
"@oxc-parser/binding-android-arm64@npm:0.132.0": "dc00b1c88ef74c101af44aa62f54659a720e169339ef0971df70ffe32ff2e768051c24e1038d087fe2f9733045f213fd806bd73f3493280f1c170a1bfd04cea6",
|
||||
"@oxc-parser/binding-darwin-arm64@npm:0.132.0": "8705914f91d01f534bf61cebead3e90cb4497787292faf46e5d198093a9500a2466a74a00f5efd204a1d329ff7da4b7329ef4b8840ba2e378a98872a0e21a3d3",
|
||||
"@oxc-parser/binding-darwin-x64@npm:0.132.0": "4b90b26f7a997556e89c7d4648ee845f5e502dabbfbd2b330cccad756dd7b322e9a6195fdd1f33e278059a40292f754b7da7dd15db4baafb441c304e4cafc7eb",
|
||||
"@oxc-parser/binding-freebsd-x64@npm:0.132.0": "60c04e9f3dd5f3addecdf85873ccc8a79d880e0237be07a597c1fff980e0cfe60d3b0a6b9400a89323c8fd48776a7e172a58b6bde9e3bff781ab5e4d80f2def0",
|
||||
"@oxc-parser/binding-linux-arm-gnueabihf@npm:0.132.0": "eba579d9c7444748f9e82aad19accb80dfbff7ab66dc7f3766da790f97abc190dec8fe430a3af97d4c0f34c9353bb0563094f91efe7f893083a80f2f7ca4dbc8",
|
||||
"@oxc-parser/binding-linux-arm-musleabihf@npm:0.132.0": "03765d72b81dacfd98c46c40fbdddff3361b92cf65e55176886780f158d563a18800bd744c374db28b3664c5eb1b14cd71b1a84cafc64e93d291ec226ed77a7c",
|
||||
"@oxc-parser/binding-linux-arm64-gnu@npm:0.132.0": "aa9f9386d334953839bf0febb457c670f29b2545fba81c957efbf5701600c8f7024ac69f97a8d76de28609f00ffb2488be5c47907328f96c11d4d544c8c55277",
|
||||
"@oxc-parser/binding-linux-arm64-musl@npm:0.132.0": "3f7037a6d4c81816509944a316f239ba7d233a099608ee08f882160067b4542570625bd81ac4029060da1f48a1ca12de74a049c6dfe84f6215d8fb8d77d06bc0",
|
||||
"@oxc-parser/binding-linux-ppc64-gnu@npm:0.132.0": "63937000054bd2a986ebdaf6a92c6bdab926b52744b2e805727503f785eef692a3e1fa1fc85163f63020c6222107ce7fc4c97b4175a847c3774b67a1a904d1ba",
|
||||
"@oxc-parser/binding-linux-riscv64-gnu@npm:0.132.0": "ce3c1c0f048d93fb75399f82bebb97f8c6079e3811bc9a741709906dee379a57660e45d379471beb4b52bd84223750acbdc4a52d34d0a0b6d9b49db5aa1f6ea6",
|
||||
"@oxc-parser/binding-linux-riscv64-musl@npm:0.132.0": "f0eee8f514ae5906981594566180b11e5a8eff72840b3219493ce9bcb0ece6f7e69e37ca3e98b0e228a3a175b65a9730573be1e567652bd91875137a03a42aba",
|
||||
"@oxc-parser/binding-linux-s390x-gnu@npm:0.132.0": "99988465bd899276e9e1c89715080493b91d5096e2a76433b44ee5225a761d77ce932ccd5c47ec16f2c259a11e6ee34e0074334e437774dde6ab74c4637bba07",
|
||||
"@oxc-parser/binding-linux-x64-gnu@npm:0.132.0": "c4416d3014931b1831bf9cd11eaeafd44876a3dcf56f45c052a6d8f634b047f5851a0b822ac1621d1fe185a0109f2acefcd10507c51c2845c219cac08a16e185",
|
||||
"@oxc-parser/binding-linux-x64-musl@npm:0.132.0": "4b45901795cf1eb2f53617e0619fca45b6efb52690ef1d77b3fcad07dbb25f854e7eb2c6317883ba6895521ec38828655ac9cf77fab2d2b27e4a59e7b14abcb5",
|
||||
"@oxc-parser/binding-openharmony-arm64@npm:0.132.0": "46b3d666749e0e66e46810fcfbda37b65196fbedb31ffb9461bda2881f007a233f1c360d533d692f5789864ea99f842f1101edc4dd85e929cb64ef3a8f4c0684",
|
||||
"@oxc-parser/binding-wasm32-wasi@npm:0.132.0": "63c0ca72ad2439c46212687caa3ca77f79312382d313c492b4f940edf71eecb14057325c4bfc78614f66579813add04aad8409ff32a684dcba7e32888d93d5e7",
|
||||
"@oxc-parser/binding-win32-arm64-msvc@npm:0.132.0": "1c8db4cddad78adf0d5113047e7d85ca99ee6cf24db0b5cf143cc30461620e141cc42038928903c3d605e7dd449bb9a48030d15bfdcbccdd648c86e80f6316ce",
|
||||
"@oxc-parser/binding-win32-ia32-msvc@npm:0.132.0": "38d5fe8cd2c5c0d2b3761fcc33062945e030951507b2d434ae060f9363686f267560ddad79e693d56cc9a784d74f5721eae019b18b283ae4f3651215a0a64aca",
|
||||
"@oxc-parser/binding-win32-x64-msvc@npm:0.132.0": "3730b86c60ecc874a4c084cf7b020d7290996360bab49d669e2a931f999d53d9fecf9fda9b64fcfcaae34a08dbb41f6088ba10b03f1557f97dc8d91f67aa4074",
|
||||
"@oxfmt/binding-android-arm-eabi@npm:0.47.0": "8c6093de3486fa25dbb64c832a8020b521116c550216822b3ead18c42e2f770bbd1e4fb9fdcd32b20aecb4c49c987d0625bc9e209e043cd4a55b593a1dc44342",
|
||||
"@oxfmt/binding-android-arm64@npm:0.47.0": "ac9c7fd4ae638b2f7a4beb9c656e5e9ae6cecd6e64dff9d4e0588762a499e2e6bcf2d09b5711ab92ec071b3754e18b303ac5bcdbe6932e7c1aacb6d49a7d8726",
|
||||
"@oxfmt/binding-darwin-arm64@npm:0.47.0": "48c212f8dbe32fedf44b721174463f763500821efc172a7311a53b1012b8b919b8597e212aabd74ff5c69e0355c2e3415d2e033fdc1fc731945fc45810000d48",
|
||||
"@oxfmt/binding-darwin-x64@npm:0.47.0": "65f95c5615efbba9caa4717ba34a74e98ed54a0f656161752f6fd57837989afbd9cf3dc20074d5f35ed25f99c5b645638c84e58d0f51646db5dea95c95fa4a12",
|
||||
"@oxfmt/binding-freebsd-x64@npm:0.47.0": "1fceb64e6c868a37b8bf7cfcb037b07168f0611bd000bd7fa216dc164999882e201c09f7aefd08e874e9d24e8a6ded10e7158c11249caa6f8567487ee39fa3b3",
|
||||
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.47.0": "d9f5db6f7528ac7df3faf81c9963b069ac2242356e71e541a13cdc8a4a569beed6e209d0fc7b3166cfe26acfc2c1036e2066e71960d68b4d3393d6c42d5b9bf2",
|
||||
"@oxfmt/binding-linux-arm-musleabihf@npm:0.47.0": "9aaf0f065f6ca82c9966f414d83d9095f2554b7cbe873b7122eac542bf4874aab73f8670bdf0eec670f25bdffdcff1b03e4faf8f46d25ddce87f7c226332879f",
|
||||
"@oxfmt/binding-linux-arm64-gnu@npm:0.47.0": "8f3a562d81e152de381cc3b136ca1381ecfd4c18165db17bc7c703090323596faefbc7363ef5ddf30ba03b935319dfc7391d00ce4fd46c3663eba57ac9618d9d",
|
||||
"@oxfmt/binding-linux-arm64-musl@npm:0.47.0": "f497e7b058a0f78aeff46508a480d03c2306706f6586c5b4067bd08fbf0b3446e6e9e60386ca9439a34dc9aefd19872b53bcd4896ec1667ce442cf6d9e3a665d",
|
||||
"@oxfmt/binding-linux-ppc64-gnu@npm:0.47.0": "89d0ff4a241537acfdc4c39c70489e2199edb1f81c218a473daec9686a76087b08ce15e29673470fe253010dccb3d7523ec1d7932d9764b8ded8e326f689e144",
|
||||
"@oxfmt/binding-linux-riscv64-gnu@npm:0.47.0": "25aaae28128b2c78027f8c9002b0a7938ed47820da0c6ece2194786fb226cfbf70a081e8ae7b2b6240a418c844d22f6588f97b9babec0db559fd3731fb3be317",
|
||||
"@oxfmt/binding-linux-riscv64-musl@npm:0.47.0": "805c8f46fffc3ee2e257cac8c72fa1b2324ef0505f33a400ee4c7adbba3133796bb1e31e63a3ab7f348faaeb532bce10da252161a10ae033c755c201053bd234",
|
||||
"@oxfmt/binding-linux-s390x-gnu@npm:0.47.0": "e36674a39b5dc9a206b784477acf534112b2476457b484255416138ec0ce98733139f4ee7b44981021559c98e8b4a717ad19f5b5471e4cec06647c086028b2e7",
|
||||
"@oxfmt/binding-linux-x64-gnu@npm:0.47.0": "089fc7bf49db9b50ad6c063cfca5390d12670cd3a3536b1c46a11a643a3d77fedf13a7646ed368ce2f0462484e0a248e96ef9997e06d992a684c7a7bde2f97c8",
|
||||
"@oxfmt/binding-linux-x64-musl@npm:0.47.0": "e437731a19fecb379143f6fed7d862dd19bb721dc5190ffda707431f6de2ce44ca7f9d217a046cd0e70c31d2e3c1b95051ae5495a80c5142fc28922cd939ff28",
|
||||
"@oxfmt/binding-openharmony-arm64@npm:0.47.0": "529ebb6bc9f8ff1fa7b5c6a476d260557172719839ee1efd28967f275c363025a85f6cad75f33e2ec88c139e88e0b9527ca2f3477ffa474b6cbab4900d69b242",
|
||||
"@oxfmt/binding-win32-arm64-msvc@npm:0.47.0": "8de18898b3c5a8ef8f53aaf6471d928da30f5ffe2d65b34e88407ae81934afddf2f7e354c51af29c5354b9099e4f3d2e52ad2702d7a2a45fc21d4a889ca4ae7d",
|
||||
"@oxfmt/binding-win32-ia32-msvc@npm:0.47.0": "a5ec49b5f47c6bf1805d08b566d65f00b275005268f9c19bdbc03cdec0977d4bdbe547850873f7d26b9eadd9b728965a58b477f4a46e2578ce119f7b18e8c8ea",
|
||||
"@oxfmt/binding-win32-x64-msvc@npm:0.47.0": "5936d0d84dd9316ccb237322db6f7c19a5c29ef7dac00d237576924e917b9e35fb711f671c564dd17d31872ccf994e4e53c478981973e1fa8d48cb467182f406",
|
||||
"@parcel/watcher-android-arm64@npm:2.5.0": "2d5d66f4e904546cff638d0b27a871d695dda1205e32902f917723dc1b09a5edef4ed8064fc5c85192a4e5e5b531eb4a2d3b349015ff6170c8228e3c098d5376",
|
||||
"@parcel/watcher-darwin-arm64@npm:2.5.0": "bbdbaeb31ccea5ec172adab2bb2b1a5f4b2e18ed31054d7f6b1db718238f5880e3b8bc8ac1b55c00048c7a1973e75c0c86fa04c02679f99c0bb355145c8b685b",
|
||||
"@parcel/watcher-darwin-x64@npm:2.5.0": "85089bf1c0f7fb0b4007d54f97e890bf2173d1a11166e9e601b9afe6e260e9cff2eed150ea80f51aae358436376c36af75a70523f53711f16a773987422cf93b",
|
||||
@@ -37,26 +77,21 @@
|
||||
"@parcel/watcher-win32-arm64@npm:2.5.0": "cff6516b1dad597ca1ec8c385cf8251f5050b32ab46fc15360f2eff3a40b61b7107eee56df73764007d9bd6b826960d2f3589c8e0ce270bb5b2a292313bd7a1b",
|
||||
"@parcel/watcher-win32-ia32@npm:2.5.0": "ad9d2c9ae3a7031105fc90418050a910d4b679ead36e5fdcbb1b3e4afbaf56aec6566863e3a374c645c82f57073d8f643183f19c67c8c48b0aa62224c05fdb9d",
|
||||
"@parcel/watcher-win32-x64@npm:2.5.0": "aa9660bdb2fe70de5163f9f8419e263711fd30612244fb7feb58fce49a653b88ac0e1e29646fb1fc76b86fd8215e62eea5ded0616725987dfca5372041925bd2",
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.46.4": "c87957e957226ba7b5388426aa9fceaf581d3ffb94f18a5042aeafe5dc7ad7dd7e857e7199bad7fd7967626d7f0b9ca7e3476133ea3304b0a1f7efec1a4efdbd",
|
||||
"@rollup/rollup-android-arm64@npm:4.46.4": "61041fbc16fc274d27a5780041235c21bd1ad453bccfb60ac58d253a12673b34c4615b2ee60d92abafa14eef4405c4e907e8fd9c750fd29a55cdb279f8fac87a",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.46.4": "61ab7f693dd752352d1cd3baa1375b9f09bc044fc3612460685752cb6c526b1eab02fc9b3acd30ef4e1e0a65046ce418fa11b6c3fe503e9d105dfca513cdca19",
|
||||
"@rollup/rollup-darwin-x64@npm:4.46.4": "3c3f7aff3151f19acc5791b55426871353c298e6c4685525778395e04a441664b5dbe840c0dfc384f4b09c540fc0721c2fe55e82c868d44262f4db1e1e0a1637",
|
||||
"@rollup/rollup-freebsd-arm64@npm:4.46.4": "fda6ff0b60bdd1e73cc81ac597681ab9f6d9955bb57de6585ef1215ecd1821256f85bc6bff556522460c98c618c178601782253946866f605a48a05f69f897c3",
|
||||
"@rollup/rollup-freebsd-x64@npm:4.46.4": "c173fbd95d3530ae20972e22b1e82f79b6e9ac685185bb5ecb38b1bb85385d1a2511ec5ae65c67406915b14e1e553e1953eca93b18040093d4b596303347f9eb",
|
||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.46.4": "e20c0f7f45281a78ae67e6fc75f8bc1fd1d1ffb366c2f727c04d2c8d2e3bc468501920448c32284082f0025a872cf074cd30d8fef1254d04f0e3bcc9ba8b5a50",
|
||||
"@rollup/rollup-linux-arm-musleabihf@npm:4.46.4": "10f315b0adaf6022bbaaa8caccda6c8ee09db72d72ebe8ca50c1906b1c5e619441a96608d7831fb35bc5426103080cc947a60a5f441f45389bf370ea0f7de4cb",
|
||||
"@rollup/rollup-linux-arm64-gnu@npm:4.46.4": "51716d5d8afcb316f509b262ea2981125df6c3446da56ac75744595c7a001ac3edfdade8560bec48a20618d9e0ab5861e79769f97a3c001bf581fff3c1ae6d73",
|
||||
"@rollup/rollup-linux-arm64-musl@npm:4.46.4": "f91c1d7ccf33522d4b9737ec83b77e7653e1a3e6c225fa20b92616eed7d96e753689a0ce536771561435dd0a08b60ea4c45e615a17aad6aa2f52a982d4453cc7",
|
||||
"@rollup/rollup-linux-loongarch64-gnu@npm:4.46.4": "bc4142527835846e19034736ff9b95b92b9f7945ba6842dc555b9b82d2ef49328ab272264704edbba3452586d7c423dbe554605168bb1c178432ecc48698cc09",
|
||||
"@rollup/rollup-linux-ppc64-gnu@npm:4.46.4": "8ff88717144ade71ebdbc6630d25d206700ffb7d85b549fbf40dc5786cec24079f084b040a7dae5ed6adab110e9952935b2603eeec6e488d924e88a103b22861",
|
||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.46.4": "77f82af4da7ac78452b3a9e81f6408b84005062405667acea55410ae72beb02bcb2cf66d551e912344b62d3b5d605670be8a394158cd54a19a5f95f370c6502b",
|
||||
"@rollup/rollup-linux-riscv64-musl@npm:4.46.4": "278a9abc7816b3370833a91676c1001eeca17bc1717231bcbf92a286ec4bcdeb5416f3efe0fd7c8f89ee1aa323b651769380e0b4c27a3d472d87f88c7682f8f2",
|
||||
"@rollup/rollup-linux-s390x-gnu@npm:4.46.4": "717e74e68f26988552ae074de11f7fa421a546c6371c7db4453e0e1011c1d954d3a7349b8bffec1160f8b89a13d11bad977aaff12eb64e37f1de3bcb3810857c",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.46.4": "d7734157db2dd6d25f00b4cd23442fc1c7e23ef5dd7226635243b7a26ca91064a25c0b458180457a5ebe2a7f3bc591297356290a26c93c5a4e4a9e36556f6ac2",
|
||||
"@rollup/rollup-linux-x64-musl@npm:4.46.4": "41428ac6fefdf4bfc142387b687e3913b3a21fe118973e6fd9e757b5cfeca1c825919a5bbde05cfa00672d5a26cd264af76e82af3663d696bb66e3258886b2ec",
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.46.4": "feb15d6bc577fe552239281b86ce17f285a0e69e1b9071da277e8351d98d977b24988c195d124f930348c6a6111ac974ab6a1d61b247644cf6ff5629a7134909",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.46.4": "505d598fd08db80b37d706a95e274afeea675626ca24a08442689a77fe3b0749ab67ced39cbc28ac3758fbfb0b98f410d5031beaf7bc182867cb309ebc4fd4ce",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.46.4": "8b804ddfb2dc6881fd123aa9e7764d2deb26a90b1867a0592871df9f98a8e3257d41b2da074f3d3e73ea11e6fe1605d2067bbf564427c7f63f8aaf97d1912140",
|
||||
"@rolldown/binding-android-arm64@npm:1.0.3": "35e2b7f9e54c526cee5433351b0ef376dd1657d8a6eecf00512dec4720bb02594268bf8d3b661199917bdd286d4370bf3c3461b08eb74f0eae77bd13585e260a",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.0.3": "7e7d168d091053100a785c0240d6d6134039bf0fb7a658624fa33426b148e9b8131d1690729b32a7b1e65329879c15601b7afd576e149ca6feb6302c530ed860",
|
||||
"@rolldown/binding-darwin-x64@npm:1.0.3": "0721c045d1446138e49dca250c8716c1b2eb4f1595bf1226a2c273befa063f91c4623e4cd5d338e969626e4281541b958c4a3d4649c0c553da0ec42292450a8d",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.0.3": "faa48a73ac1b1a4af8ed7b67932a59b62f139d76f21d1ccbe5efb5ab8a5a61e1f5de0b5d9367a9ecd8759bdab3aa1734aefd2214bbe2cfc4b0cb119f6e5391da",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "fab607d7639bf6d3393f6e0da0c9680e2d357b550abc50d7dc60cd45e25c788cddee38deac074d9c987e22532d83dcd8a76564710654663bd65622a190548c72",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "a067fc8d80a6af88893010abb55d697221afa8f9d3f468082bc759305f2decbf16f8655a5313e6e608d1b2f103d28922607290ab85d575b78930bc9daa777204",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.0.3": "b1264d8302780c991260991733cf156c1ed43fed66fce60e5a265577aced196b92907cfcbe8d3262621b8e08106f1f555743c601fe60676c08ffae0edd821128",
|
||||
"@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "82f33061f5003b99bac68a0637bf7665f6fb2b22cfc025e4d7762afefe703af2acc1cd2df8ff07bb000b0eecd3e59959992481a5b03794604af090eaa843c70f",
|
||||
"@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "a6a3811352aa5db6a793879bf405bb98eaeca06cfd1aae959a9ed70db39b28e0a022ca50524cdd26d0447fa7b9c5ef913281cf543f816ac6e3ea6b6d620af88a",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.0.3": "13ece4e580f022a1a70031da2036448097bc38d040d1e87ee81cffd9e1ab8b64673e92843718470e3d07ea664171dc2c20d766cbafbb0ca8774e3c4f0b122c7d",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.0.3": "6beeffe835e820679868021e01fb629fe124813911dd625bd3d24b1592450c06131b360e284396aca04798e6a85f988917ea00e95b3ea087a32a45441bad3235",
|
||||
"@rolldown/binding-openharmony-arm64@npm:1.0.3": "f8e8352edde4d2345e3e360bb050915daf0d9ee4c491024a08e56088801994f2cbdf0152f81115a089c1870863e6384135765126114cf8481933bc15678e1dde",
|
||||
"@rolldown/binding-wasm32-wasi@npm:1.0.3": "3f73081fc41cbd8c117183fecb0f491a71278472c0640b54e57a3a6705005f54d7997c610244d2ff651d5d688a20596ab1119e3dccf607f59fdea4ec0621da49",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "a29f05721b276acdeb7f00b43b9c6241f9c4cc60b820d6b9217d205cfd0ee66a82a29da501e60163c66ce7cc8cb6362f88933b466dea66e3219b38d15954873e",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d6afa484d89c9479561a0621709dfc9737584515f87e96fa74f7d153bbde74f81b6ba7aac92187189ffb4dd1795fa152c596a04ae9a41ffab7437babc5a15838",
|
||||
"@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
|
||||
"@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
|
||||
"@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
|
||||
@@ -75,5 +110,16 @@
|
||||
"@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
|
||||
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
|
||||
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
|
||||
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
|
||||
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940",
|
||||
"lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
|
||||
"lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
|
||||
"lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
|
||||
"lightningcss-freebsd-x64@npm:1.32.0": "0eb59f6acf2fcdc944c921b0ac2a16ee803452b9438f573ad6bc41be00040b791ed698698ed5c06f98ef43a6fed0a54987ba3a88da204de9978db2fca96a4a65",
|
||||
"lightningcss-linux-arm-gnueabihf@npm:1.32.0": "7d1ea43986d2370a90cefc920dac3e041e0d19445cc4fdaf244644b57b6937588d7c3a464c31440617231f55a6dad79744cf707912e05f3b46a1694abb5b4e00",
|
||||
"lightningcss-linux-arm64-gnu@npm:1.32.0": "f01ede75f41480a164d18338fa46d9fccdb4a821717174ce848ff8b2aa4badba4f1d331deb3ebec3ee2f0eb95bfa2e35f54877f371427b04e6f36a4783aa1414",
|
||||
"lightningcss-linux-arm64-musl@npm:1.32.0": "38d373f99768f1c5ab6a9c87e1c0ec45eccdb3fe4d216dd5cd06629648c4b0689570ad4e89285d490662cde1790cd36e6b3d176c14e5e31f6869c604aa2df820",
|
||||
"lightningcss-linux-x64-gnu@npm:1.32.0": "0a1433d46a4a010f87b615c3fa43725a456bae259858a2c927899cbf93074f0ae40f49901bf6af6daa30a4d169c86f594f6341fd775bf7b59293b8d7947b81c5",
|
||||
"lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e",
|
||||
"lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0",
|
||||
"lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e"
|
||||
}
|
||||
|
||||
@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
|
||||
-exec brotli --best --keep {} ';'
|
||||
find public/packs -type f -regextype posix-extended -iregex '.*\.(css|js|json|svg)' \
|
||||
-exec brotli --best --keep {} ';'
|
||||
gzip --best --keep public/packs/sw.js
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@@ -5,22 +5,19 @@
|
||||
patches ? [ ],
|
||||
}:
|
||||
let
|
||||
version = "4.5.11";
|
||||
version = "4.6.0";
|
||||
in
|
||||
applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mastodon";
|
||||
repo = "mastodon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YAWlge8dShDFfMBhyRQHryZUs1yD5KNKzXOyCpRsy9w=";
|
||||
hash = "sha256-+rvl0+/3Hn9QYKwYT0ZTlP+Ps7y+G+D2Dcu/fEhP79g=";
|
||||
passthru = {
|
||||
inherit version;
|
||||
yarnHash = "sha256-OFPwe0OqvJhbJuY6gVuQJB5dGE8q6IPrsfW9NK8oVPM=";
|
||||
yarnHash = "sha256-G1keSWDDpp0vBAOqQI8y8n7bmAeo9Hrdbo7R+cVZQwE=";
|
||||
yarnMissingHashes = ./missing-hashes.json;
|
||||
};
|
||||
};
|
||||
patches = patches ++ [
|
||||
# Remove when https://github.com/mastodon/mastodon/commit/048700da2f95e492a81fde902f4d48c278763a6d is released
|
||||
./yarn-4.14-support.patch
|
||||
];
|
||||
patches = patches ++ [ ];
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mimir";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "mimir-${finalAttrs.version}";
|
||||
owner = "grafana";
|
||||
repo = "mimir";
|
||||
hash = "sha256-rz1Wzsnxt8eGf0rkI8pvhpft+EhTUsdFK4s+9QVn7dg=";
|
||||
hash = "sha256-Hw7TiUyTXZ/CKT4jeyWYVQM4EY/DbwBtaTEebNHonGs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"mimir-(3\\.[0-9.]+)"
|
||||
"mimir-(3\\.0\\.[0-9]+)"
|
||||
];
|
||||
};
|
||||
tests = {
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.14";
|
||||
version = "15.0.16";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-E/q2wXeTGcEhiAvUCrFKv34gc4vP4o3ZPjqkcS6Dxgk=";
|
||||
hash = "sha256-mlQUAdGcOUbqReROqhs4fwSUmTZqQAEhwsg6ulM2hx4=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -21,16 +21,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "navidrome";
|
||||
version = "0.61.2";
|
||||
version = "0.62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "navidrome";
|
||||
repo = "navidrome";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-epSgGiDdfNRUaQtWoOd4ADKtF7Ptt3p9UOqsWBzZg7I=";
|
||||
hash = "sha256-pLhb2x3dGLsCk405rBVdMwazhf0EQd72VLKtlzGoJDA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RmmZudmWBxiw+c9g8KFEX+ALFD0xP/SBsYc6b6RWWO8=";
|
||||
vendorHash = "sha256-3ciCzFhJi4YTIjGbPJ2UP8mPzQe3vBgZ+Pc7Nto1LEw=";
|
||||
|
||||
npmRoot = "ui";
|
||||
|
||||
|
||||
@@ -94,10 +94,6 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
patches = [
|
||||
./prometheus-pr18519-fix-TestFsType.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
--- a/util/runtime/statfs_unix_test.go
|
||||
+++ b/util/runtime/statfs_unix_test.go
|
||||
@@ -19,20 +19,18 @@ import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
- "github.com/grafana/regexp"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
-var regexpFsType = regexp.MustCompile("^[A-Z][A-Z0-9_]*_MAGIC$")
|
||||
-
|
||||
func TestFsType(t *testing.T) {
|
||||
var fsType string
|
||||
|
||||
path, err := os.Getwd()
|
||||
require.NoError(t, err)
|
||||
|
||||
+ // A real path must yield a non-zero filesystem type.
|
||||
fsType = FsType(path)
|
||||
- require.Regexp(t, regexpFsType, fsType)
|
||||
+ require.NotEqual(t, "0", fsType)
|
||||
|
||||
fsType = FsType("/no/where/to/be/found")
|
||||
require.Equal(t, "0", fsType)
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
version = "3.11.3";
|
||||
hash = "sha256-JmnVTVW6LsrdiQspKznksyhAYkmCXQcqCLK8q5nZI48=";
|
||||
npmDepsHash = "sha256-6uE8d3+v5wobSyCl8oYlbNQZjRj/WtvVrpzo/PR2hQA=";
|
||||
vendorHash = "sha256-wR1b5jV/2B50OeKokv8Ss+tpSXNjJBsLIZrK7gOb168=";
|
||||
version = "3.12.0";
|
||||
hash = "sha256-xeENUVmG9tbIF+7i2u9zuvo7RXI9iNWFVDNUfNpF6/4=";
|
||||
npmDepsHash = "sha256-cHMI5DqSRpIanrgk/H3aFUHLrGXH1v796PH1qDrCnbE=";
|
||||
vendorHash = "sha256-caSI9uzbH93j06sJus9jSqo6qHKbP8D9DuDkiAlnfF4=";
|
||||
}
|
||||
|
||||
@@ -2,32 +2,56 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
meson,
|
||||
pkg-config,
|
||||
libxml2,
|
||||
libusb1,
|
||||
libzip,
|
||||
cmocka,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdl";
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-msm";
|
||||
repo = "qdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/lvKMC0bJdfqhPCuBYChX/6Aybpu+cPg0Vjl2HDbOeE=";
|
||||
hash = "sha256-oZ/1Pe81VOAmZiywSC2jC1OcDtaH84GAuo8AqiE77d4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
patches = [
|
||||
# allow VERSION to be overridden, will land in 2.8
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/linux-msm/qdl/commit/6f8700ed81b3614baa12786a9845c9abeab1e178.patch";
|
||||
hash = "sha256-fDC34Wq4MadDDLHVQ5zuRKE2zD2dOMTU8EGINcJTYuI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
cmocka
|
||||
ninja
|
||||
];
|
||||
buildInputs = [
|
||||
libxml2
|
||||
libusb1
|
||||
libzip
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"VERSION=${finalAttrs.src.rev}"
|
||||
"prefix=${placeholder "out"}"
|
||||
mesonFlags = [
|
||||
"--prefix=${placeholder "out"}"
|
||||
"-DVERSION=${finalAttrs.src.rev}"
|
||||
|
||||
# Tests currently fail to link but seem rather new
|
||||
# https://github.com/linux-msm/qdl/issues/260
|
||||
# test_contents_selectors.c:(.text+0x234e): undefined reference to `firehose_alloc_op'
|
||||
"-Dtests=disabled"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
enableWebui ? true,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
nodejs,
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "rmfakecloud";
|
||||
version = "0.0.29";
|
||||
version = "0.0.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddvk";
|
||||
repo = "rmfakecloud";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N6hAv8dVCM3VWuKpHlK82mjQh6RB7W+n9KBNNQXDrC8=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0eESaBe9FGqDrAumS8ANEEaB4FgbZsgWX1487J3Li4I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XksCJ9b5NDIutwqnWP63R2udp/Y5qkkgo2a4TPUi0Z4=";
|
||||
vendorHash = "sha256-A+y63w+sEleXFh4ZHgFo1IhsQ2KhqqKW4vRPi393atI=";
|
||||
|
||||
# if using webUI build it
|
||||
# use env because of https://github.com/NixOS/nixpkgs/issues/358844
|
||||
@@ -33,9 +33,9 @@ buildGoModule rec {
|
||||
;
|
||||
sourceRoot = "${src.name}/ui";
|
||||
pnpmLock = "${src}/ui/pnpm-lock.yaml";
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-5dsrf6Iff8z4ujzUccuNFwChChbWzXeXDilh8uZyl+U=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-UQT6uYusDw7Hd+1URrSQkyorajih6oF0LSMpPZy9K1w=";
|
||||
};
|
||||
preBuild = lib.optionals enableWebui ''
|
||||
# using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
|
||||
@@ -49,7 +49,7 @@ buildGoModule rec {
|
||||
nativeBuildInputs = lib.optionals enableWebui [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
];
|
||||
|
||||
# ... or don't embed it in the server
|
||||
|
||||
@@ -102,7 +102,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.15";
|
||||
version = "15.0.16";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -112,7 +112,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-UlKf5YPGnPCKzCiFu1dxLg6kg3bJQAcZlwOKE9rTIgQ=";
|
||||
hash = "sha256-EVQMUSBKVErtMoXzjxWd+ga6tptS7GsnJvdw0e2s5Qc=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -122,7 +122,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-bIFw4QOIgEQBdcQqjYRKWmy/C0srG0eBBR5H5oteWlo=";
|
||||
hash = "sha256-c4sA3uKZZdPSdSmIOs536s5fHUw39+y/l4vS6H4cYrI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
284
pkgs/by-name/us/usb-modeswitch/configurable-usb-modeswitch.patch
Normal file
284
pkgs/by-name/us/usb-modeswitch/configurable-usb-modeswitch.patch
Normal file
@@ -0,0 +1,284 @@
|
||||
Index: usb-modeswitch-2.6.2/Makefile
|
||||
===================================================================
|
||||
--- usb-modeswitch-2.6.2/Makefile
|
||||
+++ usb-modeswitch-2.6.2/Makefile
|
||||
@@ -5,17 +5,24 @@ CFLAGS += -Wall -Wno-deprecated-dec
|
||||
LIBS = `pkg-config --libs --cflags libusb-1.0`
|
||||
RM = /bin/rm -f
|
||||
OBJS = usb_modeswitch.c
|
||||
-PREFIX = $(DESTDIR)/usr
|
||||
-ETCDIR = $(DESTDIR)/etc
|
||||
+PREFIX = /usr/local
|
||||
+ETCDIR = $(PREFIX)/etc
|
||||
SYSDIR = $(ETCDIR)/systemd/system
|
||||
UPSDIR = $(ETCDIR)/init
|
||||
-UDEVDIR = $(DESTDIR)/lib/udev
|
||||
+UDEVDIR = $(PREFIX)/lib/udev
|
||||
SBINDIR = $(PREFIX)/sbin
|
||||
MANDIR = $(PREFIX)/share/man/man1
|
||||
|
||||
+USE_UPSTART=$(shell if command -v initctl > /dev/null; then echo "true"; fi)
|
||||
+USE_SYSTEMD=$(shell if command -v systemctl > /dev/null; then echo "true"; fi)
|
||||
+
|
||||
.PHONY: clean install install-common uninstall \
|
||||
dispatcher-script dispatcher-dynlink dispatcher-statlink \
|
||||
- install-script install-dynlink install-statlink
|
||||
+ install-script install-dynlink install-statlink \
|
||||
+ install-upstart install-systemd \
|
||||
+ configure-dispatcher configure-script \
|
||||
+ configure-upstart configure-systemd \
|
||||
+ configure
|
||||
|
||||
all: all-with-script-dispatcher
|
||||
|
||||
@@ -28,7 +35,25 @@ all-with-statlink-dispatcher: $(PROG) di
|
||||
$(PROG): $(OBJS) usb_modeswitch.h
|
||||
$(CC) -o $(PROG) $(OBJS) $(CFLAGS) $(LIBS) $(LDFLAGS)
|
||||
|
||||
-dispatcher-script: usb_modeswitch_dispatcher.tcl
|
||||
+configure-dispatcher:
|
||||
+ sed -i \
|
||||
+ -e 's,^\(set setup(sbindir) \).*$$,\1$(SBINDIR),' \
|
||||
+ -e 's,^\(set setup(etcdir) \).*$$,\1$(ETCDIR),' \
|
||||
+ usb_modeswitch_dispatcher.tcl
|
||||
+
|
||||
+configure-script:
|
||||
+ sed -i -e 's,^\(SBINDIR=\).*$$,\1$(SBINDIR),' usb_modeswitch.sh
|
||||
+
|
||||
+configure-systemd:
|
||||
+ sed -i -e 's,@sbindir@,$(SBINDIR),' usb_modeswitch@.service
|
||||
+
|
||||
+configure-upstart:
|
||||
+ sed -i -e 's,@sbindir@,$(SBINDIR),' usb-modeswitch-upstart.conf
|
||||
+
|
||||
+configure: configure-dispatcher configure-script \
|
||||
+ configure-systemd configure-upstart
|
||||
+
|
||||
+dispatcher-script: configure-dispatcher usb_modeswitch_dispatcher.tcl
|
||||
DISPATCH=dispatcher-script
|
||||
cp -f usb_modeswitch_dispatcher.tcl usb_modeswitch_dispatcher
|
||||
|
||||
@@ -53,16 +78,28 @@ distclean: clean
|
||||
# If the systemd folder is present, install the service for starting the dispatcher
|
||||
# If not, use the dispatcher directly from the udev rule as in previous versions
|
||||
|
||||
-install-common: $(PROG) $(DISPATCH)
|
||||
- install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
|
||||
- install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
|
||||
- install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
|
||||
- install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
|
||||
- install -D --mode=644 usb_modeswitch_dispatcher.1 $(MANDIR)/usb_modeswitch_dispatcher.1
|
||||
- install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
|
||||
+install-common: $(PROG) configure $(DISPATCH)
|
||||
+ install -D --mode=755 usb_modeswitch $(DESTDIR)$(SBINDIR)/usb_modeswitch
|
||||
+ install -D --mode=755 usb_modeswitch.sh $(DESTDIR)$(UDEVDIR)/usb_modeswitch
|
||||
+ install -D --mode=644 usb_modeswitch.conf $(DESTDIR)$(ETCDIR)/usb_modeswitch.conf
|
||||
+ install -D --mode=644 usb_modeswitch.1 $(DESTDIR)$(MANDIR)/usb_modeswitch.1
|
||||
+ install -D --mode=644 usb_modeswitch_dispatcher.1 $(DESTDIR)$(MANDIR)/usb_modeswitch_dispatcher.1
|
||||
+ install -D --mode=755 usb_modeswitch_dispatcher $(DESTDIR)$(SBINDIR)/usb_modeswitch_dispatcher
|
||||
install -d $(DESTDIR)/var/lib/usb_modeswitch
|
||||
- test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
|
||||
- test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
|
||||
+
|
||||
+install-upstart:
|
||||
+ install -D --mode=644 usb-modeswitch-upstart.conf $(DESTDIR)$(UPSDIR)/usb-modeswitch-upstart.conf
|
||||
+
|
||||
+install-systemd:
|
||||
+ install -D --mode=644 usb_modeswitch@.service $(DESTDIR)$(SYSDIR)/usb_modeswitch@.service
|
||||
+
|
||||
+ifeq ($(USE_UPSTART),true)
|
||||
+install-common: install-upstart
|
||||
+endif
|
||||
+
|
||||
+ifeq ($(USE_SYSTEMD),true)
|
||||
+install-common: install-systemd
|
||||
+endif
|
||||
|
||||
install: install-script
|
||||
|
||||
@@ -73,10 +110,10 @@ install-dynlink: dispatcher-dynlink inst
|
||||
install-statlink: dispatcher-statlink install-common
|
||||
|
||||
uninstall:
|
||||
- $(RM) $(SBINDIR)/usb_modeswitch
|
||||
- $(RM) $(SBINDIR)/usb_modeswitch_dispatcher
|
||||
- $(RM) $(UDEVDIR)/usb_modeswitch
|
||||
- $(RM) $(ETCDIR)/usb_modeswitch.conf
|
||||
- $(RM) $(MANDIR)/usb_modeswitch.1
|
||||
+ $(RM) $(DESTDIR)$(SBINDIR)/usb_modeswitch
|
||||
+ $(RM) $(DESTDIR)$(SBINDIR)/usb_modeswitch_dispatcher
|
||||
+ $(RM) $(DESTDIR)$(UDEVDIR)/usb_modeswitch
|
||||
+ $(RM) $(DESTDIR)$(ETCDIR)/usb_modeswitch.conf
|
||||
+ $(RM) $(DESTDIR)$(MANDIR)/usb_modeswitch.1
|
||||
$(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
|
||||
- $(RM) $(SYSDIR)/usb_modeswitch@.service
|
||||
+ $(RM) $(DESTDIR)$(SYSDIR)/usb_modeswitch@.service
|
||||
Index: usb-modeswitch-2.6.2/usb-modeswitch-upstart.conf
|
||||
===================================================================
|
||||
--- usb-modeswitch-2.6.2.orig/usb-modeswitch-upstart.conf
|
||||
+++ usb-modeswitch-2.6.2/usb-modeswitch-upstart.conf
|
||||
@@ -1,5 +1,5 @@
|
||||
start on usb-modeswitch-upstart
|
||||
task
|
||||
script
|
||||
- exec /usr/sbin/usb_modeswitch_dispatcher --switch-mode $UMS_PARAM
|
||||
+ exec @sbindir@/usb_modeswitch_dispatcher --switch-mode $UMS_PARAM
|
||||
end script
|
||||
Index: usb-modeswitch-2.6.2/usb_modeswitch.sh
|
||||
===================================================================
|
||||
--- usb-modeswitch-2.6.2.orig/usb_modeswitch.sh
|
||||
+++ usb-modeswitch-2.6.2/usb_modeswitch.sh
|
||||
@@ -1,5 +1,9 @@
|
||||
#!/bin/sh
|
||||
# part of usb_modeswitch 2.6.2
|
||||
+
|
||||
+# Compile time configuration, injected by the Makefile
|
||||
+SBINDIR=/usr/sbin
|
||||
+
|
||||
device_in()
|
||||
{
|
||||
if [ ! -e /var/lib/usb_modeswitch/$1 ]; then
|
||||
@@ -37,7 +41,7 @@ if [ $(expr "$1" : "--.*") ]; then
|
||||
v_id=$3
|
||||
fi
|
||||
fi
|
||||
-PATH=/sbin:/usr/sbin:$PATH
|
||||
+
|
||||
case "$1" in
|
||||
--driver-bind)
|
||||
# driver binding code removed
|
||||
@@ -46,9 +50,7 @@ case "$1" in
|
||||
--symlink-name)
|
||||
device_in "link_list" $v_id $p_id
|
||||
if [ "$?" = "1" ]; then
|
||||
- if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
|
||||
- exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
|
||||
- fi
|
||||
+ exec $SBINDIR/usb_modeswitch_dispatcher $1 $2 2>>/dev/null
|
||||
fi
|
||||
exit 0
|
||||
;;
|
||||
@@ -61,15 +63,13 @@ if [ "$p2" = "" -a "$p1" != "" ]; then
|
||||
p2=$p1
|
||||
fi
|
||||
|
||||
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
|
||||
-init_path=`readlink -f /sbin/init`
|
||||
-if [ `basename $init_path` = "systemd" ]; then
|
||||
+if command -v systemctl > /dev/null; then
|
||||
systemctl --no-block restart usb_modeswitch@$p2.service
|
||||
-elif [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
|
||||
+elif command -v initctl > /dev/null; then
|
||||
initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$p2
|
||||
else
|
||||
# only old distros, new udev will kill all subprocesses
|
||||
exec 1<&- 2<&- 5<&- 7<&-
|
||||
- exec usb_modeswitch_dispatcher --switch-mode $p2 &
|
||||
+ exec $SBINDIR/usb_modeswitch_dispatcher --switch-mode $p2 &
|
||||
fi
|
||||
exit 0
|
||||
Index: usb-modeswitch-2.6.2/usb_modeswitch@.service
|
||||
===================================================================
|
||||
--- usb-modeswitch-2.6.2.orig/usb_modeswitch@.service
|
||||
+++ usb-modeswitch-2.6.2/usb_modeswitch@.service
|
||||
@@ -3,7 +3,7 @@ Description=USB_ModeSwitch_%i
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
-ExecStart=/usr/sbin/usb_modeswitch_dispatcher --switch-mode %i
|
||||
+ExecStart=@sbindir@/usb_modeswitch_dispatcher --switch-mode %i
|
||||
# Testing
|
||||
#ExecStart=/bin/echo "usb_modeswitch.service: device name is %i"
|
||||
|
||||
Index: usb-modeswitch-2.6.2/usb_modeswitch_dispatcher.tcl
|
||||
===================================================================
|
||||
--- usb-modeswitch-2.6.2.orig/usb_modeswitch_dispatcher.tcl
|
||||
+++ usb-modeswitch-2.6.2/usb_modeswitch_dispatcher.tcl
|
||||
@@ -24,6 +24,16 @@
|
||||
#
|
||||
# http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
+# Compile-time configuration, injected by the Makefile.
|
||||
+set setup(sbindir) /usr/sbin
|
||||
+set setup(etcdir) /etc
|
||||
+
|
||||
+# External dependency default location
|
||||
+set setup(dbdir) /usr/share/usb_modeswitch
|
||||
+
|
||||
+# Derived configuration
|
||||
+set setup(dbdir_etc) $setup(etcdir)/usb_modeswitch.d
|
||||
+
|
||||
set arg0 [lindex $argv 0]
|
||||
if [regexp {\.tcl$} $arg0] {
|
||||
if [file exists $arg0] {
|
||||
@@ -115,10 +125,8 @@ if {![regexp {(.*?):.*$} $arg1 d device]
|
||||
}
|
||||
}
|
||||
|
||||
-set setup(dbdir) /usr/share/usb_modeswitch
|
||||
-set setup(dbdir_etc) /etc/usb_modeswitch.d
|
||||
if {![file exists $setup(dbdir)] && ![file exists $setup(dbdir_etc)]} {
|
||||
- Log "\nError: no config database found in /usr/share or /etc. Exit"
|
||||
+ Log "\nError: no config database found in $setup(dbdir) or $setup(dbdir_etc). Exit"
|
||||
SafeExit
|
||||
}
|
||||
|
||||
@@ -285,7 +293,7 @@ if {$config(NoMBIMCheck)==0 && $usb(bNum
|
||||
if [CheckMBIM] {
|
||||
Log " driver for MBIM devices is available"
|
||||
Log "Find MBIM configuration number ..."
|
||||
- if [catch {set cfgno [exec /usr/sbin/usb_modeswitch -j -Q $busParam $devParam -v $usb(idVendor) -p $usb(idProduct)]} err] {
|
||||
+ if [catch {set cfgno [exec $setup(sbindir)/usb_modeswitch -j -Q $busParam $devParam -v $usb(idVendor) -p $usb(idProduct)]} err] {
|
||||
Log "Error when trying to find MBIM configuration, switch to legacy modem mode"
|
||||
} else {
|
||||
set cfgno [string trim $cfgno]
|
||||
@@ -321,7 +329,7 @@ if {$report == ""} {
|
||||
# Now we are actually switching
|
||||
if $flags(logging) {
|
||||
Log "Command line:\nusb_modeswitch -W -D $configParam $busParam $devParam -v $usb(idVendor) -p $usb(idProduct) -f \$flags(config)"
|
||||
- catch {set report [exec /usr/sbin/usb_modeswitch -W -D $configParam $busParam $devParam -v $usb(idVendor) -p $usb(idProduct) -f "$flags(config)" 2>@1]} report
|
||||
+ catch {set report [exec $setup(sbindir)/usb_modeswitch -W -D $configParam $busParam $devParam -v $usb(idVendor) -p $usb(idProduct) -f "$flags(config)" 2>@1]} report
|
||||
Log "\nVerbose debug output of usb_modeswitch and libusb follows"
|
||||
Log "(Note that some USB errors are to be expected in the process)"
|
||||
Log "--------------------------------"
|
||||
@@ -329,7 +337,7 @@ if {$report == ""} {
|
||||
Log "--------------------------------"
|
||||
Log "(end of usb_modeswitch output)\n"
|
||||
} else {
|
||||
- catch {set report [exec /usr/sbin/usb_modeswitch -Q -D $configParam $busParam $devParam -v $usb(idVendor) -p $usb(idProduct) -f "$flags(config)" 2>@1]} report
|
||||
+ catch {set report [exec $setup(sbindir)/usb_modeswitch -Q -D $configParam $busParam $devParam -v $usb(idVendor) -p $usb(idProduct) -f "$flags(config)" 2>@1]} report
|
||||
}
|
||||
}
|
||||
|
||||
@@ -522,12 +530,12 @@ return 1
|
||||
|
||||
proc {ParseGlobalConfig} {path} {
|
||||
|
||||
-global flags
|
||||
+global flags setup
|
||||
set configFile ""
|
||||
if [string length $path] {
|
||||
set places [list $path]
|
||||
} else {
|
||||
- set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch]
|
||||
+ set places [list $setup(etcdir)/usb_modeswitch.conf $setup(etcdir)/sysconfig/usb_modeswitch $setup(etcdir)/default/usb_modeswitch]
|
||||
}
|
||||
foreach cfg $places {
|
||||
if [file exists $cfg] {
|
||||
@@ -923,10 +931,12 @@ proc {SysLog} {msg} {
|
||||
|
||||
global flags
|
||||
if {![info exists flags(logger)]} {
|
||||
- set flags(logger) ""
|
||||
- foreach fn {/bin/logger /usr/bin/logger} {
|
||||
- if [file exists $fn] {
|
||||
- set flags(logger) $fn
|
||||
+ set flags(logger) [exec sh -c "command -v logger || true"]
|
||||
+ if {$flags(logger) == ""} {
|
||||
+ foreach fn {/bin/logger /usr/bin/logger} {
|
||||
+ if [file exists $fn] {
|
||||
+ set flags(logger) $fn
|
||||
+ }
|
||||
}
|
||||
}
|
||||
Log "Logger is $flags(logger)"
|
||||
@@ -20,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-96vTN3hKnRvTnLilh1GK/28qQ9kWFF6v2Asbi3FG22Y=";
|
||||
};
|
||||
|
||||
patches = [ ./pkg-config.patch ];
|
||||
patches = [
|
||||
./configurable-usb-modeswitch.patch
|
||||
./pkg-config.patch
|
||||
];
|
||||
|
||||
# Remove attempts to write to /etc and /var/lib.
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "VictoriaLogs";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaLogs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hlRHTTwGPXAMVscIeHxac7KCNWEdBy7WS/KbxwMTl7w=";
|
||||
hash = "sha256-8rUDMV7bxMxyU0NYIMFSqGzSMwGogKFDliGXf4VSoCI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "viddy";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sachaos";
|
||||
repo = "viddy";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0=";
|
||||
hash = "sha256-RyPG8OAg3i9N2Fq5Hij48wMvfQuTNmJFpatvB3HbXKg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Bp3t/fjaFeouIoKlRvQPVDlc46Ggitfx6HUXE+RZN0A=";
|
||||
cargoHash = "sha256-P+TtxV2kuHeBHr8GQeJ0VWPkjimfcAtBUFt0z79ML6A=";
|
||||
|
||||
env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script
|
||||
env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
systemd,
|
||||
udev,
|
||||
libGL,
|
||||
libglvnd,
|
||||
fontconfig,
|
||||
freetype,
|
||||
openssl,
|
||||
@@ -173,6 +174,44 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
wemeet-camera-fix = stdenv.mkDerivation {
|
||||
pname = "wemeet-camera-fix";
|
||||
version = "0-unstable-2026-05-20";
|
||||
|
||||
src = ./wemeet-camera-fix.c;
|
||||
|
||||
dontUnpack = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
libglvnd
|
||||
libx11
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
$CC $CFLAGS -Wall -Wextra -fPIC -shared \
|
||||
-o libwemeet-camera-fix.so $src \
|
||||
-ldl -lEGL -lX11
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 ./libwemeet-camera-fix.so $out/lib/libwemeet-camera-fix.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Fix for WeMeet Wayland camera preview rendering";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
selectSystem =
|
||||
attrs:
|
||||
attrs.${stdenv.hostPlatform.system}
|
||||
@@ -284,7 +323,7 @@ stdenv.mkDerivation {
|
||||
"--prefix QT_PLUGIN_PATH : $out/app/wemeet/plugins"
|
||||
];
|
||||
commonWrapperArgs = baseWrapperArgs ++ [
|
||||
"--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so:${wemeet-x11-fix}/lib/libwemeet-x11-fix.so"
|
||||
"--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so:${wemeet-x11-fix}/lib/libwemeet-x11-fix.so:${wemeet-camera-fix}/lib/libwemeet-camera-fix.so"
|
||||
"--run 'if [[ $XDG_SESSION_TYPE == \"wayland\" ]]; then export LD_PRELOAD=${wemeet-wayland-screenshare}/lib/wemeet/libhook.so\${LD_PRELOAD:+:$LD_PRELOAD}; fi'"
|
||||
];
|
||||
xwaylandWrapperArgs = baseWrapperArgs ++ [
|
||||
|
||||
154
pkgs/by-name/we/wemeet/wemeet-camera-fix.c
Normal file
154
pkgs/by-name/we/wemeet/wemeet-camera-fix.c
Normal file
@@ -0,0 +1,154 @@
|
||||
/*
|
||||
* LD_PRELOAD shim for WeMeet's camera preview on Wayland.
|
||||
*
|
||||
* WeMeet's libxcast.so uses EGL to render the local camera preview. It links
|
||||
* against libEGL and libX11, and later passes X11 native windows to EGL. In a
|
||||
* Wayland session, Mesa can choose the Wayland EGL platform for
|
||||
* eglGetDisplay(NULL), which makes libxcast.so hand an X11 XID to the Wayland
|
||||
* platform path when creating its window surface. The camera still opens and
|
||||
* remote participants can see it, but the local preview fails to render or may
|
||||
* crash.
|
||||
*
|
||||
* Only for calls originating in libxcast.so, force EGL display creation through
|
||||
* the X11 platform. Qt/QtWebEngine and other callers continue to use their
|
||||
* normal EGL path.
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <dlfcn.h>
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <EGL/egl.h>
|
||||
#include <EGL/eglext.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
#ifndef EGL_PLATFORM_X11_KHR
|
||||
#define EGL_PLATFORM_X11_KHR 0x31D5
|
||||
#endif
|
||||
|
||||
typedef EGLDisplay (*pfn_eglGetDisplay)(EGLNativeDisplayType);
|
||||
typedef EGLDisplay (*pfn_eglGetPlatformDisplay)(EGLenum, void *, const EGLAttrib *);
|
||||
typedef EGLDisplay (*pfn_eglGetPlatformDisplayEXT)(EGLenum, void *, const EGLint *);
|
||||
|
||||
static pfn_eglGetDisplay real_eglGetDisplay;
|
||||
static pfn_eglGetPlatformDisplay real_eglGetPlatformDisplay;
|
||||
static pfn_eglGetPlatformDisplayEXT real_eglGetPlatformDisplayEXT;
|
||||
|
||||
static EGLDisplay x11_egl_display = EGL_NO_DISPLAY;
|
||||
static Display *x_display;
|
||||
static pthread_once_t once_resolve = PTHREAD_ONCE_INIT;
|
||||
static pthread_once_t once_x11 = PTHREAD_ONCE_INIT;
|
||||
|
||||
static int debug_enabled(void)
|
||||
{
|
||||
static int value = -1;
|
||||
if (value < 0) {
|
||||
value = getenv("WEMEET_CAMERA_FIX_DEBUG") != NULL;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
#define LOG(...) \
|
||||
do { \
|
||||
if (debug_enabled()) { \
|
||||
fprintf(stderr, "[wemeet-camera-fix] " __VA_ARGS__); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
static void resolve_real_symbols(void)
|
||||
{
|
||||
real_eglGetDisplay = (pfn_eglGetDisplay)dlsym(RTLD_NEXT, "eglGetDisplay");
|
||||
real_eglGetPlatformDisplay =
|
||||
(pfn_eglGetPlatformDisplay)dlsym(RTLD_NEXT, "eglGetPlatformDisplay");
|
||||
real_eglGetPlatformDisplayEXT =
|
||||
(pfn_eglGetPlatformDisplayEXT)dlsym(RTLD_NEXT, "eglGetPlatformDisplayEXT");
|
||||
}
|
||||
|
||||
static void init_x11_egl_display(void)
|
||||
{
|
||||
pthread_once(&once_resolve, resolve_real_symbols);
|
||||
|
||||
x_display = XOpenDisplay(NULL);
|
||||
if (!x_display) {
|
||||
fprintf(stderr, "[wemeet-camera-fix] XOpenDisplay(NULL) failed; DISPLAY=%s\n",
|
||||
getenv("DISPLAY") ? getenv("DISPLAY") : "(unset)");
|
||||
return;
|
||||
}
|
||||
|
||||
if (real_eglGetPlatformDisplay) {
|
||||
x11_egl_display =
|
||||
real_eglGetPlatformDisplay(EGL_PLATFORM_X11_KHR, x_display, NULL);
|
||||
} else if (real_eglGetPlatformDisplayEXT) {
|
||||
x11_egl_display =
|
||||
real_eglGetPlatformDisplayEXT(EGL_PLATFORM_X11_KHR, x_display, NULL);
|
||||
} else if (real_eglGetDisplay) {
|
||||
x11_egl_display = real_eglGetDisplay((EGLNativeDisplayType)x_display);
|
||||
}
|
||||
|
||||
LOG("initialized X11 EGLDisplay=%p for X Display*=%p\n",
|
||||
(void *)x11_egl_display, (void *)x_display);
|
||||
}
|
||||
|
||||
static int caller_is_xcast(void *caller)
|
||||
{
|
||||
Dl_info info;
|
||||
|
||||
if (!caller) {
|
||||
return 0;
|
||||
}
|
||||
memset(&info, 0, sizeof(info));
|
||||
if (!dladdr(caller, &info) || !info.dli_fname) {
|
||||
return 0;
|
||||
}
|
||||
return strstr(info.dli_fname, "libxcast.so") != NULL;
|
||||
}
|
||||
|
||||
EGLDisplay eglGetDisplay(EGLNativeDisplayType display_id)
|
||||
{
|
||||
pthread_once(&once_resolve, resolve_real_symbols);
|
||||
|
||||
if (caller_is_xcast(__builtin_return_address(0))) {
|
||||
pthread_once(&once_x11, init_x11_egl_display);
|
||||
LOG("eglGetDisplay from libxcast.so -> %p\n", (void *)x11_egl_display);
|
||||
return x11_egl_display;
|
||||
}
|
||||
|
||||
return real_eglGetDisplay ? real_eglGetDisplay(display_id) : EGL_NO_DISPLAY;
|
||||
}
|
||||
|
||||
EGLDisplay eglGetPlatformDisplay(EGLenum platform, void *native_display,
|
||||
const EGLAttrib *attrib_list)
|
||||
{
|
||||
pthread_once(&once_resolve, resolve_real_symbols);
|
||||
|
||||
if (caller_is_xcast(__builtin_return_address(0))) {
|
||||
pthread_once(&once_x11, init_x11_egl_display);
|
||||
LOG("eglGetPlatformDisplay from libxcast.so -> %p\n",
|
||||
(void *)x11_egl_display);
|
||||
return x11_egl_display;
|
||||
}
|
||||
|
||||
return real_eglGetPlatformDisplay
|
||||
? real_eglGetPlatformDisplay(platform, native_display, attrib_list)
|
||||
: EGL_NO_DISPLAY;
|
||||
}
|
||||
|
||||
EGLDisplay eglGetPlatformDisplayEXT(EGLenum platform, void *native_display,
|
||||
const EGLint *attrib_list)
|
||||
{
|
||||
pthread_once(&once_resolve, resolve_real_symbols);
|
||||
|
||||
if (caller_is_xcast(__builtin_return_address(0))) {
|
||||
pthread_once(&once_x11, init_x11_egl_display);
|
||||
LOG("eglGetPlatformDisplayEXT from libxcast.so -> %p\n",
|
||||
(void *)x11_egl_display);
|
||||
return x11_egl_display;
|
||||
}
|
||||
|
||||
return real_eglGetPlatformDisplayEXT
|
||||
? real_eglGetPlatformDisplayEXT(platform, native_display, attrib_list)
|
||||
: EGL_NO_DISPLAY;
|
||||
}
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "langgraph-checkpoint";
|
||||
version = "4.0.3";
|
||||
version = "4.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpoint==${finalAttrs.version}";
|
||||
hash = "sha256-zdl/WpzNLr3QmQqi2rvFl4dDzy0BRqMRv7I0GUp9Feg=";
|
||||
hash = "sha256-P4SbQK6lFG572WKxisnNn/ZiHcMYBBM/vcBB9N6xpfo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libs/checkpoint";
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
itsdangerous,
|
||||
jinja2,
|
||||
libsass,
|
||||
lxml-html-clean,
|
||||
lxml,
|
||||
markdown2,
|
||||
matplotlib,
|
||||
orjson,
|
||||
@@ -26,12 +28,14 @@
|
||||
pytest-asyncio,
|
||||
pytest-selenium,
|
||||
pytestCheckHook,
|
||||
python-dotenv,
|
||||
python-multipart,
|
||||
python-socketio,
|
||||
pywebview,
|
||||
redis,
|
||||
requests,
|
||||
setuptools,
|
||||
tinycss2,
|
||||
typing-extensions,
|
||||
urllib3,
|
||||
uvicorn,
|
||||
@@ -43,18 +47,21 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nicegui";
|
||||
version = "3.8.0";
|
||||
version = "3.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zauberzeug";
|
||||
repo = "nicegui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YSt4BoJZZwncPewk46VNHq0RR5sUpW0j055ryPYAdn4=";
|
||||
hash = "sha256-pm8jUDdpRvPDVwHXHGwuqPogpE/HMS19uJ5beWch7TE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"idna"
|
||||
"lxml"
|
||||
"orjson"
|
||||
"python-multipart"
|
||||
"requests"
|
||||
];
|
||||
|
||||
@@ -74,12 +81,16 @@ buildPythonPackage (finalAttrs: {
|
||||
ifaddr
|
||||
itsdangerous
|
||||
jinja2
|
||||
lxml
|
||||
lxml-html-clean
|
||||
markdown2
|
||||
orjson
|
||||
pygments
|
||||
python-dotenv
|
||||
python-multipart
|
||||
python-socketio
|
||||
requests
|
||||
tinycss2
|
||||
typing-extensions
|
||||
urllib3
|
||||
uvicorn
|
||||
|
||||
@@ -11,11 +11,14 @@
|
||||
pytest-timeout,
|
||||
pytest-django,
|
||||
pydot,
|
||||
docutils,
|
||||
pyyaml,
|
||||
jsonschema,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-statemachine";
|
||||
version = "3.0.0";
|
||||
version = "3.2.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -23,7 +26,7 @@ buildPythonPackage (finalAttrs: {
|
||||
src = fetchPypi {
|
||||
pname = "python_statemachine";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-kVI/nq1zwdb+zJddXG4L/jY/v1N8XwvzCbzQ+U+UQbI=";
|
||||
hash = "sha256-RLmMubsQgYke9u+pB8gh0FyuUxSiuZcT5W1Wqcli3gg=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -36,6 +39,9 @@ buildPythonPackage (finalAttrs: {
|
||||
pytest-timeout
|
||||
pytest-django
|
||||
pydot
|
||||
docutils
|
||||
pyyaml
|
||||
jsonschema
|
||||
];
|
||||
|
||||
pytestFlags = [ "--benchmark-disable" ];
|
||||
@@ -44,6 +50,9 @@ buildPythonPackage (finalAttrs: {
|
||||
# quite slow
|
||||
"tests/test_weighted_transitions.py"
|
||||
"tests/scxml/"
|
||||
|
||||
# requires sphinx, which is not worth pulling in for this relatively low-signal test
|
||||
"statemachine/contrib/diagram/sphinx_ext.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -23,8 +23,8 @@ let
|
||||
[ ];
|
||||
in
|
||||
buildNodejs {
|
||||
version = "22.22.3";
|
||||
sha256 = "f3e6a578db1ab335a4a72785c1e87ad18a2cf6d2fc25747a1d741fb34af0bd0f";
|
||||
version = "22.23.0";
|
||||
sha256 = "3acfae100c7b855a4c76520ee0f95cadcace3f4254f16b7d4887f178fc95d4a0";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
@@ -64,26 +64,5 @@ buildNodejs {
|
||||
url = "https://github.com/nodejs/node/commit/ff3a028f8bf88da70dc79e1d7b7947a8d5a8548a.patch?full_index=1";
|
||||
hash = "sha256-LJcO3RXVPnpbeuD87fiJ260m3BQXNk3+vvZkBMFUz5w=";
|
||||
})
|
||||
# update tests for nghttp2 1.65
|
||||
./deprecate-http2-priority-signaling.patch
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/nodejs/node/commit/a63126409ad4334dd5d838c39806f38c020748b9.diff?full_index=1";
|
||||
hash = "sha256-lfq8PMNvrfJjlp0oE3rJkIsihln/Gcs1T/qgI3wW2kQ=";
|
||||
includes = [ "test/*" ];
|
||||
})
|
||||
# Patch for nghttp2 1.69 support
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/nodejs/node/commit/ecbc22dc3709290dcaadf634a28d8307a75952ee.diff?full_index=1";
|
||||
hash = "sha256-LwniqgKlG1IiqSzdP7UgBw3/9cn1jyz/jtx45yb6RWM=";
|
||||
includes = [
|
||||
"test/parallel/test-http2-misbehaving-flow-control-paused.js"
|
||||
"test/parallel/test-http2-misbehaving-flow-control.js"
|
||||
];
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/nodejs/node/commit/4a32c00fb8dbe55c3bcf9ef43343968c9fe449e6.diff?full_index=1";
|
||||
hash = "sha256-pex8ruwa4b/vWvfGA+nyN3JJP8NOturmwAQe4Rkd6nU=";
|
||||
excludes = [ "tools/nix/*" ];
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@@ -23,8 +23,8 @@ let
|
||||
[ ];
|
||||
in
|
||||
buildNodejs {
|
||||
version = "26.3.0";
|
||||
sha256 = "319ad5d7d20cc622e55eb75b9f1a2546b77a08bd462b67030d0c89316c2c2349";
|
||||
version = "26.3.1";
|
||||
sha256 = "979b9b8308a8d2d4a27c662ed50448c85f970c0fd4f5ce8b98e8da78c441f2bc";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
@@ -3702,12 +3702,17 @@ with self;
|
||||
|
||||
CatalystPluginAuthentication = buildPerlPackage {
|
||||
pname = "Catalyst-Plugin-Authentication";
|
||||
version = "0.10023";
|
||||
version = "0.10_027";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz";
|
||||
hash = "sha256-NgOaq9rLB+Zoek16i/rHj+nQ+7BM2o1tlm1sHjJZ0Gw=";
|
||||
url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Plugin-Authentication-0.10_027.tar.gz";
|
||||
hash = "sha256-XSnccFKKKnFGYChaHjQh8VSur4hNCXjVPyR6pKugq6w=";
|
||||
};
|
||||
buildInputs = [ TestException ];
|
||||
buildInputs = [
|
||||
TestException
|
||||
TestFatal
|
||||
CatalystPluginSessionStateCookie
|
||||
];
|
||||
doCheck = false; # t/live_app.t fails on crypted password tests with Perl 5.42
|
||||
propagatedBuildInputs = [ CatalystPluginSession ];
|
||||
meta = {
|
||||
description = "Infrastructure plugin for the Catalyst authentication framework";
|
||||
|
||||
Reference in New Issue
Block a user