diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 51f77d19229b..1c2b74db69fc 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -11,6 +11,9 @@ - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained. +- `kanata` now requires `karabiner-dk` version 6.0+ or later. + The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package. + - All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years. - `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 54c6af756f33..ac36eca1b64f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3131,12 +3131,6 @@ github = "beeb"; githubId = 703631; }; - beezow = { - name = "beezow"; - email = "zbeezow@gmail.com"; - github = "beezow"; - githubId = 42082156; - }; bellackn = { name = "Nico Bellack"; email = "blcknc@pm.me"; @@ -4109,6 +4103,12 @@ { fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; } ]; }; + cablehead = { + email = "andy@thecablelounge.com"; + github = "cablehead"; + githubId = 1394; + name = "Andy Gayton"; + }; CactiChameleon9 = { email = "h19xjkkp@duck.com"; github = "CactiChameleon9"; @@ -4360,12 +4360,6 @@ githubId = 37775; name = "Kirill A. Korinsky"; }; - catern = { - email = "sbaugh@catern.com"; - github = "catern"; - githubId = 5394722; - name = "Spencer Baugh"; - }; cathalmullan = { email = "contact@cathal.dev"; github = "CathalMullan"; @@ -4409,6 +4403,12 @@ githubId = 3471749; name = "Claudio Bley"; }; + cboecking = { + email = "chuck@chuboe.com"; + github = "cboecking"; + githubId = 16024854; + name = "Chuck Boecking"; + }; cbrewster = { email = "cbrewster@hey.com"; github = "cbrewster"; @@ -4467,12 +4467,6 @@ githubId = 543423; name = "Alex Wied"; }; - cfhammill = { - email = "cfhammill@gmail.com"; - github = "cfhammill"; - githubId = 7467038; - name = "Chris Hammill"; - }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; @@ -6547,12 +6541,6 @@ githubId = 41772157; name = "Dict Xiong"; }; - diegolelis = { - email = "diego.o.lelis@gmail.com"; - github = "DiegoLelis"; - githubId = 8404455; - name = "Diego Lelis"; - }; diegs = { email = "dpontor@gmail.com"; github = "diegs"; @@ -6713,12 +6701,6 @@ githubId = 28980797; name = "David Leslie"; }; - dlip = { - email = "dane@lipscombe.com.au"; - github = "dlip"; - githubId = 283316; - name = "Dane Lipscombe"; - }; dlugoschvincent = { email = "dlugoschvincent@gmail.com"; github = "dlugoschvincent"; @@ -6843,12 +6825,6 @@ githubId = 53937537; keys = [ { fingerprint = "BBC4 C071 516B A147 8D07 F9DC D2FD E6EC 2E8C 2BF4"; } ]; }; - doriath = { - email = "tomasz.zurkowski@gmail.com"; - github = "doriath"; - githubId = 150959; - name = "Tomasz Zurkowski"; - }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; @@ -7411,13 +7387,6 @@ github = "edlimerkaj"; githubId = 71988351; }; - edmundmiller = { - name = "Edmund Miller"; - email = "git@edmundmiller.dev"; - matrix = "@emiller:beeper.com"; - github = "edmundmiller"; - githubId = 20095261; - }; edrex = { email = "ericdrex@gmail.com"; github = "edrex"; @@ -8335,12 +8304,6 @@ githubId = 88741530; name = "Fabian Rigoll"; }; - fadenb = { - email = "tristan.helmich+nixos@gmail.com"; - github = "fadenb"; - githubId = 878822; - name = "Tristan Helmich"; - }; famfo = { name = "famfo"; email = "famfo+nixpkgs@famfo.xyz"; @@ -8536,12 +8499,6 @@ githubId = 5198058; name = "Udo Sauer"; }; - ferrine = { - email = "justferres@yandex.ru"; - github = "ferrine"; - githubId = 11705326; - name = "Max Kochurov"; - }; fettgoenner = { email = "paulmatti@protonmail.com"; github = "fettgoenner"; @@ -9344,12 +9301,6 @@ githubId = 34658064; name = "Grace Dinh"; }; - geluk = { - email = "johan+nix@geluk.io"; - github = "geluk"; - githubId = 1516985; - name = "Johan Geluk"; - }; genericnerdyusername = { name = "GenericNerdyUsername"; email = "genericnerdyusername@proton.me"; @@ -14122,12 +14073,6 @@ name = "Kristoffer Longva Eriksen"; matrix = "@krisleri:pvv.ntnu.no"; }; - kroell = { - email = "nixosmainter@makroell.de"; - github = "rokk4"; - githubId = 17659803; - name = "Matthias Axel Kröll"; - }; krostar = { email = "alexis.destrez@pm.me"; github = "krostar"; @@ -14158,12 +14103,6 @@ github = "krzaczek"; githubId = 5773701; }; - KSJ2000 = { - email = "katsho123@outlook.com"; - name = "KSJ2000"; - github = "KSJ2000"; - githubId = 184105270; - }; ktechmidas = { email = "daniel@ktechmidas.net"; github = "ktechmidas"; @@ -16155,12 +16094,6 @@ githubId = 3674056; name = "Asad Saeeduddin"; }; - masipcat = { - email = "jordi@masip.cat"; - github = "masipcat"; - githubId = 775189; - name = "Jordi Masip"; - }; MaskedBelgian = { email = "michael.colicchia@imio.be"; github = "MaskedBelgian"; @@ -16219,12 +16152,6 @@ } ]; }; - math-42 = { - email = "matheus.4200@gmail.com"; - github = "Math-42"; - githubId = 43853194; - name = "Matheus Vieira"; - }; mathiassven = { email = "github@mathiassven.com"; github = "MathiasSven"; @@ -17501,6 +17428,12 @@ githubId = 14153763; name = "modderme123"; }; + mofrim = { + email = "mofrim@posteo.de"; + github = "mofrim"; + githubId = 46672819; + name = "mofrim"; + }; mog = { email = "mog-lists@rldn.net"; github = "mogorman"; @@ -17628,12 +17561,6 @@ matrix = "@motiejus:jakstys.lt"; name = "Motiejus Jakštys"; }; - mounium = { - email = "muoniurn@gmail.com"; - github = "Mounium"; - githubId = 20026143; - name = "Katona László"; - }; mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; @@ -18531,12 +18458,6 @@ github = "ngerstle"; githubId = 1023752; }; - ngiger = { - email = "niklaus.giger@member.fsf.org"; - github = "ngiger"; - githubId = 265800; - name = "Niklaus Giger"; - }; nh2 = { email = "mail@nh2.me"; matrix = "@nh2:matrix.org"; @@ -19344,12 +19265,6 @@ githubId = 123140; name = "Oliver Breitwieser"; }; - obsidian-systems-maintenance = { - name = "Obsidian Systems Maintenance"; - email = "maintainer@obsidian.systems"; - github = "obsidian-systems-maintenance"; - githubId = 80847921; - }; obsoleszenz = { name = "obsoleszenz"; email = "obsoleszenz@riseup.net"; @@ -20210,12 +20125,6 @@ githubId = 1368952; name = "Pedro Lara Campos"; }; - peefy = { - email = "xpf6677@gmail.com"; - github = "Peefy"; - githubId = 22744597; - name = "Peefy"; - }; peelz = { email = "peelz.dev+nixpkgs@gmail.com"; github = "notpeelz"; @@ -20282,12 +20191,6 @@ githubId = 722550; name = "Peter Hoeg"; }; - peterromfeldhk = { - email = "peter.romfeld.hk@gmail.com"; - github = "peterromfeldhk"; - githubId = 5515707; - name = "Peter Romfeld"; - }; petersjt014 = { email = "petersjt014@gmail.com"; github = "petersjt014"; @@ -23363,12 +23266,6 @@ githubId = 15986681; name = "Simon Bruder"; }; - scalavision = { - email = "scalavision@gmail.com"; - github = "scalavision"; - githubId = 3958212; - name = "Tom Sorlie"; - }; scd31 = { name = "scd31"; github = "scd31"; @@ -24411,11 +24308,6 @@ githubId = 116099351; name = "Skylar"; }; - slam-bert = { - github = "slam-bert"; - githubId = 106779009; - name = "Slambert"; - }; slashformotion = { github = "slashformotion"; githubId = 45801817; @@ -24742,13 +24634,6 @@ githubId = 950799; name = "Tomasz Czyż"; }; - spitulax = { - name = "Bintang Adiputra Pratama"; - email = "bintangadiputrapratama@gmail.com"; - github = "spitulax"; - githubId = 96517350; - keys = [ { fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; } ]; - }; spk = { email = "laurent@spkdev.net"; github = "spk"; @@ -24962,14 +24847,6 @@ githubId = 55607356; name = "Stephan Heßelmann"; }; - steinybot = { - name = "Jason Pickens"; - email = "jasonpickensnz@gmail.com"; - matrix = "@steinybot:matrix.org"; - github = "steinybot"; - githubId = 4659562; - keys = [ { fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; } ]; - }; stelcodes = { email = "stel@stel.codes"; github = "stelcodes"; @@ -26685,12 +26562,6 @@ githubId = 6740669; name = "Tom Smeets"; }; - tonyshkurenko = { - email = "support@twingate.com"; - github = "antonshkurenko"; - githubId = 8597964; - name = "Anton Shkurenko"; - }; toonn = { email = "nixpkgs@toonn.io"; matrix = "@toonn:matrix.org"; @@ -27211,13 +27082,6 @@ name = "Kevin Brubeck Unhammer"; keys = [ { fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; } ]; }; - uniquepointer = { - email = "uniquepointer@mailbox.org"; - matrix = "@uniquepointer:matrix.org"; - github = "uniquepointer"; - githubId = 71751817; - name = "uniquepointer"; - }; unode = { email = "alves.rjc@gmail.com"; matrix = "@renato_alves:matrix.org"; @@ -27550,12 +27414,6 @@ github = "victormeriqui"; githubId = 1396008; }; - vidbina = { - email = "vid@bina.me"; - github = "vidbina"; - githubId = 335406; - name = "David Asabina"; - }; videl = { email = "thibaut.smith@mailbox.org"; github = "videl"; @@ -28911,11 +28769,6 @@ { fingerprint = "D2A8 A906 ACA7 B6D6 575E 9A2F 3A49 5054 6EA6 9E5C"; } ]; }; - yomaq = { - name = "yomaq"; - github = "yomaq"; - githubId = 112864332; - }; yorickvp = { email = "yorickvanpelt@gmail.com"; matrix = "@yorickvp:matrix.org"; @@ -29207,12 +29060,6 @@ github = "zazedd"; githubId = 93401987; }; - zbioe = { - name = "Iury Fukuda"; - email = "zbioe@protonmail.com"; - github = "zbioe"; - githubId = 7332055; - }; zebradil = { email = "german.lashevich+nixpkgs@gmail.com"; github = "zebradil"; @@ -29406,12 +29253,6 @@ githubId = 6067895; name = "Al Zohali"; }; - zokrezyl = { - email = "zokrezyl@gmail.com"; - github = "zokrezyl"; - githubId = 51886259; - name = "Zokre Zyl"; - }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 210ffba3ba71..1766ae022e3a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -640,7 +640,6 @@ with lib.maintainers; matrix = { members = [ ma27 - fadenb mguentner dandellion nickcao diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix index 73cce23bbaed..f5cb66e2d45b 100644 --- a/nixos/modules/programs/digitalbitbox/default.nix +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -36,6 +36,5 @@ in meta = { doc = ./default.md; - maintainers = with lib.maintainers; [ vidbina ]; }; } diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 0f124505addf..c699881811c0 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -52,6 +52,11 @@ in User = "slimserver"; # Issue 40589: Disable broken image/video support (audio still works!) ExecStart = "${lib.getExe cfg.package} --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo"; + # Allow only IPv4 since slimserver breaks with IPv6 + RestrictAddressFamilies = [ + "AF_INET" + "AF_UNIX" + ]; }; }; diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix index c2c2c2ca4d41..a58d886cfe7f 100644 --- a/nixos/modules/services/desktops/espanso.nix +++ b/nixos/modules/services/desktops/espanso.nix @@ -29,9 +29,7 @@ in capabilities = "cap_dac_override+p"; owner = "root"; group = "root"; - source = lib.getExe ( - pkgs.espanso-wayland.override { securityWrapperPath = config.security.wrapperDir; } - ); + source = lib.getExe (cfg.package.override { securityWrapperPath = config.security.wrapperDir; }); }; systemd.user.services.espanso = { description = "Espanso daemon"; diff --git a/nixos/modules/services/development/rstudio-server/default.nix b/nixos/modules/services/development/rstudio-server/default.nix index d83029388c3d..83bfee295326 100644 --- a/nixos/modules/services/development/rstudio-server/default.nix +++ b/nixos/modules/services/development/rstudio-server/default.nix @@ -22,7 +22,6 @@ in { meta.maintainers = with lib.maintainers; [ jbedo - cfhammill ]; options.services.rstudio-server = { diff --git a/nixos/tests/rstudio-server.nix b/nixos/tests/rstudio-server.nix index e561bd309d40..6ae0aa9db174 100644 --- a/nixos/tests/rstudio-server.nix +++ b/nixos/tests/rstudio-server.nix @@ -3,7 +3,6 @@ name = "rstudio-server-test"; meta.maintainers = with pkgs.lib.maintainers; [ jbedo - cfhammill ]; nodes.machine = diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index d36ddc46e1bb..6b4656b7967c 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -150,7 +150,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ atinba ilian - uniquepointer viraptor ]; }; diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json index 60239ac47aaf..86d9670b3a7f 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -73,7 +73,7 @@ "meta": { "isOpenSource": true, "description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains", - "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ], + "maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } @@ -85,7 +85,7 @@ "meta": { "isOpenSource": false, "description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains", - "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ], + "maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index f2e247b2e57f..be00fdce3e53 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -46,7 +46,6 @@ vscode-utils.buildVscodeMarketplaceExtension { description = "Official VSCode plugin for ReScript"; homepage = "https://github.com/rescript-lang/rescript-vscode"; maintainers = [ - lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 7232795a8148..6fe449654606 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -35,7 +35,6 @@ ocamlPackages.buildDunePackage rec { homepage = "https://github.com/rescript-lang/rescript-vscode"; changelog = "https://github.com/rescript-lang/rescript-vscode/releases/tag/${version}"; maintainers = with lib.maintainers; [ - dlip jayesh-bhoot RossSmyth ]; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 01a2b5475243..09c6a3b39c4e 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/your-editor/yed/blob/${version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ uniquepointer ]; mainProgram = "yed"; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 5586d18fa4b7..02726e6738d4 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -81,14 +81,14 @@ let ]; in mkDerivation rec { - version = "3.40.12"; + version = "3.40.13"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-QsAiE3HC71lGsdUKW9QZ5gCLCRsOCCM2IR3MKJlJ0vk="; + hash = "sha256-2VPgD7ycj26cTpl16BSEukNEuUXtP25HwG2fRWBXNrU="; }; passthru = { diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index be81fe704dca..fd805af2cdea 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -150,9 +150,6 @@ mkDerivation rec { ''; homepage = "https://digitalbitbox.com/"; license = licenses.mit; - maintainers = with maintainers; [ - vidbina - ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 927e6ac75a6a..41158b2ee4eb 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,7 +62,6 @@ let maintainers = with maintainers; [ offline zimbatm - diegolelis yurrriq ]; }; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 490b926c7e27..7d612b59ef2b 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -71,6 +71,5 @@ buildGoModule rec { homepage = "https://kuma.io/"; changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ zbioe ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a3e02391929f..82c3993df429 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1003,13 +1003,13 @@ "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE=" }, "okta_okta": { - "hash": "sha256-CZSh4NEFC3cT9/WoOrIFHx3RAt3q70Fmd0/bEU1aJTU=", + "hash": "sha256-vrH7PS6ZHFYMnzq6ApFMV31guaIxj6G7/YhB+EdoS6k=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v6.5.0", + "rev": "v6.5.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-YFxDfmWjB8QWBqX0KHlsr6DyzAEhkSFm/VaEmH1+VYg=" + "vendorHash": "sha256-ZrjjQCpFE4f8oBd+YGClaG68W/Tx1fnRikHmHLtOg+k=" }, "oktadeveloper_oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 8528dc25ed32..32ac01db0514 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -1,13 +1,13 @@ { "linux-canary": { - "hash": "sha256-302oXjbkWNHaYQBUY1ZaY9f+7a5hJlesyLUMhZZCU/4=", - "url": "https://canary.dl2.discordapp.net/apps/linux/0.0.814/discord-canary-0.0.814.tar.gz", - "version": "0.0.814" + "hash": "sha256-hhrjKkXnhHm8gntPMGjst1eLu8xqube73lnbW5TEINY=", + "url": "https://canary.dl2.discordapp.net/apps/linux/0.0.819/discord-canary-0.0.819.tar.gz", + "version": "0.0.819" }, "linux-development": { - "hash": "sha256-oG50YrXQUCnbn+rO0EeRjixeqvXYBdnyqdomdPfxfos=", - "url": "https://development.dl2.discordapp.net/apps/linux/0.0.92/discord-development-0.0.92.tar.gz", - "version": "0.0.92" + "hash": "sha256-1zlRLOxWUA7QNAMi2SRWCdnx1dbmkwWQSCl7Pyexoac=", + "url": "https://development.dl2.discordapp.net/apps/linux/0.0.93/discord-development-0.0.93.tar.gz", + "version": "0.0.93" }, "linux-ptb": { "hash": "sha256-uz3QNIDzmB/4aLNRNgB1wzpNJlc8ous8aUvcqGaHE7c=", @@ -15,14 +15,14 @@ "version": "0.0.168" }, "linux-stable": { - "hash": "sha256-PFJQV0+bYe5UhH17/pHaUEEO5xFJL/KfaGkHziNhCVk=", - "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.116/discord-0.0.116.tar.gz", - "version": "0.0.116" + "hash": "sha256-PN1E8GjVopEPGW9ISb0y1Lo7nnj30CXylW0nTR1Pc6U=", + "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.117/discord-0.0.117.tar.gz", + "version": "0.0.117" }, "osx-canary": { - "hash": "sha256-r4MwAQps86XBKlMy9nFx0MD0Sjo9zmuB4aX4iaEWTfA=", - "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.919/DiscordCanary.dmg", - "version": "0.0.919" + "hash": "sha256-bBimaZYUjkd7MwiqJiNjgQpiBOEUAVhTFOoQ/cnR+K0=", + "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.923/DiscordCanary.dmg", + "version": "0.0.923" }, "osx-development": { "hash": "sha256-x4i/bbaR4XjzyZGkVerUl8oxxhm01A+2tpN+UEtKwwc=", @@ -35,8 +35,8 @@ "version": "0.0.200" }, "osx-stable": { - "hash": "sha256-G0jSuUgX05fqk4dmiJTqpbsIh7lnTRxcron989/diw0=", - "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.368/Discord.dmg", - "version": "0.0.368" + "hash": "sha256-k4S9UyO2GLmT/nnR1BUcUVjhFvxjGeQv2tbuZzEh8Ro=", + "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.369/Discord.dmg", + "version": "0.0.369" } } diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 890c4cb653e6..b5981e33d2a4 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -36,9 +36,6 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ - vidbina - ]; } // (attrs.meta or { }); diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 42ec0a5690cc..47133bb2148f 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -162,7 +162,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${finalAttrs.version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - masipcat zhaofengli armelclo ]; diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 642ddff62162..af849e4513f1 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -11,6 +11,7 @@ pkg-config, pnpm, + alsa-lib, glib-networking, libappindicator-gtk3, openssl, @@ -18,27 +19,28 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin-desktop"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "atuinsh"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-jBCf6Wq7xTgI2VjhQ+RZ3uN7LVh+ZlQ3TDJ0epsGj0M="; + hash = "sha256-XuPbfD6yEt82kHOIiKyxXyKcOkXEF/AsuE7Cde6QNNA="; }; cargoRoot = "./."; - cargoHash = "sha256-329uNcc8LSNreD8CgPCpEhGCR2PebpmFoaRwZn+oscE="; + cargoHash = "sha256-nmxF7IKmdLr2l6y///7pqcEBe7ijTYWSmB3cy6tTf9E="; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-2i1mL4HwwiXrmM1qaWvHhm27U2/oElbOpnXh09ziamo="; + hash = "sha256-Tdcdghhc4cH+cYIeUy3inChgPfb1i9E7F1mpxxWoW4Q="; }; nativeBuildInputs = [ cargo-tauri.hook pnpm.configHook + rustPlatform.bindgenHook nodejs pkg-config @@ -46,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib glib-networking libappindicator-gtk3 openssl diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index a6753400d877..fdfd40d1c701 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -21,16 +21,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "23.2.0"; + version = "23.2.2"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-T4eOiFpU17vAwAM02gwJq93ZtJQUC7bv0CCFpj4NKEA="; + hash = "sha256-HAcsFGLUUaeNxEBAFgYjDipu8QTsd+8yptC6kAX0C4g="; }; - npmDepsHash = "sha256-kRkc3o8xmROlH17GI3yoGvMwEweHrLeGpvW3rH0wOSU="; + npmDepsHash = "sha256-dT5WrrzrO5tcP4/NFe5WTG7boYTOlFRNut52X2AWaao="; makeCacheWritable = true; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 36e856235d2a..8517c9ec7390 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -81,7 +81,6 @@ appimageTools.wrapAppImage { license = licenses.unfree; maintainers = with maintainers; [ jshcmpbll - edmundmiller zh4ngx ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix index bfe4d355766d..906f0b489ffd 100644 --- a/pkgs/by-name/bi/binaryninja-free/package.nix +++ b/pkgs/by-name/bi/binaryninja-free/package.nix @@ -20,11 +20,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "binaryninja-free"; - version = "5.1.8104"; + version = "5.2.8614"; src = fetchurl { url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip"; - hash = "sha256-s7lRvQhegW/bgZc6XnAowTl1ZZPIN0/BJe+u3p9qHsE="; + hash = "sha256-Z7hI0WTOseEgM/opZLxSGCnHYXiliEWksA1FpICLRPQ="; }; icon = fetchurl { @@ -67,12 +67,6 @@ stdenv.mkDerivation (finalAttrs: { xcbutilwm ]; - preFixup = '' - # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108 - mkdir -p "$out/lib" - ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/lib/libxml2.so.2" - ''; - installPhase = '' runHook preInstall mkdir -p $out/ diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index e3b318975f89..0f0dd4f800bf 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.3.6"; + version = "2.3.8"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-wi0dkD9AlMYyGS/y96FMCOJKjRuo0b4pHpva+R1W3Yg="; + hash = "sha256-pNWwFrI0EWY8HB8aCZdZ/Y+LJl3MS4vl0HhpYFEGUbY="; }; - cargoHash = "sha256-GCwJdO43Q5cRw3w1omuIpSxvINN51dJez7Jq4/FQF+A="; + cargoHash = "sha256-gafj1Gm3YUVpLgZXN5lMRvEFo6GEHbmWbNDm+0OTi8w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix index 90d576b83741..08abf06bf431 100644 --- a/pkgs/by-name/bu/buildstream/package.nix +++ b/pkgs/by-name/bu/buildstream/package.nix @@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ click - dulwich grpcio jinja2 markupsafe @@ -55,10 +54,8 @@ python3Packages.buildPythonApplication rec { protobuf psutil pyroaring - requests ruamel-yaml ruamel-yaml-clib - tomlkit ujson ]) ++ lib.optionals enableBuildstreamPlugins [ diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index 694c250318fe..b72fe9fdfc5a 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; - version = "10.3.1"; + version = "10.3.2"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "bumpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-krJzPHlGgtEukOlSX0sXfCwXmdItDLhf6hS+zamNrN4="; + hash = "sha256-1hGVLPogdeyWh/B2Yxfo/9YbJpFYl8ATh+QCa2VVyyk="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-N6boJiwq5G4L/vOqp+GoYWtSI1sYScYadxXueeJgGMo="; + hash = "sha256-y7uHDtoOjsLnNF47r4aWHYXW0ui8shhn1M0cD2FpaCg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/capitaine-cursors-themed/package.nix b/pkgs/by-name/ca/capitaine-cursors-themed/package.nix index c2e39c68664b..d95779fec79f 100644 --- a/pkgs/by-name/ca/capitaine-cursors-themed/package.nix +++ b/pkgs/by-name/ca/capitaine-cursors-themed/package.nix @@ -28,6 +28,5 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/sainnhe/capitaine-cursors"; license = licenses.lgpl3Only; platforms = platforms.unix; - maintainers = [ maintainers.math-42 ]; }; } diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index d6ae9a5e091a..bc95ed1db7c3 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -11,6 +11,7 @@ let "kvantum" "lazygit" "lxqt" + "palette" "plymouth" "qt5ct" "refind" @@ -144,6 +145,14 @@ let hash = "sha256-3TuUkOwk6BSc7BnLnTowGAkSlNTOtGTRlEcjJ6MNJ5g="; }; + palette = fetchFromGitHub { + name = "palette"; + owner = "catppuccin"; + repo = "palette"; + rev = "0df7db6fe201b437d91e7288fa22807bb0e44701"; + hash = "sha256-R52Q1FVAclvBk7xNgj/Jl+GPCIbORNf6YbJ1nxH3Gzs="; + }; + plymouth = fetchFromGitHub { name = "plymouth"; owner = "catppuccin"; @@ -233,43 +242,43 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "alacritty" themeList) '' mkdir -p "$out/alacritty" - cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/" + cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty" '' + lib.optionalString (lib.elem "bat" themeList) '' mkdir -p "$out/bat" - cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/" + cp "${sources.bat}/themes/Catppuccin $capitalizedVariant.tmTheme" "$out/bat" '' + lib.optionalString (lib.elem "btop" themeList) '' mkdir -p "$out/btop" - cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/" + cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop" '' + lib.optionalString (lib.elem "bottom" themeList) '' mkdir -p "$out/bottom" - cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" + cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom" '' + lib.optionalString (lib.elem "element" themeList) '' mkdir -p "$out/element" - cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element/" + cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element" '' + lib.optionalString (lib.elem "grub" themeList) '' mkdir -p "$out/grub" - cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme/"* "$out/grub/" + cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme"/* "$out/grub" '' + lib.optionalString (lib.elem "hyprland" themeList) '' mkdir -p "$out/hyprland" - cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" + cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland" '' + lib.optionalString (lib.elem "k9s" themeList) '' mkdir -p "$out/k9s" - cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/" - cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s/" + cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s" + cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s" '' + lib.optionalString (lib.elem "kvantum" themeList) '' @@ -278,37 +287,42 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "lazygit" themeList) '' - mkdir -p "$out/lazygit/"{themes,themes-mergable} - cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/" - cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/" + mkdir -p "$out/lazygit"/themes{,-mergable} + cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes" + cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable" '' + lib.optionalString (lib.elem "lxqt" themeList) '' mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}" - cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}" + cp -r "${sources.lxqt}/src/catppuccin-${variant}"/* "$out/share/lxqt/themes/catppuccin-${variant}" + + '' + + lib.optionalString (lib.elem "palette" themeList) '' + mkdir -p "$out/palette" + cp "${sources.palette}/palette.json" "$out/palette" '' + lib.optionalString (lib.elem "plymouth" themeList) '' mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}" - cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} - sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth + cp "${sources.plymouth}/themes/catppuccin-${variant}"/* "$out/share/plymouth/themes/catppuccin-${variant}" + sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' "$out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth" '' + lib.optionalString (lib.elem "qt5ct" themeList) '' mkdir -p "$out/qt5ct" cp "${sources.qt5ct}/themes/catppuccin-${variant}-${accent}.conf" "$out/qt5ct" - '' - + lib.optionalString (lib.elem "rofi" themeList) '' - mkdir -p "$out/rofi" - cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi" - '' + lib.optionalString (lib.elem "refind" themeList) '' mkdir -p "$out/refind/assets" cp "${sources.refind}/${variant}.conf" "$out/refind" cp -r "${sources.refind}/assets/${variant}" "$out/refind/assets" + '' + + lib.optionalString (lib.elem "rofi" themeList) '' + mkdir -p "$out/rofi" + cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi" + '' + lib.optionalString (lib.elem "starship" themeList) '' mkdir -p "$out/starship" diff --git a/pkgs/by-name/ch/checkmake/package.nix b/pkgs/by-name/ch/checkmake/package.nix index 51b9fc954e64..c86964de7c83 100644 --- a/pkgs/by-name/ch/checkmake/package.nix +++ b/pkgs/by-name/ch/checkmake/package.nix @@ -53,7 +53,6 @@ buildGoModule rec { homepage = "https://github.com/mrtazz/checkmake"; changelog = "https://github.com/mrtazz/checkmake/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ vidbina ]; longDescription = '' checkmake is an experimental tool for linting and checking Makefiles. It may not do what you want it to. diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 7ea3e84a9699..715663ae216d 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.10.3.100-stable"; - rev = "1e703eae565a020b055213f9cecd60fb277263d2"; - hash = "sha256-cElRzd/NLPpmNl/J89hmsg4JtFY4jmFLIbK6F8tuYnA="; + version = "25.11.1.558-stable"; + rev = "16f22f3d744fe760e05f288124b1f32f539a35aa"; + hash = "sha256-PJVw53iueh9kjWn7R7rgSVHokZq1Ot5GhRM1uSNY6o8="; lts = false; } diff --git a/pkgs/by-name/co/cocoapods/package.nix b/pkgs/by-name/co/cocoapods/package.nix index ced83c48468e..15ccdd258167 100644 --- a/pkgs/by-name/co/cocoapods/package.nix +++ b/pkgs/by-name/co/cocoapods/package.nix @@ -21,9 +21,6 @@ bundlerApp { homepage = "https://github.com/CocoaPods/CocoaPods"; license = licenses.mit; platforms = platforms.darwin; - maintainers = with maintainers; [ - peterromfeldhk - ]; mainProgram = "pod"; }; } diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 29c7dcb246d1..82cb4585ea55 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.21.5"; + version = "1.22.1"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = "consul"; tag = "v${version}"; - hash = "sha256-x5e0DhJ3qMh51E+bEIzl0JmH7bvdicVgOa0l1Qix9vI="; + hash = "sha256-WlaJtiFlfLpdMATWHPbMneCqKzNcIRJrlf5TlbZgH8U="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-PZtLz7jqtqYcBO/xrE/tE4vqNstLq9Iv20eWnW5xloQ="; + vendorHash = "sha256-QthyylbEkyfDPJIzIyL4u+d92MTZxIjZHBW39AZKmzo="; doCheck = false; diff --git a/pkgs/by-name/cs/cspell/package.nix b/pkgs/by-name/cs/cspell/package.nix index 2e6ad446133f..423724ae2266 100644 --- a/pkgs/by-name/cs/cspell/package.nix +++ b/pkgs/by-name/cs/cspell/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cspell"; - version = "9.3.2"; + version = "9.4.0"; src = fetchFromGitHub { owner = "streetsidesoftware"; repo = "cspell"; tag = "v${finalAttrs.version}"; - hash = "sha256-XF94Bkxx+OAEldRD4L8TBokuzgGil0LaPBUbNBiEcVE="; + hash = "sha256-sTH7JG1bHiMhOEVomTwH4TdeqOuTC9iy4mehVyd4Ewo="; }; pnpmWorkspaces = [ "cspell..." ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; fetcherVersion = 2; - hash = "sha256-lp3rXW16/w3ZPXTg/B951SL/WN+QpUQLPjlvc6QaU20="; + hash = "sha256-GgcqgnrBoWu0paVSyTPfZIsGaPEH+EADBYoiZzlVrs8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cs/csv2latex/package.nix b/pkgs/by-name/cs/csv2latex/package.nix index cf214a2720a6..e95dca87fdbb 100644 --- a/pkgs/by-name/cs/csv2latex/package.nix +++ b/pkgs/by-name/cs/csv2latex/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { description = "Command-line CSV to LaTeX file converter"; homepage = "http://brouits.free.fr/csv2latex/"; license = licenses.gpl2Only; - maintainers = [ maintainers.catern ]; mainProgram = "csv2latex"; }; } diff --git a/pkgs/by-name/de/deeptools/package.nix b/pkgs/by-name/de/deeptools/package.nix index 509242f7b521..5aedaaaca27d 100644 --- a/pkgs/by-name/de/deeptools/package.nix +++ b/pkgs/by-name/de/deeptools/package.nix @@ -61,6 +61,5 @@ python3Packages.buildPythonApplication rec { mit bsd3 ]; - maintainers = with lib.maintainers; [ scalavision ]; }; } diff --git a/pkgs/by-name/de/delly/package.nix b/pkgs/by-name/de/delly/package.nix index 5f07377b9171..a41b0249397b 100644 --- a/pkgs/by-name/de/delly/package.nix +++ b/pkgs/by-name/de/delly/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Structural variant caller for mapped DNA sequenced data"; mainProgram = "delly"; license = licenses.bsd3; - maintainers = with maintainers; [ scalavision ]; platforms = platforms.unix; longDescription = '' Delly is an integrated structural variant (SV) prediction method diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index a2a2e53d88c4..682aa82999d8 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -12,20 +12,20 @@ }: let pname = "dependabot-cli"; - version = "1.78.1"; + version = "1.79.0"; # `tag` is what `dependabot` uses to find the relevant docker images. tag = "nixpkgs-dependabot-cli-${version}"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} - updateJobProxy.imageDigest = "sha256:53f33581efa03f1ed691b44896b231923888ba24b0e12cdc440aac2333d532c5"; - updateJobProxy.hash = "sha256-M7vf5YS4ORG0TY+iHXL6nNAJhwgtO4PZbO4EEBBT6qo="; + updateJobProxy.imageDigest = "sha256:e3361d9ba33ffcb1c72b2ac9feba766f0e941b0bf2b692029948f60262708ffa"; + updateJobProxy.hash = "sha256-1TPyyD2a4IN9UoAEZJCHFiOhsP/vIowuy0WfgSmRHpI="; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - updaterGitHubActions.imageDigest = "sha256:a719a18ffb9aa87dba253be94e137ba7561fdf59f60d9a67c3ebc840ab2058a7"; - updaterGitHubActions.hash = "sha256-nb8uX3pu+m7cu6Owi9EnWmUT4Epr4yXScSIFBR/Kb6Q="; + updaterGitHubActions.imageDigest = "sha256:01cad8bab547d5041cf11cb2f0287f091695d5971d3f7fb93b97817727093a2c"; + updaterGitHubActions.hash = "sha256-whFMv7MeyKeFmCDaoG6CxxENcHDC4HNmuNuA3AQTJJI="; in buildGoModule { inherit pname version; @@ -34,7 +34,7 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Q6WZ7FrcEGfUfG/3Zx8Z4Jd+CB6pEcw1fDo3AF8ML4M="; + hash = "sha256-JHuqgurzEO5XA7OHP32X9DcFpZbjbn/h5fZJXCUmOdE="; }; vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0="; diff --git a/pkgs/by-name/dm/dmg2img/package.nix b/pkgs/by-name/dm/dmg2img/package.nix index ff93db42d28e..0ee2a08b5361 100644 --- a/pkgs/by-name/dm/dmg2img/package.nix +++ b/pkgs/by-name/dm/dmg2img/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Lekensteyn/dmg2img"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ KSJ2000 ]; mainProgram = "dmg2img"; }; }) diff --git a/pkgs/by-name/du/dumpifs/package.nix b/pkgs/by-name/du/dumpifs/package.nix index 8ad46567fbc2..6966e375bd7c 100644 --- a/pkgs/by-name/du/dumpifs/package.nix +++ b/pkgs/by-name/du/dumpifs/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool for those who are interested in hacking MIB2 firmware"; homepage = "https://github.com/askac/dumpifs"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ KSJ2000 ]; mainProgram = "dumpifs"; }; }) diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index 1f60d9808a26..d613f12e8af4 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.11.9"; + version = "0.12.0"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-yI227/ZC+4qyg/H+4yuv1imuwIyCB8wDZ7Z3f0OPqXI="; + hash = "sha256-W7RteTkfQMOxMTfEfDr9cQCXpQ3yPExLwdlrh7iR0EI="; }; - npmDepsHash = "sha256-v1o9ZSA+WRYjj2bH+w3lOCXbzqHvsHuvOejU8Ea9PR8="; + npmDepsHash = "sha256-C/5PZv732ZrnGXrlrWZmjJzdyJ+tGAJ5UAw96hh6gaU="; dontBuild = true; diff --git a/pkgs/by-name/el/elasticmq-server-bin/package.nix b/pkgs/by-name/el/elasticmq-server-bin/package.nix index 5490d46aced7..4086398b20e8 100644 --- a/pkgs/by-name/el/elasticmq-server-bin/package.nix +++ b/pkgs/by-name/el/elasticmq-server-bin/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ peterromfeldhk ]; mainProgram = "elasticmq-server"; }; }) diff --git a/pkgs/by-name/em/emuflight-configurator/package.nix b/pkgs/by-name/em/emuflight-configurator/package.nix index 86979a6cec62..619c42d4ac3d 100644 --- a/pkgs/by-name/em/emuflight-configurator/package.nix +++ b/pkgs/by-name/em/emuflight-configurator/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emuflight/EmuConfigurator"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; - maintainers = with maintainers; [ beezow ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ex/external-editor-revived/native-messaging.json b/pkgs/by-name/ex/external-editor-revived/native-messaging.json new file mode 100644 index 000000000000..f1a7c6ed0c0d --- /dev/null +++ b/pkgs/by-name/ex/external-editor-revived/native-messaging.json @@ -0,0 +1,9 @@ +{ + "name": "external_editor_revived", + "description": "Edit emails in external editors such as Vim, Neovim, Emacs, etc.", + "path": "@OUT@/bin/external-editor-revived", + "type": "stdio", + "allowed_extensions": [ + "external-editor-revived@tsundere.moe" + ] +} diff --git a/pkgs/by-name/ex/external-editor-revived/package.nix b/pkgs/by-name/ex/external-editor-revived/package.nix new file mode 100644 index 000000000000..0bffe733b87f --- /dev/null +++ b/pkgs/by-name/ex/external-editor-revived/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "external-editor-revived"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Frederick888"; + repo = "external-editor-revived"; + tag = "v${version}"; + sha256 = "sha256-K5agRpFJ8iqvPnx3IIMTvrkObT/GB962EtdvWf7Eq4w="; + }; + + cargoHash = "sha256-QYSsdEBNwjpR7lppyOcsc0F8ombBY+dlFRY1GO/D8so="; + + postInstall = '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + substitute '${./native-messaging.json}' "$out/lib/mozilla/native-messaging-hosts/external_editor_revived.json" \ + --replace-fail "@OUT@" "$out" + ''; + + meta = with lib; { + description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs"; + homepage = "https://github.com/Frederick888/external-editor-revived"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ mofrim ]; + mainProgram = "external-editor-revived"; + }; +} diff --git a/pkgs/by-name/fa/fastlane/package.nix b/pkgs/by-name/fa/fastlane/package.nix index ef7b6ed16eed..e646f53b47d8 100644 --- a/pkgs/by-name/fa/fastlane/package.nix +++ b/pkgs/by-name/fa/fastlane/package.nix @@ -24,7 +24,6 @@ bundlerApp { homepage = "https://fastlane.tools/"; license = licenses.mit; maintainers = with maintainers; [ - peterromfeldhk nicknovitski shahrukh330 ]; diff --git a/pkgs/by-name/fe/fehlstart/package.nix b/pkgs/by-name/fe/fehlstart/package.nix index 175a6ebf7921..730d8155ab28 100644 --- a/pkgs/by-name/fe/fehlstart/package.nix +++ b/pkgs/by-name/fe/fehlstart/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation { description = "Small desktop application launcher with reasonable memory footprint"; homepage = "https://codeberg.org/Chuvok/fehlstart"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.mounium ]; platforms = lib.platforms.linux; mainProgram = "fehlstart"; }; diff --git a/pkgs/by-name/ga/ganttproject-bin/package.nix b/pkgs/by-name/ga/ganttproject-bin/package.nix index b8ba41626fc5..b0de72844856 100644 --- a/pkgs/by-name/ga/ganttproject-bin/package.nix +++ b/pkgs/by-name/ga/ganttproject-bin/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation rec { # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.vidbina ]; mainProgram = "ganttproject"; }; } diff --git a/pkgs/by-name/gf/gfxstream/gfxstream-add-include-cstdint.patch b/pkgs/by-name/gf/gfxstream/gfxstream-add-include-cstdint.patch new file mode 100644 index 000000000000..97f4c12cc5cc --- /dev/null +++ b/pkgs/by-name/gf/gfxstream/gfxstream-add-include-cstdint.patch @@ -0,0 +1,49 @@ +diff --git a/host/BorrowedImage.h b/host/BorrowedImage.h +index ed2890568..51ea2b6b1 100644 +--- a/host/BorrowedImage.h ++++ b/host/BorrowedImage.h +@@ -12,6 +12,7 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + ++#include + #pragma once + + namespace gfxstream { +diff --git a/host/compressedTextureFormats/AstcCpuDecompressor.h b/host/compressedTextureFormats/AstcCpuDecompressor.h +index 4823ee255..3af0bdc64 100644 +--- a/host/compressedTextureFormats/AstcCpuDecompressor.h ++++ b/host/compressedTextureFormats/AstcCpuDecompressor.h +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + namespace gfxstream { + namespace vk { +diff --git a/host/magma/DrmContext.h b/host/magma/DrmContext.h +index db3ef45e4..5030c7dd6 100644 +--- a/host/magma/DrmContext.h ++++ b/host/magma/DrmContext.h +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #include "aemu/base/Compiler.h" + +diff --git a/host/vulkan/BufferVk.h b/host/vulkan/BufferVk.h +index 9016fd745..a8a3fe3eb 100644 +--- a/host/vulkan/BufferVk.h ++++ b/host/vulkan/BufferVk.h +@@ -14,6 +14,7 @@ + + #include + #include ++#include + + namespace gfxstream { + namespace vk { + diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index 60eaf27d23be..8f8fbddbde2a 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AN6OpZQ2te4iVuh/kFHXzmLAWIMyuoj9FHTVicnbiPw="; }; + patches = [ + # Fix build with gcc15 + ./gfxstream-add-include-cstdint.patch + ]; + # Ensure that meson can find an Objective-C compiler on Darwin. postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace meson.build \ diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix index 9c6a17316633..27bb61be7a3b 100644 --- a/pkgs/by-name/gh/ghorg/package.nix +++ b/pkgs/by-name/gh/ghorg/package.nix @@ -49,7 +49,6 @@ buildGoModule rec { ''; homepage = "https://github.com/gabrie30/ghorg"; license = licenses.asl20; - maintainers = with maintainers; [ vidbina ]; mainProgram = "ghorg"; }; } diff --git a/pkgs/by-name/gr/grepcidr/package.nix b/pkgs/by-name/gr/grepcidr/package.nix index 0d1ec5f64822..d878ee48e5fd 100644 --- a/pkgs/by-name/gr/grepcidr/package.nix +++ b/pkgs/by-name/gr/grepcidr/package.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://www.pc-tools.net/unix/grepcidr/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.fadenb ]; mainProgram = "grepcidr"; }; } diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index b19fe0f056b5..816017a24a9a 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { description = "Command line tool for interacting with grpc services"; homepage = "https://github.com/grpc/grpc"; license = licenses.asl20; - maintainers = with maintainers; [ doriath ]; platforms = platforms.linux; mainProgram = "grpc_cli"; }; diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 61a638bc6447..03e4930bb289 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -115,7 +115,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ luftmensch-luftmensch - math-42 d3vil0p3r ]; }; diff --git a/pkgs/by-name/gt/gti/package.nix b/pkgs/by-name/gt/gti/package.nix index faf0dcfc8468..87c279701d20 100644 --- a/pkgs/by-name/gt/gti/package.nix +++ b/pkgs/by-name/gt/gti/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://r-wos.org/hacks/gti"; license = licenses.mit; description = "Humorous typo-based git runner; drives a car over the terminal"; - maintainers = with maintainers; [ fadenb ]; platforms = platforms.unix; mainProgram = "gti"; }; diff --git a/pkgs/by-name/ha/haiti/package.nix b/pkgs/by-name/ha/haiti/package.nix index e060ae0da620..b6719923ecd5 100644 --- a/pkgs/by-name/ha/haiti/package.nix +++ b/pkgs/by-name/ha/haiti/package.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/noraj/haiti"; license = lib.licenses.mit; mainProgram = "haiti"; - maintainers = with lib.maintainers; [ KSJ2000 ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ha/hashcat-utils/package.nix b/pkgs/by-name/ha/hashcat-utils/package.nix index dc717c51b7b3..631cc1fa5092 100644 --- a/pkgs/by-name/ha/hashcat-utils/package.nix +++ b/pkgs/by-name/ha/hashcat-utils/package.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ fadenb ]; }; } diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix index 53735b45dd32..8b1796ec8a96 100644 --- a/pkgs/by-name/he/helm-ls/package.nix +++ b/pkgs/by-name/he/helm-ls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.4.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-z+gSD7kcDxgJPoYQ7HjokJONjgAAuIIkg1VGyV3v01k="; + hash = "sha256-4M2o/M8mnO+9QwsjsGahY3i/pwtsNdCMCn5oCFGm0aI="; }; - vendorHash = "sha256-w/BWPbpSYum0SU8PJj76XiLUjTWO4zNQY+khuLRK0O8="; + vendorHash = "sha256-4zQy7PFC41iBVKvDRaW2zUnUzCSQmjAmyKsdnLDUHJ8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ht/http-nu/package.nix b/pkgs/by-name/ht/http-nu/package.nix new file mode 100644 index 000000000000..812941d8f9e9 --- /dev/null +++ b/pkgs/by-name/ht/http-nu/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenvNoCC, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "http-nu"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "cablehead"; + repo = "http-nu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ri0/HnTINXGrdzh26uT+JD32sbKLnbzq8ps2+LUbbI8="; + }; + + cargoHash = "sha256-C4VYE6dLHwYaJ9LI4A+R1AvK3Qu8lV2ISy+8ymFKQg8="; + + nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ + rustPlatform.bindgenHook + ]; + + # Most tests require sandbox-incompatible operations: + # - Integration tests (server_test, server_missing_host) require network and curl binary + # - test_handler requires temporary filesystem writes + # - Only test_engine could run in sandbox, but selective enablement adds maintenance burden + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Serve a Nushell closure over HTTP"; + longDescription = '' + http-nu is a tool that allows you to serve Nushell closures over HTTP, + making it easy to create web services using Nushell's powerful scripting + capabilities. + ''; + homepage = "https://github.com/cablehead/http-nu"; + changelog = "https://github.com/cablehead/http-nu/blob/v${finalAttrs.version}/changes/v${finalAttrs.version}.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + cablehead + cboecking + ]; + mainProgram = "http-nu"; + }; +}) diff --git a/pkgs/by-name/in/infra/package.nix b/pkgs/by-name/in/infra/package.nix index 9929717b539c..acbbe96a6902 100644 --- a/pkgs/by-name/in/infra/package.nix +++ b/pkgs/by-name/in/infra/package.nix @@ -29,7 +29,6 @@ buildGoModule rec { homepage = "https://github.com/infrahq/infra"; changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md"; license = lib.licenses.elastic20; - maintainers = with lib.maintainers; [ peterromfeldhk ]; mainProgram = "infra"; }; } diff --git a/pkgs/by-name/iq/iqueue/package.nix b/pkgs/by-name/iq/iqueue/package.nix index 4fa72e8eb804..a1b34d1d1960 100644 --- a/pkgs/by-name/iq/iqueue/package.nix +++ b/pkgs/by-name/iq/iqueue/package.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { description = "Indexed queue"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.catern ]; }; } diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index 8aee84e814ee..d653f1201911 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -48,7 +48,6 @@ stdenvNoCC.mkDerivation rec { hydraPlatforms = [ ]; # The build is little more than copying the binary license = licenses.gpl2; maintainers = with maintainers; [ - steinybot tricktron emaiax ]; diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 1627c24b753c..364fdfaa761b 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -9,7 +9,7 @@ let pname = "jai"; minor = "2"; - patch = "018"; + patch = "020"; version = "0.${minor}.${patch}"; zipName = "jai-beta-${minor}-${patch}.zip"; jai = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let nix-store --add-fixed sha256 ${zipName} ''; name = zipName; - sha256 = "sha256-vs9YSQzeqp34OSSl8JghDVyyqegsQj3bhUDGNwecHRI="; + sha256 = "sha256-4ni5psPUfoeupka8UryhWorCK9vptWZRPPDaRXAtN7M="; }; nativeBuildInputs = [ unzip ]; buildCommand = "unzip $src -d $out"; diff --git a/pkgs/by-name/ja/jazzy/package.nix b/pkgs/by-name/ja/jazzy/package.nix index ef04d10d5c4a..ca9c0ec55d4d 100644 --- a/pkgs/by-name/ja/jazzy/package.nix +++ b/pkgs/by-name/ja/jazzy/package.nix @@ -17,7 +17,6 @@ bundlerApp { license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ - peterromfeldhk nicknovitski ]; }; diff --git a/pkgs/by-name/jm/jmol/package.nix b/pkgs/by-name/jm/jmol/package.nix index 5dba2189b2c8..4076550ebeb6 100644 --- a/pkgs/by-name/jm/jmol/package.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ mounium ]; teams = [ teams.sage ]; }; } diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index df12a8985f78..0b92bd2cdf2a 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; tag = "v${finalAttrs.version}"; - hash = "sha256-7ySbnWiX5pHMG2BcnLowKegEwjSdkKReh72Y3z8cpLg="; + hash = "sha256-brcOFD6EO6lVL4A+LrZp6CxZFY2mu+i10IQmjwf4XMo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 6ffb65922076..e7fbd0b14f55 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -6,7 +6,7 @@ karabiner-dk, fetchFromGitHub, versionCheckHook, - common-updater-scripts, + nix-update, yq, curl, jq, @@ -16,16 +16,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "kanata"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "jtroo"; repo = "kanata"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-xxAIwiwCQugDXpWga9bQ9ZGfem46rwDlmf64dX/tw7g="; + sha256 = "sha256-IicVuJZBHzBv9SNGQuWIIaLq2qpWfn/jMFh9KPvAThs="; }; - cargoHash = "sha256-LfjuQHR3vVUr2e0efVymnfCnyYkFRx7ZiNdSIjBZc5s="; + cargoHash = "sha256-2DTL1u17jUFiRoVe7973L5/352GtKte/vakk01SSRwY="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ (writeShellScriptBin "sw_vers" '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; passthru = { - darwinDriverVersion = "5.0.0"; # needs to be updated if karabiner-driverkit changes + darwinDriverVersion = "6.2.0"; # needs to be updated if karabiner-driverkit changes updateScript = lib.getExe (writeShellApplication { name = "update-script-kanata"; runtimeInputs = [ @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { gnused yq jq - common-updater-scripts + nix-update ]; text = builtins.readFile ./update.sh; }); diff --git a/pkgs/by-name/ka/kanata/update.sh b/pkgs/by-name/ka/kanata/update.sh index bc78070bb66b..b8aaab495676 100644 --- a/pkgs/by-name/ka/kanata/update.sh +++ b/pkgs/by-name/ka/kanata/update.sh @@ -1,8 +1,9 @@ -NEW_VERSION="$(curl --silent https://api.github.com/repos/jtroo/kanata/releases/latest ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} | jq '.tag_name | ltrimstr("v")' --raw-output)" -update-source-version "kanata" "$NEW_VERSION" --ignore-same-version +nix-update + +importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)" +NEW_VERSION=$(nix-instantiate --eval -E "with $importTree; kanata.version" | tr -d '"') karabinerDriverCrateVersion="$(curl -L "https://raw.githubusercontent.com/jtroo/kanata/refs/tags/v$NEW_VERSION/Cargo.lock" | tomlq | jq --raw-output '.package[] | select(.name | test("karabiner-driverkit")) |.version')" newKarabinerDkVersion="$(curl -L "https://crates.io/api/v1/crates/karabiner-driverkit/$karabinerDriverCrateVersion/download" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)" -importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)" oldDarwinVersion=$(nix-instantiate --eval -E "with $importTree; kanata.passthru.darwinDriverVersion" | tr -d '"') nixFile=$(nix-instantiate --eval --strict -A "kanata.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') sed -i "$nixFile" -re "s|\"$oldDarwinVersion\"|\"$newKarabinerDkVersion\"|" diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 8b55085e7bf9..ba108e38f3d9 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -69,7 +69,6 @@ buildGoModule rec { license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ - peefy selfuryon ]; mainProgram = "kcl"; diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index 16644e913acb..67541a04700b 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ selfuryon - peefy ]; }; }) diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index c7c9b27fa2db..f98c8f49e271 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ selfuryon - peefy ]; mainProgram = "kclvm_cli"; }; diff --git a/pkgs/by-name/kd/kdbg/package.nix b/pkgs/by-name/kd/kdbg/package.nix index 349ffc59be2e..0583b0502e72 100644 --- a/pkgs/by-name/kd/kdbg/package.nix +++ b/pkgs/by-name/kd/kdbg/package.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { ''; mainProgram = "kdbg"; license = licenses.gpl2; - maintainers = [ maintainers.catern ]; }; } diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix index ed04394e21a1..2eab7e6b7d52 100644 --- a/pkgs/by-name/ke/kent/package.nix +++ b/pkgs/by-name/ke/kent/package.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://genome.ucsc.edu"; changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${finalAttrs.version}_base"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ scalavision ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index f3c5dfbfabda..6c94a4dce3bf 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "keymapper"; maintainers = with lib.maintainers; [ dit7ya - spitulax ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ku/kubent/package.nix b/pkgs/by-name/ku/kubent/package.nix index c49a00940220..cb2461379402 100644 --- a/pkgs/by-name/ku/kubent/package.nix +++ b/pkgs/by-name/ku/kubent/package.nix @@ -39,6 +39,5 @@ buildGoModule rec { homepage = "https://github.com/doitintl/kube-no-trouble"; license = lib.licenses.mit; mainProgram = "kubent"; - maintainers = with lib.maintainers; [ peterromfeldhk ]; }; } diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix index a2c44232cc1b..7c2e2033a29a 100644 --- a/pkgs/by-name/ku/kuttl/package.nix +++ b/pkgs/by-name/ku/kuttl/package.nix @@ -30,7 +30,6 @@ buildGoModule rec { description = "KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators"; homepage = "https://github.com/kudobuilder/kuttl"; license = licenses.asl20; - maintainers = with maintainers; [ diegolelis ]; mainProgram = "kubectl-kuttl"; }; } diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index b242d118609d..243ed812466f 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "25.11.11"; + version = "25.12.1"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-MHeNa0MfPOslop9bdA1+5qiY9/r0TXca+UsahgyA34A="; + hash = "sha256-Of3RjpBYzIW0ZUWJQxwVB+/NfCJUttEU28UvE5AA8OI="; }; - cargoHash = "sha256-whtucq2mmhp+UZYZS2MJ9jnIg7XOh4zziGD2lO710h8="; + cargoHash = "sha256-uruy8BCPAu3kK2DrxX9BsnDHC2igabBdLGfwVLlhNIs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index cc118df70464..735d26d0915d 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "25.11.11"; + version = "25.12.1"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-MHeNa0MfPOslop9bdA1+5qiY9/r0TXca+UsahgyA34A="; + hash = "sha256-Of3RjpBYzIW0ZUWJQxwVB+/NfCJUttEU28UvE5AA8OI="; }; - cargoHash = "sha256-whtucq2mmhp+UZYZS2MJ9jnIg7XOh4zziGD2lO710h8="; + cargoHash = "sha256-uruy8BCPAu3kK2DrxX9BsnDHC2igabBdLGfwVLlhNIs="; doCheck = false; # there are no cli tests cargoBuildFlags = [ diff --git a/pkgs/by-name/lz/lzfse/package.nix b/pkgs/by-name/lz/lzfse/package.nix index 9facc49afec3..5898dda4a685 100644 --- a/pkgs/by-name/lz/lzfse/package.nix +++ b/pkgs/by-name/lz/lzfse/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.unix; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ KSJ2000 ]; mainProgram = "lzfse"; }; }) diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index 062995bcb39e..32b90b0bc08a 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; mainProgram = "mas"; maintainers = with maintainers; [ - steinybot zachcoyle ]; platforms = [ diff --git a/pkgs/by-name/ma/materia-theme/package.nix b/pkgs/by-name/ma/materia-theme/package.nix index b5363da9f2b4..f772a995ba23 100644 --- a/pkgs/by-name/ma/materia-theme/package.nix +++ b/pkgs/by-name/ma/materia-theme/package.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nana-4/materia-theme"; license = licenses.gpl2Only; platforms = platforms.all; - maintainers = [ maintainers.mounium ]; }; } diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix index f437255e72ca..b2107ac689b6 100644 --- a/pkgs/by-name/me/melodeon/package.nix +++ b/pkgs/by-name/me/melodeon/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "melodeon"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "CDrummond"; repo = "melodeon"; tag = finalAttrs.version; - hash = "sha256-WfDPmOysM3ya7PACROCxHjInF0q5AIJ3G4bdJsh8RxA="; + hash = "sha256-jSzrz99TRcfVffnvr5PC2ipGl7g7mPc5NrxR15e9wOg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 1dc0dc2e4ef3..f64f6d063255 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -60,7 +60,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { modules (written in Java or Scala) or through an external subprocesses. ''; maintainers = with lib.maintainers; [ - scalavision zenithal ]; platforms = [ diff --git a/pkgs/by-name/mi/minimal-grub-theme/package.nix b/pkgs/by-name/mi/minimal-grub-theme/package.nix index 127ada00f058..e0acaec30c5e 100644 --- a/pkgs/by-name/mi/minimal-grub-theme/package.nix +++ b/pkgs/by-name/mi/minimal-grub-theme/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "minimal-grub-theme"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "tomdewildt"; repo = "minimal-grub-theme"; tag = "v${finalAttrs.version}"; - hash = "sha256-CegLznlW+UJZbVe+WG/S8tREFdw0aq3flGvJeDrLWK0="; + hash = "sha256-otGWChSgoxRKfJZkw9usY1sxAc/RsXmkNVMxbSqtc04="; }; dontBuild = true; @@ -21,9 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/ - - cp -r minimal/icons minimal/theme.txt minimal/*.png $out/ + cp -r minimal/ $out/ runHook postInstall ''; diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index b550d756f38e..8053f85768fd 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -4,7 +4,9 @@ fetchFromGitHub, fetchFromGitLab, rustPlatform, + systemdMinimal, symlinkJoin, + # nativeBuildInputs blueprint-compiler, cargo, @@ -17,6 +19,7 @@ python3, rustc, wrapGAppsHook4, + # buildInputs appstream-glib, cairo, @@ -35,11 +38,14 @@ sqlite, udev, wayland, + + # tests + versionCheckHook, + # magpie wrapper addDriverRunpath, libGL, vulkan-loader, - versionCheckHook, }: # UPDATE PROCESS: @@ -59,20 +65,20 @@ let nvtop = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; - rev = "73291884d926445e499d6b9b71cb7a9bdbc7c393"; - hash = "sha256-8iChT55L2NSnHg8tLIry0rgi/4966MffShE0ib+2ywc="; + rev = "339ee0b10a64ec51f43d27357b0068a40f16e9e4"; + hash = "sha256-QxGP6lHbjS7GAQGWUnxFdrYgxBVhtuk5CzS2EUVFjOs="; }; in stdenv.mkDerivation (finalAttrs: { pname = "mission-center"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-TvrYwuJR03mvPc8oXBx6GClOLc+r5kblaOj0uaLwbwE="; + hash = "sha256-KETaCjKTxEvh3tgLzJw5PLJHAQivqXhGYcluvFhGGd8="; }; postPatch = @@ -106,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: { # Patch the shebang of this python script called at build time + '' patchShebangs $SRC_MAGPIE_DIR/platform-linux/hwdb/generate_hwdb.py + '' + # Inject the absolute path to the udevadm binary in magpie's source code + + '' + substituteInPlace subprojects/magpie/platform-linux/src/memory.rs \ + --replace-fail "udevadm" "${lib.getExe' systemdMinimal "udevadm"}" ''; cargoDeps = symlinkJoin { @@ -113,13 +124,13 @@ stdenv.mkDerivation (finalAttrs: { paths = [ (rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-1Bcxp0EuHbJrLQIb2STLNIL2BM2eOgL8ftx4g1o/JY4="; + hash = "sha256-XS+/gpCMIqDgFR6AjuT2q+p+85GklUuRhKWzaBfQjZg="; }) (rustPlatform.fetchCargoVendor { pname = "${finalAttrs.pname}-magpie"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/subprojects/magpie"; - hash = "sha256-ouY9zSQ7csAqPzQrbWGtCTB9ECVBKOUX78K5SiqTTxg="; + hash = "sha256-9YZ2dgIaq0AtS8QsIC/0cJlELIy/UbOvulgZFL/qRRs="; }) ]; }; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 164a5743049e..9d22a3cf24ec 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2025-11-28"; + version = "0-unstable-2025-12-02"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "48358b91b776d0bd34cbbc4c70e7ac5ce827b916"; - hash = "sha256-Pvtc32s/p19Pg8JACSEmxj6Ldc5vl8ZOXiPbJ3ZAUqQ="; + rev = "8bd2b3595f0731c4db5b6fb629655bdb7a23d78b"; + hash = "sha256-SNnqbC1XbeO9f8wSMHPIfdKkgyNbTTM6Lu4IVj9fTDQ="; postFetch = lib.optionalString stdenvNoCC.hostPlatform.isLinux '' # NOTE: Normalize case-sensitive directory names that cause issues on case-insensitive filesystems cp -r "$out/providers/poe/models/openai"/* "$out/providers/poe/models/openAi/" diff --git a/pkgs/by-name/nd/ndppd/package.nix b/pkgs/by-name/nd/ndppd/package.nix index bb0fda862e98..8f71e1d733a7 100644 --- a/pkgs/by-name/nd/ndppd/package.nix +++ b/pkgs/by-name/nd/ndppd/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/DanielAdolfsson/ndppd"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ fadenb ]; mainProgram = "ndppd"; }; } diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix index 611204838fc0..13731f0b9f55 100644 --- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - libsForQt5, + qt6, fetchFromGitHub, cmake, doxygen, @@ -24,12 +24,13 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DUSE_SYSTEM_MSGPACK=1" "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found + "-DWITH_QT=Qt6" ]; nativeBuildInputs = [ cmake doxygen - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook (python3.withPackages (ps: [ ps.jinja2 ps.msgpack @@ -38,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ neovim.unwrapped # only used to generate help tags at build time - libsForQt5.qtbase - libsForQt5.qtsvg + qt6.qtbase + qt6.qtsvg msgpack-c ]; diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix index 626dbc3dd7e2..0a05c87a2543 100644 --- a/pkgs/by-name/ne/netpeek/package.nix +++ b/pkgs/by-name/ne/netpeek/package.nix @@ -15,14 +15,14 @@ }: python3Packages.buildPythonApplication rec { pname = "netpeek"; - version = "0.2.4"; + version = "0.2.5"; pyproject = false; src = fetchFromGitHub { owner = "ZingyTomato"; repo = "NetPeek"; tag = "v${version}"; - hash = "sha256-mouXMFYhCBEUTyPfuaw570ZC40TJuprldiSiP0Il0KA="; + hash = "sha256-b7XHBmFSI3ITojd05M6tytozgfBg0WvN/CWFbk5c/JQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nextflow/package.nix b/pkgs/by-name/ne/nextflow/package.nix index 4692617c3efe..b2249deea516 100644 --- a/pkgs/by-name/ne/nextflow/package.nix +++ b/pkgs/by-name/ne/nextflow/package.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ Etjean - edmundmiller ]; mainProgram = "nextflow"; platforms = platforms.unix; diff --git a/pkgs/by-name/nn/nntp-proxy/package.nix b/pkgs/by-name/nn/nntp-proxy/package.nix index 48c5bc78edf1..d0c00553466a 100644 --- a/pkgs/by-name/nn/nntp-proxy/package.nix +++ b/pkgs/by-name/nn/nntp-proxy/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { description = "Simple NNTP proxy with SSL support"; homepage = "https://github.com/nieluj/nntp-proxy"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.fadenb ]; platforms = lib.platforms.all; mainProgram = "nntp-proxy"; }; diff --git a/pkgs/by-name/nu/num-utils/package.nix b/pkgs/by-name/nu/num-utils/package.nix index fc032d90699a..5def44141ddf 100644 --- a/pkgs/by-name/nu/num-utils/package.nix +++ b/pkgs/by-name/nu/num-utils/package.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { homepage = "https://suso.suso.org/xulu/Num-utils"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.catern ]; }; } diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 227a01881fe8..16481f68de9c 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-mHInKRsJSzhorDvsFETTpmIloO6MMs/OyueGb19alHA="; + hash = "sha256-vC2X4iZLTUm0Tnc5zJDfKdmhn8wlFLbHRtNbqMmFAgQ="; }; vendorHash = "sha256-8pfrp7eOsgpCB44TQXn98G8+5WSn4EnuGKt6JUajAQ8="; diff --git a/pkgs/by-name/on/onnx/package.nix b/pkgs/by-name/on/onnx/package.nix new file mode 100644 index 000000000000..f911fa24b56e --- /dev/null +++ b/pkgs/by-name/on/onnx/package.nix @@ -0,0 +1,162 @@ +{ + cmake, + fetchFromGitHub, + gtest, + lib, + ninja, + protobuf, + python3Packages, + stdenv, +}: +let + inherit (lib) + cmakeFeature + licenses + maintainers + mapAttrsToList + ; + inherit (python3Packages) + build + pybind11 + python + setuptools + ; +in +stdenv.mkDerivation (finalAttrs: { + __structuredAttrs = true; + strictDeps = true; + + pname = "onnx"; + version = "1.19.1"; + + src = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lIw65HAaNE+pOiHPpbOxzX+gk8ueJfuAHxs+DV99Jh0="; + }; + + outputs = [ + "out" + "dist" # Python wheel output + ]; + + nativeBuildInputs = [ + build + cmake + ninja + pybind11 + python + setuptools + ]; + + # NOTE: Most of these can be removed after bumping to 1.20. + # See: + # - https://github.com/onnx/onnx/issues/7472 + # - https://github.com/pytorch/pytorch/issues/167525 + # NOTE: Darwin requires a static build, so this patch is unnecessary on that platform. + prePatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + nixLog "patching $PWD/CMakeLists.txt to allow tests to build with shared libraries" + substituteInPlace "$PWD/CMakeLists.txt" \ + --replace-fail \ + 'message(FATAL_ERROR "Tests requires static build")' \ + "" + + nixLog "patching $PWD/CMakeLists.txt to correctly link onnx_cpp2py_export with shared libraries" + substituteInPlace "$PWD/CMakeLists.txt" \ + --replace-fail \ + 'target_link_libraries(onnx_cpp2py_export PRIVATE $)' \ + 'target_link_libraries(onnx_cpp2py_export PRIVATE $ $)' + + nixLog "patching $PWD/CMakeLists.txt to fix symbol visibility" + substituteInPlace "$PWD/CMakeLists.txt" \ + --replace-fail \ + 'set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ + '# set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ + --replace-fail \ + 'set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \ + '# set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)' \ + --replace-fail \ + 'set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ + '# set_target_properties(onnx PROPERTIES CXX_VISIBILITY_PRESET hidden)' \ + --replace-fail \ + 'set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' \ + '# set_target_properties(onnx PROPERTIES VISIBILITY_INLINES_HIDDEN ON)' + + nixLog "patching $PWD/cmake/ONNXConfig.cmake.in to fix CMake discovery" + substituteInPlace "$PWD/cmake/ONNXConfig.cmake.in" \ + --replace-fail \ + 'if((NOT @@ONNX_USE_PROTOBUF_SHARED_LIBS@@) AND @@Build_Protobuf@@)' \ + 'if(NOT @ONNX_USE_PROTOBUF_SHARED_LIBS@)' + ''; + + # NOTE: python3Packages.protobuf does not propagate a dependency on protobuf's dev output, so we must bring it in + # for the CMake files. + buildInputs = [ + protobuf + python3Packages.protobuf + ]; + + # Declared in setup.py + cmakeBuildDir = ".setuptools-cmake-build"; + + # Python setup.py just takes stuff from the environment. + env = { + # NOTE: Darwin requires a static build; otherwise, tests fail in the Python package. + BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1"; + ONNX_BUILD_PYTHON = "1"; + ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0"; + # ONNX_ML is enabled by default, so we must explicitly disable it. + # See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73 + # NOTE: If this is `true`, onnx-tensorrt fails to build due to missing protobuf files. + ONNX_ML = "0"; + ONNX_NAMESPACE = "onnx"; + ONNX_USE_PROTOBUF_SHARED_LIBS = "1"; + }; + + cmakeFlags = mapAttrsToList cmakeFeature finalAttrs.env; + + preConfigure = '' + export MAX_JOBS=$NIX_BUILD_CORES + ''; + + # Leave the CMake bulid directory, export the `cmakeFlags` environment variable as CMAKE_ARGS so setup.py will pick + # them up, do the python build from the top-level, then resume the C++ build. + preBuild = '' + pushd .. + nixLog "exporting cmakeFlags as CMAKE_ARGS for Python build" + export CMAKE_ARGS="''${cmakeFlags[*]}" + nixLog "building Python wheel" + pyproject-build \ + --no-isolation \ + --outdir "$dist/" \ + --wheel + popd >/dev/null + ''; + + # NOTE: Python specific tests happen in the python package. + doCheck = true; + + checkInputs = [ gtest ]; + + preCheck = '' + nixLog "running C++ tests with $PWD/onnx_gtests" + "$PWD/onnx_gtests" + ''; + + postInstall = '' + nixLog "removing empty directories in $out/include/onnx" + find "$out/include/onnx" -type d -empty -delete + ''; + + meta = { + description = "Open Neural Network Exchange"; + homepage = "https://onnx.ai"; + license = licenses.asl20; + changelog = "https://github.com/onnx/onnx/releases/tag/v${finalAttrs.version}"; + maintainers = with maintainers; [ + acairncross + connorbaker + ]; + }; +}) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 8426dd19ae77..bbc6bcbdc89d 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -13,12 +13,12 @@ }: let pname = "opencode"; - version = "1.0.119"; + version = "1.0.126"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${version}"; - hash = "sha256-U2oIEXhAWOaOZHGBlVUPgysW0AtEh/P8LxbGlm8Lquk="; + hash = "sha256-eW/+MoGh5V1t+4m+EDAm7dhTwJ+yqYmbLkZ9blYeXqQ="; }; node_modules = stdenvNoCC.mkDerivation { @@ -70,7 +70,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-rGmHVBhsyOmPD4kG8k0hhER5pZn2KVwBXk0O8MER8jc="; + outputHash = "sha256-/AP7wVUGO/LlYaQPglYIZ3/w0WKuO25PZNWEV7lKjGM="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 9d40208af158..242170ef674d 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage { pname = "owi"; - version = "0.2-unstable-2025-11-25"; + version = "0.2-unstable-2025-12-01"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "23fb234334310ae8b4ba3c4a2def6a9fed7508fd"; + rev = "92403520c3ad8ea1a57d734772e2c4c22589eca3"; fetchSubmodules = true; - hash = "sha256-I74mjs4GozMlUr+ezt22J6+cs8GDcNZkPC42W0kvGnI="; + hash = "sha256-cVkHaXBeTgfHKLCIB3sTEIqu2kvYmo3gi42tRn2DcaA="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix index 36bbec837ade..118d42067192 100644 --- a/pkgs/by-name/ph/phoc/package.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - masipcat zhaofengli armelclo ]; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index daea4b4409c6..b1701712472d 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -69,7 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://pixi.sh/latest/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - edmundmiller xiaoxiangmoe ]; mainProgram = "pixi"; diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix index 5874718b28b7..7cbbd5c329f6 100644 --- a/pkgs/by-name/pl/pluto/package.nix +++ b/pkgs/by-name/pl/pluto/package.nix @@ -31,7 +31,6 @@ buildGoModule rec { mainProgram = "pluto"; license = licenses.asl20; maintainers = with maintainers; [ - peterromfeldhk kashw2 ]; }; diff --git a/pkgs/by-name/po/podofo_1_0/package.nix b/pkgs/by-name/po/podofo_1_0/package.nix index 307f2d745405..09c2c3fc4950 100644 --- a/pkgs/by-name/po/podofo_1_0/package.nix +++ b/pkgs/by-name/po/podofo_1_0/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-mWomK+efiq2oLnYdLSWpqwtSd0WNVU1DsYmDHierQ64="; + hash = "sha256-BJSQkcaE3oKq7ojJgfPyvOphw7pq+ilEIVIxaoIcdXw="; }; outputs = [ diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 7ab547b4124d..bd79e8724b3d 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -30,7 +30,6 @@ buildGoModule rec { homepage = "https://github.com/pulumi/esc/tree/main"; changelog = "https://github.com/pulumi/esc/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ yomaq ]; mainProgram = "esc"; }; } diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index fe3fd28bae09..12fd27a84364 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -101,6 +101,5 @@ stdenv.mkDerivation (finalAttrs: { license = if withAngrylionRdpPlus then lib.licenses.unfree else lib.licenses.gpl3Only; platforms = lib.platforms.linux; mainProgram = "RMG"; - maintainers = with lib.maintainers; [ slam-bert ]; }; }) diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 510a1a39eebb..9fcf2f051d1c 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -361,7 +361,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ ciil - cfhammill tomasajt ]; mainProgram = "rstudio" + lib.optionalString server "-server"; diff --git a/pkgs/by-name/ru/rustdress/package.nix b/pkgs/by-name/ru/rustdress/package.nix index 27ac2b33562c..3775762a71c7 100644 --- a/pkgs/by-name/ru/rustdress/package.nix +++ b/pkgs/by-name/ru/rustdress/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rustdress"; - version = "0.5.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "niteshbalusu11"; repo = "rustdress"; tag = "v${version}"; - hash = "sha256-XEXvAAnktr7gfk3y8kLtrVmg0slx5wc4dCCWT2r+Wj0="; + hash = "sha256-vADuzT1q6nzNMtSykhmfaX6SMkWxQHHpKD/NrfWsCgI="; }; - cargoHash = "sha256-COuHTjEy/VkfVd2/kjTKw1kiJI0XC72TEXaS8lVXsAQ="; + cargoHash = "sha256-LyWVuy/b1oaeBL2s1VUXHJefcgg13JqqEh24WSdk5nI="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index bd1675b7e8cd..aa927474adf9 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-zjg5WSa/zKIyFmkXsmtghHaPoexxqE7m9kAA5V9f5Nc="; + hash = "sha256-G5h30KZVkRYwW84Si0I8qSgDuPTfFqQMoyctKB8Kq1s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json index c8c6d829a485..0d9e02f88a90 100644 --- a/pkgs/by-name/sl/slimevr-server/deps.json +++ b/pkgs/by-name/sl/slimevr-server/deps.json @@ -44,23 +44,23 @@ "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=", "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs=" }, - "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.0.2": { - "pom": "sha256-7R3td6KWpv4hpQJ5ySbAe+FK98CMJDfTaFxw/Pa7oC0=" + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.0.0": { + "pom": "sha256-P/Oh7RadAeWWadmHM4wl8jDaB9YpUlOPDdT5R3YokDY=" }, - "com/diffplug/spotless#spotless-lib-extra/3.0.2": { - "jar": "sha256-sOd3RtYz1EXnhImsPQitLqGzU3xNBk5KvkbMQtYjA+s=", - "module": "sha256-vSVeQkQbWRehU8U9z5fP08IEevN2zF3Yu1Z/aEAWtFk=", - "pom": "sha256-IVesGayscKzQRQH8WbvJZNsZD1tx5O1e/s6o5c9o7Os=" + "com/diffplug/spotless#spotless-lib-extra/4.0.0": { + "jar": "sha256-eU/w7Rnmc9WDQiAay+mWa7V8opNptlkapAfpH3EIc2c=", + "module": "sha256-dqvsZm0K6Bu7X0LZSYmo9NBgzIv4HAWXyzycbJ8weA0=", + "pom": "sha256-mFOj57ehlVHOyeTfguC9ODVt9gOmFcOjOZCEYD8ZPTQ=" }, - "com/diffplug/spotless#spotless-lib/3.0.2": { - "jar": "sha256-P5p/38WwOsIIlINBcJEMFcTyuE7UzjZ3iYowetWJg3w=", - "module": "sha256-E1WLrsCR6gDxYmXNNSOBePT+ejv61zXel214XUF/ss0=", - "pom": "sha256-jxtFo4m6Jeel8DvZ8KS9BKp+dHXgku6C1VUJYrLPdV8=" + "com/diffplug/spotless#spotless-lib/4.0.0": { + "jar": "sha256-N40MNuxkPDeA+rUo52uvANqE/ZRKp1epM/Z3rCg9M84=", + "module": "sha256-92+01yygh52jJV5JO6u5d9b/zZjBRnpQ68oDHCqhBls=", + "pom": "sha256-+cBI1/AcYo5IvXJAaj3WVp2p1ic1wgv1Tf8/XwxdqAI=" }, - "com/diffplug/spotless#spotless-plugin-gradle/7.0.2": { - "jar": "sha256-WaNMT4SkjUyNkp4viZBjaeZUduwEmaQ96Hw+QSeXfNU=", - "module": "sha256-rxC8mydsNqlNcRh+kVhwJ1yyRVZTntzqGYpYL30Tsws=", - "pom": "sha256-JyVoPfbvTNSIr+sgANqJIpQcqQ513D49uFIupxWKaMQ=" + "com/diffplug/spotless#spotless-plugin-gradle/8.0.0": { + "jar": "sha256-SBsYKnFP49cVsGv7aNYcwSv5legJIsSSu+BJVp7ImSg=", + "module": "sha256-r/+o5mZMvgJa0XGjawqR2EoPmR66Ppyw8QBMOn5cDJk=", + "pom": "sha256-1bqWuk97BrrT2ObX/uAcy+vrA7tvvzoq509UApXddYU=" }, "com/fasterxml#oss-parent/38": { "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" @@ -139,9 +139,9 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "commons-codec#commons-codec/1.17.0": { - "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=", - "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" + "commons-codec#commons-codec/1.18.0": { + "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", + "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" }, "commons-io#commons-io/2.16.1": { "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", @@ -178,6 +178,9 @@ "org/apache/commons#commons-parent/69": { "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" }, + "org/apache/commons#commons-parent/79": { + "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" + }, "org/apache/logging#logging-parent/11.2.0": { "pom": "sha256-dya9j66DWy0BJIYRvLY+07qZj9TqUaxEJTv57UxyjeA=" }, @@ -246,16 +249,16 @@ "org/eclipse/jetty#jetty-bom/9.4.55.v20240627": { "pom": "sha256-plq2UZjcP22y/2kBBlc31UgL52e+wyDgFzqJB68LGdg=" }, - "org/eclipse/jgit#org.eclipse.jgit-parent/6.10.0.202406032230-r": { - "pom": "sha256-8tNTmgp5Iv15RwgsGQHSCQ2uB0mGsi2r2XO0OYzR6i4=" + "org/eclipse/jgit#org.eclipse.jgit-parent/7.3.0.202506031305-r": { + "pom": "sha256-EuCm1BYOBfIGFJVPhMPmemiCdBhQJTysHHTj+5nXmjQ=" }, - "org/eclipse/jgit#org.eclipse.jgit/6.10.0.202406032230-r": { - "jar": "sha256-Q/kvOttoGl8wBrl56NNBwSqM/YAp8ofEK88KgDd1Za4=", - "pom": "sha256-BVlUQr62ogYQi2c6qcZpLIPkHfGDF33GcROxzD9Sgd0=" + "org/eclipse/jgit#org.eclipse.jgit/7.3.0.202506031305-r": { + "jar": "sha256-xMTho+sa/p3Gqck7HIkG6qq5panNtcld5MyA7/TKDcE=", + "pom": "sha256-vWj77cwn8P6jA6dOS4JFmyRaL8IR0DZDrda/XpxYVyg=" }, - "org/eclipse/platform#org.eclipse.osgi/3.18.500": { - "jar": "sha256-gLJ11YN5cjspHqZQJJzDgJyPELNPeKr5iBMs1tQ0q04=", - "pom": "sha256-4o9b4Azk7Sx+SAnsrQW5UwfzWhflhWAHhri97juk2Wg=" + "org/eclipse/platform#org.eclipse.osgi/3.23.200": { + "jar": "sha256-jZQFjq0/RlGQAWaSSmd8O+tumW8HL6vzhf/dcFELxJM=", + "pom": "sha256-py2jWv3kgc2hDp2UsxpUwbkKe2hQqt5MmtnpVtdIWtA=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", @@ -413,6 +416,10 @@ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, @@ -496,10 +503,9 @@ "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" }, - "com/fazecast#jSerialComm/2.11.2": { - "jar": "sha256-IG2ScOZI3wMyR+deuECTpek9ePB8U+X+H6n8SmAaxXY=", - "module": "sha256-9ogHv84GSzOaAwFlbzbffC8GORkp7GKOyGyOMK7bufw=", - "pom": "sha256-jc/TZu3kSH1ZOSy+OvUaN3cUT09dRPinstTcvwBB38I=" + "com/fazecast#jSerialComm/2.11.3": { + "jar": "sha256-gL3emsm4iVTy4kmInJg/CSQkBymotuKtipbygFhfzYg=", + "pom": "sha256-8wwUda9nvVO6X1AE8bmHsVG1HKR7zWt8yronW58m9OY=" }, "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=", diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 305e68cac4e3..8d8517b6aa45 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -21,26 +21,26 @@ rustPlatform.buildRustPackage rec { pname = "slimevr"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "SlimeVR"; repo = "SlimeVR-Server"; tag = "v${version}"; - hash = "sha256-RYHt0njzzom1wrHTP/7ch/D+YZcixqOeLMcfsGi+Kg8="; + hash = "sha256-/7SQstUWnQcdzRZjY64PL2gfdstUqXhDmwUkCd6bhY4="; # solarxr fetchSubmodules = true; }; buildAndTestSubdir = "gui/src-tauri"; - cargoHash = "sha256-w2z+EQqkVGLmXQS+AzeJwkGG4ovpz9+ovmLOcUks734="; + cargoHash = "sha256-E825/tkIGphqSPHplDglQPHxPaz8+ZAICuQ/eYZuez4="; pnpmDeps = pnpm_9.fetchDeps { pname = "${pname}-pnpm-deps"; inherit version src; fetcherVersion = 1; - hash = "sha256-b0oCOjxrUQqWmUR6IzTEO75pvJZB7MQD14DNbQm95sA="; + hash = "sha256-EeIwEej2WiD2HGbZTgNoJTDL0t9H3mJ3+8qrPvgn8vY="; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { patches = [ # Upstream code uses Git to find the program version. (replaceVars ./gui-no-git.patch { - version = src.rev; + version = src.tag; }) # By default, SlimeVR will give a big warning about our `JAVA_TOOL_OPTIONS` changes. ./no-java-tool-options-warning.patch @@ -118,6 +118,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://slimevr.dev"; + changelog = "https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v${version}"; description = "App for facilitating full-body tracking in virtual reality"; longDescription = '' App for SlimeVR ecosystem. It orchestrates communication between multiple sensors and integrations, like SteamVR. diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix index b9a0f9e4ef04..1f400aa4e543 100644 --- a/pkgs/by-name/so/sonar-scanner-cli/package.nix +++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix @@ -76,6 +76,5 @@ maven.buildMavenPackage rec { license = lib.licenses.lgpl3Only; mainProgram = "sonar-scanner"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ peterromfeldhk ]; }; } diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 3db36aa85bbd..a9b51634a9b9 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -200,7 +200,6 @@ buildDotnetModule { homepage = "https://sonarr.tv"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - fadenb purcell tie niklaskorz diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index f6a2da6310f6..86e2dc3e1d7a 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -78,7 +78,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "spider"; maintainers = with lib.maintainers; [ j-mendez - KSJ2000 ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/sr/srec2bin/package.nix b/pkgs/by-name/sr/srec2bin/package.nix index 811399ea5e92..10431ad6b13a 100644 --- a/pkgs/by-name/sr/srec2bin/package.nix +++ b/pkgs/by-name/sr/srec2bin/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/srec2bin/srec"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ KSJ2000 ]; mainProgram = "srec2bin"; }; }) diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index f5b28e5ccb80..f8379d08d710 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sscg"; - version = "4.0.1"; + version = "4.0.3"; src = fetchFromGitHub { owner = "sgallagher"; repo = "sscg"; tag = "sscg-${finalAttrs.version}"; - hash = "sha256-SWsKYvUDnPuDZfoQGFhSDeYbeaWN0M8GuOfuAMn90gE="; + hash = "sha256-0t3ntUxfh1jFukWGwmdbt0axFfUiH1QEq6wFrGoI7Jk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix index 6179b456225c..033704c3aa79 100644 --- a/pkgs/by-name/ss/ssocr/package.nix +++ b/pkgs/by-name/ss/ssocr/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Seven Segment Optical Character Recognition"; homepage = "https://github.com/auerswal/ssocr"; license = licenses.gpl3; - maintainers = [ maintainers.kroell ]; mainProgram = "ssocr"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/su/supervise/package.nix b/pkgs/by-name/su/supervise/package.nix index 5df506576e4e..fdc54aac4c13 100644 --- a/pkgs/by-name/su/supervise/package.nix +++ b/pkgs/by-name/su/supervise/package.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { description = "Minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/by-name/sv/svaba/package.nix b/pkgs/by-name/sv/svaba/package.nix index 075f5cc7f394..97ed8268121b 100644 --- a/pkgs/by-name/sv/svaba/package.nix +++ b/pkgs/by-name/sv/svaba/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { mainProgram = "svaba"; license = licenses.gpl3; homepage = "https://github.com/walaj/svaba"; - maintainers = with maintainers; [ scalavision ]; platforms = platforms.linux; longDescription = '' SvABA is a method for detecting structural variants in sequencing data diff --git a/pkgs/by-name/sy/systemd-journal2gelf/package.nix b/pkgs/by-name/sy/systemd-journal2gelf/package.nix index 65ffe95cdf00..da4d9c8bbf42 100644 --- a/pkgs/by-name/sy/systemd-journal2gelf/package.nix +++ b/pkgs/by-name/sy/systemd-journal2gelf/package.nix @@ -29,7 +29,6 @@ buildGoModule { homepage = "https://github.com/parse-nl/SystemdJournal2Gelf"; license = licenses.bsd2; maintainers = with maintainers; [ - fadenb fpletz ]; mainProgram = "SystemdJournal2Gelf"; diff --git a/pkgs/by-name/tc/tclint/package.nix b/pkgs/by-name/tc/tclint/package.nix new file mode 100644 index 000000000000..abd467be283d --- /dev/null +++ b/pkgs/by-name/tc/tclint/package.nix @@ -0,0 +1,64 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + addBinToPathHook, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "tclint"; + version = "0.6.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nmoroze"; + repo = "tclint"; + tag = "v${version}"; + hash = "sha256-z0ytMK3xxqXZJTMuY2wiBFo8LXAUZZBb13kr/kXtyjI="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + pythonRelaxDeps = [ + "importlib-metadata" + "pathspec" + ]; + dependencies = with python3Packages; [ + importlib-metadata + pathspec + ply + pygls_1 + lsprotocol_2023 + tomli + voluptuous + ]; + + pythonImportsCheck = [ "tclint" ]; + + nativeCheckInputs = [ + addBinToPathHook + python3Packages.pytestCheckHook + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + disabledTestPaths = [ + # Fails to find lsprotocol in the sandbox, even when added to nativeCheckInputs + # RuntimeError: Client has been stopped. + # Captured stderr call: ModuleNotFoundError: No module named 'lsprotocol' + "tests/test_tclsp.py" + ]; + + meta = { + description = "Modern dev tools for Tcl. Includes a linter, formatter, and editor integration"; + homepage = "https://github.com/nmoroze/tclint"; + changelog = "https://github.com/nmoroze/tclint/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "tclint"; + }; +} diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix index d4bd6c1441de..112cda3154c9 100644 --- a/pkgs/by-name/tf/tfsec/package.nix +++ b/pkgs/by-name/tf/tfsec/package.nix @@ -38,7 +38,6 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab - peterromfeldhk ]; }; } diff --git a/pkgs/by-name/tr/truvari/package.nix b/pkgs/by-name/tr/truvari/package.nix index 826def39c1e5..054aa851baa7 100644 --- a/pkgs/by-name/tr/truvari/package.nix +++ b/pkgs/by-name/tr/truvari/package.nix @@ -87,7 +87,6 @@ python3Packages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ natsukium - scalavision ]; longDescription = '' Truvari is a benchmarking tool for comparison sets of SVs. diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 955c1b0b6d76..4f42e006eece 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -81,7 +81,6 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/vercel/turborepo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - dlip getchoo ]; mainProgram = "turbo"; diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix index b3b507d7cc9b..1a3ec5cbd7db 100644 --- a/pkgs/by-name/tw/twingate/package.nix +++ b/pkgs/by-name/tw/twingate/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { description = "Twingate Client"; homepage = "https://twingate.com"; license = licenses.unfree; - maintainers = with maintainers; [ tonyshkurenko ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/ue/uefi-firmware-parser/package.nix b/pkgs/by-name/ue/uefi-firmware-parser/package.nix index 2e89ab5bd478..e083241c177c 100644 --- a/pkgs/by-name/ue/uefi-firmware-parser/package.nix +++ b/pkgs/by-name/ue/uefi-firmware-parser/package.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/theopolis/uefi-firmware-parser"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ KSJ2000 ]; mainProgram = "uefi-firmware-parser"; }; } diff --git a/pkgs/by-name/uf/uftp/package.nix b/pkgs/by-name/uf/uftp/package.nix index 831493a3c622..f3298fcd7f5f 100644 --- a/pkgs/by-name/uf/uftp/package.nix +++ b/pkgs/by-name/uf/uftp/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { description = "Encrypted UDP based FTP with multicast"; homepage = "https://uftp-multicast.sourceforge.net/"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.fadenb ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index 9f60a186c07e..9299511a3be3 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/UltimateHackingKeyboard/agent"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ - ngiger nickcao ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/uh/uhk-udev-rules/package.nix b/pkgs/by-name/uh/uhk-udev-rules/package.nix index a1cd47327542..e0654a69831e 100644 --- a/pkgs/by-name/uh/uhk-udev-rules/package.nix +++ b/pkgs/by-name/uh/uhk-udev-rules/package.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation { meta = { description = "udev rules for UHK keyboards from https://ultimatehackingkeyboard.com"; inherit (uhk-agent.meta) license; - maintainers = [ lib.maintainers.ngiger ]; }; } diff --git a/pkgs/by-name/um/umoci/package.nix b/pkgs/by-name/um/umoci/package.nix index 7582019c9297..c6fe63b520ab 100644 --- a/pkgs/by-name/um/umoci/package.nix +++ b/pkgs/by-name/um/umoci/package.nix @@ -41,7 +41,6 @@ buildGoModule rec { description = "Modifies Open Container images"; homepage = "https://umo.ci"; license = licenses.asl20; - maintainers = with maintainers; [ zokrezyl ]; mainProgram = "umoci"; }; } diff --git a/pkgs/by-name/un/unyaffs/package.nix b/pkgs/by-name/un/unyaffs/package.nix index b5f8e0269ab8..14d9bdc68d39 100644 --- a/pkgs/by-name/un/unyaffs/package.nix +++ b/pkgs/by-name/un/unyaffs/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/whataday/unyaffs"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ KSJ2000 ]; mainProgram = "unyaffs"; }; }) diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index dbd5d8025002..450924cf87a3 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20251126014742"; + version = "20251202060244"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-Z2hsfQV9io66RLKAcUgr+JnXgmc5qhXKeeaGoh5/3+E="; + hash = "sha256-91MlLtoYaTPY5reN/3JTwLeOtaipQlQjPw6pxKjL7qw="; }; vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU="; meta = with lib; { diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index db82d1b6f456..82d23f812f49 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -56,7 +56,6 @@ buildGoModule rec { license = lib.licenses.asl20; mainProgram = "vcluster"; maintainers = with lib.maintainers; [ - peterromfeldhk qjoly ]; }; diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 39eb8edbddd8..1a7de8a6102d 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -20,23 +20,23 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.16.10"; + version = "0.16.11"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-4t0AscBe+TMhQ5SuzkBSgKrMXGs/2BvlRv8ke3pg+yo="; + hash = "sha256-gX7bUoIP4PU0wUOW3ciyjYAInX/6VLVcEBKdQIQyzDk="; }; apiDeps = fetchNpmDeps { src = "${finalAttrs.src}/typescript/api"; - hash = "sha256-4OgVCnw5th2TcXszVY5G9ENr3/Y/eR2Kd45DbUhQRNk="; + hash = "sha256-UsTpMR23UQBRseRo33nbT6z/UCjZByryWfn2AQSgm6U="; }; extensionManagerDeps = fetchNpmDeps { src = "${finalAttrs.src}/typescript/extension-manager"; - hash = "sha256-krDFHTG8irgVk4a79LMz148drLgy2oxEoHCKRpur1R4="; + hash = "sha256-wl8FDFB6Vl1zD0/s2EbU6l1KX4rwUW6dOZof4ebMMO8="; }; cmakeFlags = lib.mapAttrsToList lib.cmakeFeature { diff --git a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix new file mode 100644 index 000000000000..86e3afabdf0a --- /dev/null +++ b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "voicevox-onnxruntime"; + version = "1.17.3"; + + src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -r ./lib "$out/lib" + + runHook postInstall + ''; + + passthru.sources = + let + # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models + fetchArtifact = + { id, hash }: + fetchurl { + url = "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/voicevox_onnxruntime-${finalAttrs.version}/voicevox_onnxruntime-${id}-${finalAttrs.version}.tgz"; + inherit hash; + }; + in + { + "x86_64-linux" = fetchArtifact { + id = "linux-x64"; + hash = "sha256-crUof91I3IM6mSn26eOCbnk7VM4SAhgb6T9jgjoiL1g="; + }; + "aarch64-linux" = fetchArtifact { + id = "linux-arm64"; + hash = "sha256-J27twAe2lDJPWbw1ws+QQXJOt4ZghDemSfCW7eo5Q6k="; + }; + "x86_64-darwin" = fetchArtifact { + id = "osx-x86_64"; + hash = "sha256-We3IYCUtu39kzC63K9SykEpt98NfM9yAgkNbnxWlBd8="; + }; + "aarch64-darwin" = fetchArtifact { + id = "osx-arm64"; + hash = "sha256-ltfqGSigoVSFSS03YhOH31D0CnkuKmgX1N9z7NGFcfI="; + }; + }; + + meta = { + license = with lib.licenses; [ + mit + { + name = "VOICEVOX ONNX Runtime Terms of Use"; + url = "https://github.com/VOICEVOX/voicevox_resource/blob/main/onnxruntime/README.md"; + free = false; + redistributable = true; + } + ]; + maintainers = with lib.maintainers; [ + tomasajt + eljamm + ]; + platforms = lib.attrNames finalAttrs.passthru.sources; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/vo/voicevox-core/openjtalk.patch b/pkgs/by-name/vo/voicevox-core/openjtalk.patch new file mode 100644 index 000000000000..c35ca5705574 --- /dev/null +++ b/pkgs/by-name/vo/voicevox-core/openjtalk.patch @@ -0,0 +1,12 @@ +diff --git a/build.rs b/build.rs +index 3f1b971..72f722f 100644 +--- a/build.rs ++++ b/build.rs +@@ -6,6 +6,7 @@ use std::{ + }; + fn main() { + let mut cmake_conf = cmake::Config::new("open_jtalk"); ++ cmake_conf.define("FETCHCONTENT_SOURCE_DIR_OPENJTALK", "@openjtalk_src@"); + let target = env::var("TARGET").unwrap(); + let mut include_dirs: Vec = Vec::new(); + let cmake_conf = if target.starts_with("i686") { diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix index be6f1e0801b7..10e99f0c29d8 100644 --- a/pkgs/by-name/vo/voicevox-core/package.nix +++ b/pkgs/by-name/vo/voicevox-core/package.nix @@ -1,81 +1,111 @@ { lib, stdenv, - fetchurl, - unzip, - autoPatchelfHook, + callPackage, + runCommand, + rustPlatform, + fetchFromGitHub, + cmake, + pkg-config, + python3, + openssl, }: -stdenv.mkDerivation (finalAttrs: { +let + openjtalk-src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "open_jtalk"; + rev = "1.11"; # this is actually a branch. why? + hash = "sha256-SBLdQ8D62QgktI8eI6eSNzdYt5PmGo6ZUCKxd01Z8UE="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { pname = "voicevox-core"; - version = "0.15.9"; + version = "0.16.2"; + modelVersion = "0.16.1"; - src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox_core"; + tag = finalAttrs.version; + hash = "sha256-aRy9x6IzFDwL4HjhCW705LpkZ13/SJ25h45XbbXciy0="; + }; - nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + cargoHash = "sha256-8udiXUZGn3ZT7RvmZd/F5tLsCKi5QLPG3pzv7LFyLvQ="; - buildInputs = [ stdenv.cc.cc.lib ]; - - installPhase = '' - runHook preInstall - - install -Dm755 libonnxruntime.* libvoicevox_core.* -t $out/lib - install -Dm644 model/* -t $out/lib/model - install -Dm644 *.h -t $out/include - install -Dm644 README.txt -t $out/share/doc/voicevox-core - - runHook postInstall + postPatch = '' + cp -r --no-preserve=all ${openjtalk-src} ./openjtalk + substitute ${./openjtalk.patch} ./openjtalk.patch \ + --replace-fail "@openjtalk_src@" "$(pwd)/openjtalk" + patch -d $cargoDepsCopy/open_jtalk-sys-* -p1 < ./openjtalk.patch ''; - # When updating, run the following command to fetch all FODs: - # nix-build -A voicevox-core.sources --keep-going - passthru.sources = - let - # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models - fetchCoreArtifact = - { id, hash }: - fetchurl { - url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${id}-cpu-${finalAttrs.version}.zip"; - inherit hash; - }; - in - { - "x86_64-linux" = fetchCoreArtifact { - id = "linux-x64"; - hash = "sha256-dEikEQcGL6h59nTxY833XGBawUjceq8NxIUVhRdQ2I8="; - }; - "aarch64-linux" = fetchCoreArtifact { - id = "linux-arm64"; - hash = "sha256-92aZEb2bz7xXA4uSo3lWy/cApr88I+yNqDlAWo6nFpg="; - }; - "x86_64-darwin" = fetchCoreArtifact { - id = "osx-x64"; - hash = "sha256-/5MghfgI8wup+o+eYMgcjI9Mjkjt1NPuN0x3JnqAlxg="; - }; - "aarch64-darwin" = fetchCoreArtifact { - id = "osx-arm64"; - hash = "sha256-UrgI4dy/VQCLZ/gyMX0D0YPabtw3IA76CpjLmbFLQeY="; - }; + cargoBuildFlags = [ "-p voicevox_core_c_api" ]; + + # don't link onnxruntime directly + buildFeatures = [ "load-onnxruntime" ]; + + # setting this to anything disables trying to download onnxruntime + env.ORT_LIB_LOCATION = "dummy"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ openssl ]; + + doCheck = false; + + passthru.voicevox-onnxruntime = callPackage ./onnxruntime.nix { }; + + passthru.models = stdenv.mkDerivation { + pname = "voicevox-models"; + version = finalAttrs.modelVersion; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox_vvm"; + tag = finalAttrs.modelVersion; + hash = "sha256-OY+xuvNjgmH/bxhL61XJZ3JVOxyec6kifkoGD4eN7HA="; }; + nativeBuildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + # convert multipart zip archive into single file + python scripts/merge_vvm.py + mkdir -p "$out" + cp vvms/* "$out" + + runHook postInstall + ''; + }; + + passthru.wrapped = runCommand "voicevox-core-${finalAttrs.version}-wrapped" { } ( + '' + mkdir -p "$out"/lib + cp ${finalAttrs.finalPackage}/lib/* "$out"/lib + chmod -R +w "$out/lib" + ln -s ${finalAttrs.passthru.voicevox-onnxruntime}/lib/* "$out"/lib + ln -s ${finalAttrs.passthru.models} "$out"/lib/model + '' + # allow loading sibling onnxruntime library + + lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf --add-rpath '$ORIGIN' "$out"/lib/libvoicevox_core* + '' + ); + meta = { changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}"; description = "Core library for the VOICEVOX speech synthesis software"; homepage = "https://github.com/VOICEVOX/voicevox_core"; - license = with lib.licenses; [ - mit - { - name = "VOICEVOX Core Library Terms of Use"; - url = "https://github.com/VOICEVOX/voicevox_resource/blob/main/core/README.md"; - free = false; - redistributable = true; - } - ]; + license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ tomasajt eljamm ]; - platforms = lib.attrNames finalAttrs.passthru.sources; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix index 9bf523418e67..2995e9a6f85d 100644 --- a/pkgs/by-name/vo/voicevox-engine/package.nix +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "voicevox-engine"; - version = "0.24.1"; + version = "0.25.0"; pyproject = true; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox_engine"; tag = version; - hash = "sha256-WoHTv4VjLFJPIi47WETMQM8JmgBctAWlue8yKmi1+6A="; + hash = "sha256-ZthTXHXzexbffWoi8AKJrgX9/gd7fmKbYpCwuZZiQWQ="; }; patches = [ @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { kanalizer numpy platformdirs + psutil pydantic python-multipart pyworld @@ -52,6 +53,10 @@ python3Packages.buildPythonApplication rec { "fastapi-slim" ]; + pythonRelaxDeps = [ + "psutil" # at the time of writing, psutil has not reached version 7.1.1 + ]; + preConfigure = '' # copy demo metadata to temporary directory mv resources/character_info test_character_info @@ -73,7 +78,7 @@ python3Packages.buildPythonApplication rec { ''; makeWrapperArgs = [ - ''--add-flags "--voicelib_dir=${voicevox-core}/lib"'' + ''--add-flags "--voicelib_dir=${voicevox-core.wrapped}/lib"'' ]; preCheck = '' @@ -98,7 +103,7 @@ python3Packages.buildPythonApplication rec { owner = "VOICEVOX"; repo = "voicevox_resource"; tag = version; - hash = "sha256-4D9b5MjJQq+oCqSv8t7CILgFcotbNBH3m2F/up12pPE="; + hash = "sha256-yj3bwEB1qeoXAf3Dr02FF/HB6g7toAd2VUmR2937yzc="; }; pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { }; diff --git a/pkgs/by-name/vo/voicevox/hardcode-paths.patch b/pkgs/by-name/vo/voicevox/hardcode-paths.patch index 9fc62c5f6b72..013d2fa79489 100644 --- a/pkgs/by-name/vo/voicevox/hardcode-paths.patch +++ b/pkgs/by-name/vo/voicevox/hardcode-paths.patch @@ -11,15 +11,15 @@ index cc5e2b9..29140f8 100644 "executionArgs": [], "host": "http://127.0.0.1:50021" } -diff --git a/electron-builder.config.cjs b/electron-builder.config.cjs -index d2a21b4..7b338c0 100644 ---- a/electron-builder.config.cjs -+++ b/electron-builder.config.cjs -@@ -40,17 +40,6 @@ const isArm64 = process.arch === "arm64"; +diff --git a/build/electronBuilderConfig.ts b/build/electronBuilderConfig.ts +index 83dcc10..114fb9d 100644 +--- a/build/electronBuilderConfig.ts ++++ b/build/electronBuilderConfig.ts +@@ -45,17 +45,6 @@ const isArm64 = process.arch === "arm64"; // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A const extraFilePrefix = isMac ? "MacOS/" : ""; --const sevenZipFile = readdirSync(resolve(__dirname, "vendored", "7z")).find( +-const sevenZipFile = readdirSync(path.join(rootDir, "vendored", "7z")).find( - // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz - (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName), -); @@ -30,29 +30,29 @@ index d2a21b4..7b338c0 100644 - ); -} - - /** @type {import("electron-builder").Configuration} */ - const builderOptions = { + const builderOptions: ElectronBuilderConfiguration = { beforeBuild: async () => { -@@ -91,14 +80,6 @@ const builderOptions = { + if (existsSync(path.join(rootDir, "dist_electron"))) { +@@ -97,14 +86,6 @@ const builderOptions: ElectronBuilderConfiguration = { from: "build/README.txt", to: extraFilePrefix + "README.txt", }, - { - from: VOICEVOX_ENGINE_DIR, -- to: join(extraFilePrefix, "vv-engine"), +- to: path.join(extraFilePrefix, "vv-engine"), - }, - { -- from: resolve(__dirname, "vendored", "7z", sevenZipFile), +- from: path.join(rootDir, "vendored", "7z", sevenZipFile), - to: extraFilePrefix + sevenZipFile, - }, ], // electron-builder installer productName: "VOICEVOX", diff --git a/src/backend/electron/vvppFile.ts b/src/backend/electron/vvppFile.ts -index 7e152f1..1aaa8c4 100644 +index f649bf8..de2f3fa 100644 --- a/src/backend/electron/vvppFile.ts +++ b/src/backend/electron/vvppFile.ts -@@ -220,6 +220,7 @@ export class VvppFileExtractor { +@@ -224,6 +224,7 @@ export class VvppFileExtractor { } private getSevenZipPath(): string { @@ -60,3 +60,26 @@ index 7e152f1..1aaa8c4 100644 let sevenZipPath = import.meta.env.VITE_7Z_BIN_NAME; if (!sevenZipPath) { throw new Error("7z path is not defined"); +diff --git a/vite.config.ts b/vite.config.ts +index 3c9e029..c253a6a 100644 +--- a/vite.config.ts ++++ b/vite.config.ts +@@ -5,7 +5,6 @@ import { rm } from "node:fs/promises"; + import electronPlugin from "vite-plugin-electron/simple"; + import tsconfigPaths from "vite-tsconfig-paths"; + import vue from "@vitejs/plugin-vue"; +-import electronDefaultImport from "electron"; + import checker from "vite-plugin-checker"; + import { BuildOptions, defineConfig, loadEnv, Plugin } from "vite"; + import { quasar } from "@quasar/vite-plugin"; +@@ -17,9 +16,7 @@ import { + SourceFile, + } from "./tools/checkSuspiciousImports.js"; + +-// @ts-expect-error electronをelectron環境外からimportするとelectronのファイルパスが得られる。 +-// https://github.com/electron/electron/blob/a95180e0806f4adba8009f46124b6bb4853ac0a6/npm/index.js +-const electronPath = electronDefaultImport as string; ++const electronPath = "@electron_path@"; + + const nodeTestPaths = ["../tests/unit/**/*.node.{test,spec}.ts"]; + const browserTestPaths = ["../tests/unit/**/*.browser.{test,spec}.ts"]; diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index 3b6b99dd7137..5763fc217fd5 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -11,7 +11,7 @@ makeWrapper, moreutils, nodejs, - pnpm_9, + pnpm_10, _7zz, electron, @@ -19,21 +19,22 @@ }: let - pnpm = pnpm_9; + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "voicevox"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox"; tag = finalAttrs.version; - hash = "sha256-ploFrzxIseyUD7LINnFmshrg3QJV8KUkdbvDoJ/VkRk="; + hash = "sha256-s8+uHwqxK9my/850C52VT5kshlGrHOOHtopUlsowNeI="; }; patches = [ (replaceVars ./hardcode-paths.patch { + electron_path = lib.getExe electron; sevenzip_path = lib.getExe _7zz; voicevox_engine_path = lib.getExe voicevox-engine; }) @@ -41,11 +42,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # unlock the overly specific pnpm package version pin - jq 'del(.packageManager)' package.json | sponge package.json - - substituteInPlace package.json \ - --replace-fail "999.999.999" "$version" \ - --replace-fail ' && electron-builder --config electron-builder.config.cjs --publish never' "" + # and also set version to a proper value + jq "del(.packageManager) | .version = \"$version\"" package.json | sponge package.json ''; pnpmDeps = pnpm.fetchDeps { @@ -65,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ]; fetcherVersion = 1; - hash = "sha256-RKgqFmHQnjHS7yeUIbH9awpNozDOCCHplc/bmfxmMyg="; + hash = "sha256-no0oFhy7flet9QH4FEkPJdlwNq5YkjIx8Uat3M2ruKI="; }; nativeBuildInputs = [ @@ -96,11 +94,11 @@ stdenv.mkDerivation (finalAttrs: { chmod -R u+w electron-dist # note: we patched out the call to electron-builder in postPatch - pnpm run electron:build + pnpm run electron:build:compile pnpm exec electron-builder \ --dir \ - --config electron-builder.config.cjs \ + --config ./build/electronBuilderConfigLoader.cjs \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index f938a09527ad..0ac059754cbb 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -1,6 +1,8 @@ { lib, stdenv, + fetchurl, + undmg, autoPatchelfHook, runCommandLocal, curl, @@ -30,128 +32,55 @@ let pname = "wpsoffice-cn"; sources = import ./sources.nix; - version = sources.version; + version = if stdenv.hostPlatform.isDarwin then sources.darwin-version else sources.linux-version; fetch = - { - url, - hash, - }: - runCommandLocal "wpsoffice-cn-${version}.deb" + if stdenv.hostPlatform.isDarwin then + fetchurl + else { - outputHashAlgo = "sha256"; - outputHash = hash; + url, + hash, + }: + runCommandLocal "wpsoffice-cn-${version}.deb" + { + outputHashAlgo = "sha256"; + outputHash = hash; - nativeBuildInputs = [ - curl - coreutils - ]; + nativeBuildInputs = [ + curl + coreutils + ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - } - '' - readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b" + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + } + '' + readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b" - timestamp10=$(date '+%s') - md5hash=($(printf '%s' "$SECURITY_KEY${lib.removePrefix "https://wps-linux-personal.wpscdn.cn" url}$timestamp10" | md5sum)) + timestamp10=$(date '+%s') + md5hash=($(printf '%s' "$SECURITY_KEY${lib.removePrefix "https://wps-linux-personal.wpscdn.cn" url}$timestamp10" | md5sum)) - curl --retry 3 --retry-delay 3 "${url}?t=$timestamp10&k=$md5hash" > $out - ''; - - srcs = { - x86_64-linux = fetch sources.x86_64; - }; + curl --retry 3 --retry-delay 3 "${url}?t=$timestamp10&k=$md5hash" > $out + ''; src = - srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -in + fetch + sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -stdenv.mkDerivation { - inherit pname src version; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - alsa-lib - libjpeg - libtool - libxkbcommon - nss - nspr - udev - gtk3 - libgbm - libusb1 - unixODBC - libsForQt5.qtbase - xorg.libXdamage - xorg.libXtst - xorg.libXv - ]; - - dontWrapQtApps = true; - - stripAllList = [ "opt" ]; - - runtimeDependencies = map lib.getLib [ - cups - dbus - pango - ]; - - unpackPhase = '' - # Unpack the .deb file - ar x $src - tar -xf data.tar.xz - - # Remove unneeded files - rm -rf usr/share/{fonts,locale} - rm -f usr/bin/misc - rm -rf opt/kingsoft/wps-office/{desktops,INSTALL} - rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,nss*,dbus-1}.so* - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - - cp -r opt $out - cp -r usr/{bin,share} $out - - for i in $out/bin/*; do - substituteInPlace $i \ - --replace-fail /opt/kingsoft/wps-office $out/opt/kingsoft/wps-office - done - - for i in $out/share/applications/*; do - substituteInPlace $i \ - --replace-fail /usr/bin $out/bin - done - - runHook postInstall - ''; - - preFixup = '' - # dlopen dependency - patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so - # libmysqlclient dependency - patchelf --replace-needed libmysqlclient.so.18 libmysqlclient.so $out/opt/kingsoft/wps-office/office6/libFontWatermark.so - patchelf --add-rpath ${libmysqlclient}/lib/mariadb $out/opt/kingsoft/wps-office/office6/libFontWatermark.so - # fix et/wpp/wpspdf failure to launch with no mode configured - for i in $out/bin/*; do - substituteInPlace $i \ - --replace-fail '[ $haveConf -eq 1 ] &&' '[ ! $currentMode ] ||' - done - ''; - - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + }; meta = { description = "Office suite, formerly Kingsoft Office"; homepage = "https://www.wps.cn"; - platforms = [ "x86_64-linux" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; hydraPlatforms = [ ]; license = lib.licenses.unfree; @@ -162,6 +91,119 @@ stdenv.mkDerivation { pokon548 chillcicada ]; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + changelog = "https://linux.wps.cn/wpslinuxlog"; mainProgram = "wps"; }; -} +in + +if stdenv.hostPlatform.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + passthru + meta + ; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -a wpsoffice.app $out/Applications + + runHook postInstall + ''; + } + +else + stdenv.mkDerivation { + inherit + pname + version + src + passthru + meta + ; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + alsa-lib + libjpeg + libtool + libxkbcommon + nss + nspr + udev + gtk3 + libgbm + libusb1 + unixODBC + libsForQt5.qtbase + xorg.libXdamage + xorg.libXtst + xorg.libXv + ]; + + dontWrapQtApps = true; + + stripAllList = [ "opt" ]; + + runtimeDependencies = map lib.getLib [ + cups + dbus + pango + ]; + + unpackPhase = '' + # Unpack the .deb file + ar x $src + tar -xf data.tar.xz + + # Remove unneeded files + rm -rf usr/share/{fonts,locale} + rm -f usr/bin/misc + rm -rf opt/kingsoft/wps-office/{desktops,INSTALL} + rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,nss*,dbus-1}.so* + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + cp -r opt $out + cp -r usr/{bin,share} $out + + for i in $out/bin/*; do + substituteInPlace $i \ + --replace-fail /opt/kingsoft/wps-office $out/opt/kingsoft/wps-office + done + + for i in $out/share/applications/*; do + substituteInPlace $i \ + --replace-fail /usr/bin $out/bin + done + + runHook postInstall + ''; + + preFixup = '' + # dlopen dependency + patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so + # libmysqlclient dependency + patchelf --replace-needed libmysqlclient.so.18 libmysqlclient.so $out/opt/kingsoft/wps-office/office6/libFontWatermark.so + patchelf --add-rpath ${libmysqlclient}/lib/mariadb $out/opt/kingsoft/wps-office/office6/libFontWatermark.so + # fix et/wpp/wpspdf failure to launch with no mode configured + for i in $out/bin/*; do + substituteInPlace $i \ + --replace-fail '[ $haveConf -eq 1 ] &&' '[ ! $currentMode ] ||' + done + ''; + } diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix index dbc2c4fa3c06..edf71f7ff0db 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix @@ -1,9 +1,18 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-11-18 +# Last updated: 2025-11-27 { - version = "12.1.2.23578"; - x86_64 = { + linux-version = "12.1.2.23578"; + darwin-version = "12.1.24031"; + x86_64-linux = { url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/23578/wps-office_12.1.2.23578.AK.preread.sw_542488_amd64.deb"; hash = "sha256-IMklnH6rCPZFHElLFF6At5QdDg7Ut/lBZFw+oPwQYWc="; }; + x86_64-darwin = { + url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.24031/WPS_Office_12.1.24031(24031)_x64.dmg"; + hash = "sha256-i4i+o1OmgZdbPTkeRkqlATKnyC3L+tt9cdRQuH4VAXE="; + }; + aarch64-darwin = { + url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.24031/WPS_Office_12.1.24031(24031)_arm64.dmg"; + hash = "sha256-olOgQ8jzO/IFXGJc9YANPC12LoZhzbtSzXjyZXO9x84="; + }; } diff --git a/pkgs/by-name/wp/wpsoffice-cn/update.sh b/pkgs/by-name/wp/wpsoffice-cn/update.sh index af186c592407..50923b0f6aa9 100755 --- a/pkgs/by-name/wp/wpsoffice-cn/update.sh +++ b/pkgs/by-name/wp/wpsoffice-cn/update.sh @@ -8,27 +8,44 @@ export SSL_CERT_FILE=$NIX_SSL_CERT_FILE readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b" prefix="https://wps-linux-personal.wpscdn.cn" -payload=$(curl -s "https://www.wps.cn/product/wpslinux") +linux_payload=$(curl -s "https://linux.wps.cn") +darwin_payload=$(curl -s "https://mac.wps.cn") -version=$(echo "$payload" | grep -oP '(?<=banner_txt">)[^<]+') +linux_version=$(echo "$linux_payload" | grep -oP '(?<=banner_txt">)[^<]+') +darwin_version=$(echo "$darwin_payload" | grep -oP '(?<=\s)\d+(?:\.\d+)+(?=/)') -amd64_url=$(echo "$payload" | grep -oP "downLoad\('[^']*'" | head -1 | sed "s/downLoad('//;s/'$//") +linux_amd64_url=$(echo "$linux_payload" | grep -oP "downLoad\('[^']*'" | head -1 | sed "s/downLoad('//;s/'$//") +darwin_amd64_url="https://package.mac.wpscdn.cn/mac_wps_pkg/${darwin_version}/WPS_Office_${darwin_version}(${darwin_version##*.})_x64.dmg" +darwin_arm64_url="https://package.mac.wpscdn.cn/mac_wps_pkg/${darwin_version}/WPS_Office_${darwin_version}(${darwin_version##*.})_arm64.dmg" timestamp10=$(date '+%s') -amd64_md5hash=($(printf '%s' "$SECURITY_KEY${amd64_url#$prefix}$timestamp10" | md5sum)) +linux_amd64_md5hash=($(printf '%s' "$SECURITY_KEY${linux_amd64_url#$prefix}$timestamp10" | md5sum)) -amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$version.deb" "$amd64_url?t=$timestamp10&k=$amd64_md5hash") +linux_amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$linux_version.deb" "$linux_amd64_url?t=$timestamp10&k=$linux_amd64_md5hash") +darwin_amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$darwin_version.dmg" "$darwin_amd64_url") +darwin_arm64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$darwin_version.dmg" "$darwin_arm64_url") -amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$amd64_hash") +linux_amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$linux_amd64_hash") +darwin_amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_amd64_hash") +darwin_arm64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_arm64_hash") cat > sources.nix << EOF # Generated by ./update.sh - do not update manually! # Last updated: $(date +%F) { - version = "$version"; - x86_64 = { - url = "$amd64_url"; - hash = "$amd64_hash"; + linux-version = "$linux_version"; + darwin-version = "$darwin_version"; + x86_64-linux = { + url = "$linux_amd64_url"; + hash = "$linux_amd64_hash"; + }; + x86_64-darwin = { + url = "$darwin_amd64_url"; + hash = "$darwin_amd64_hash"; + }; + aarch64-darwin = { + url = "$darwin_arm64_url"; + hash = "$darwin_arm64_hash"; }; } EOF diff --git a/pkgs/by-name/xp/xpra-html5/package.nix b/pkgs/by-name/xp/xpra-html5/package.nix index be6336084ec8..4ae3a8d8c9a6 100644 --- a/pkgs/by-name/xp/xpra-html5/package.nix +++ b/pkgs/by-name/xp/xpra-html5/package.nix @@ -38,7 +38,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ - catern lucasew ]; }; diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix index a88e1e764391..a0c78180e6aa 100644 --- a/pkgs/by-name/xv/xv/package.nix +++ b/pkgs/by-name/xv/xv/package.nix @@ -10,17 +10,18 @@ libjpeg, jasper, libxrandr, + libexif, }: stdenv.mkDerivation rec { pname = "xv"; - version = "6.0.4"; + version = "6.1.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "sha256-5bhLMGdj7HJOsSOFjNO5s3wDA9XbPTwG+g7OSrKMMXk="; + sha256 = "sha256-bq9xEGQRzWZ3/Unu49q6EW9/XSCgpalyXn4l4Mg255g="; }; nativeBuildInputs = [ cmake ]; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { libjpeg jasper libxrandr + libexif ]; meta = { diff --git a/pkgs/by-name/y-/y-cruncher/package.nix b/pkgs/by-name/y-/y-cruncher/package.nix index ae5f35446e26..15bc83601618 100644 --- a/pkgs/by-name/y-/y-cruncher/package.nix +++ b/pkgs/by-name/y-/y-cruncher/package.nix @@ -68,6 +68,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ normalcea ]; mainProgram = "y-cruncher"; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 86fc651bbe41..9f700fc28a79 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -54,25 +54,25 @@ let # Zoom versions are released at different times per platform and often with different versions. # We write them on three lines like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.6.10.69071"; - versions.x86_64-darwin = "6.6.10.69071"; + versions.aarch64-darwin = "6.6.11.70003"; + versions.x86_64-darwin = "6.6.11.70003"; # This is the fallback version so that evaluation can produce a meaningful result. - versions.x86_64-linux = "6.6.10.5815"; + versions.x86_64-linux = "6.6.11.6052"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Bm5kMV/FgKPxd231h4/XX5zNVJH/TpHURK87fFdSwZA="; + hash = "sha256-meWo9KusBHO76oZERli1JKOEQFMrfCVOHUR3dh5pvPg="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-XgbCkuWH4VG8gcxHL56xuy2xmE5PXProW7wUDTk7E6U="; + hash = "sha256-OWPlZl40TICl14wnHnySSJqPLDmvkDREz42/Hv1nJY8="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-SvPAhv6Ja37aviG4Gh65FvDc9U4fUDKRJvvu8/tbxls="; + hash = "sha256-pFDxCVPVE4m7mhsyAWg62WOo7MX6cdVe/j8nNHKHpvs="; }; }; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 295f595a57b1..2d087781d1ba 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation { description = "Icons based on Breeze and Super Flat Remix"; homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; license = licenses.lgpl3; - maintainers = with maintainers; [ mounium ]; platforms = platforms.all; }; } diff --git a/pkgs/development/cuda-modules/packages/libcutensor.nix b/pkgs/development/cuda-modules/packages/libcutensor.nix index 0b193619021d..2572748a7df2 100644 --- a/pkgs/development/cuda-modules/packages/libcutensor.nix +++ b/pkgs/development/cuda-modules/packages/libcutensor.nix @@ -36,7 +36,6 @@ buildRedist (finalAttrs: { homepage = "https://developer.nvidia.com/cutensor"; changelog = "https://docs.nvidia.com/cuda/cutensor/latest/release_notes.html"; - maintainers = [ lib.maintainers.obsidian-systems-maintenance ]; license = _cuda.lib.licenses.cutensor; }; }) diff --git a/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix index 67bab4b3483c..467fc753d882 100644 --- a/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix +++ b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix @@ -44,7 +44,6 @@ let ''; license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; teams = [ lib.teams.cuda ]; }; }); diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 94360f89d706..e047d2e60f35 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -59,7 +59,6 @@ buildPythonPackage rec { changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; homepage = "https://github.com/vxgmichel/aioconsole"; license = licenses.gpl3Only; - maintainers = with maintainers; [ catern ]; mainProgram = "apython"; }; } diff --git a/pkgs/development/python-modules/ansible-pylibssh/default.nix b/pkgs/development/python-modules/ansible-pylibssh/default.nix index 9ca0f8fefd12..a5f68ffe3cdf 100644 --- a/pkgs/development/python-modules/ansible-pylibssh/default.nix +++ b/pkgs/development/python-modules/ansible-pylibssh/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/ansible/pylibssh"; changelog = "https://github.com/ansible/pylibssh/releases/tag/v${version}"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ geluk ]; }; } diff --git a/pkgs/development/python-modules/azure-containerregistry/default.nix b/pkgs/development/python-modules/azure-containerregistry/default.nix index 37d7173441ac..2c3e483c99b6 100644 --- a/pkgs/development/python-modules/azure-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-containerregistry/default.nix @@ -42,6 +42,5 @@ buildPythonPackage rec { description = "Microsoft Azure Container Registry client library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-containerregistry"; license = licenses.mit; - maintainers = with maintainers; [ peterromfeldhk ]; }; } diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix index ffc494ce6ff3..c7273b4964cc 100644 --- a/pkgs/development/python-modules/causal-conv1d/default.nix +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -62,7 +62,6 @@ buildPythonPackage rec { description = "Causal depthwise conv1d in CUDA with a PyTorch interface"; homepage = "https://github.com/Dao-AILab/causal-conv1d"; license = licenses.bsd3; - maintainers = with maintainers; [ cfhammill ]; # The package requires CUDA or ROCm, the ROCm build hasn't # been completed or tested, so broken if not using cuda. broken = !cudaSupport; diff --git a/pkgs/development/python-modules/deeptoolsintervals/default.nix b/pkgs/development/python-modules/deeptoolsintervals/default.nix index d3003ee0dc2b..d458f671f6ea 100644 --- a/pkgs/development/python-modules/deeptoolsintervals/default.nix +++ b/pkgs/development/python-modules/deeptoolsintervals/default.nix @@ -28,6 +28,5 @@ buildPythonPackage rec { homepage = "https://deeptools.readthedocs.io/en/develop"; description = "Helper library for deeptools"; license = licenses.mit; - maintainers = with maintainers; [ scalavision ]; }; } diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix index 6f6837c940f1..41a321cfefb7 100644 --- a/pkgs/development/python-modules/django-pglock/default.nix +++ b/pkgs/development/python-modules/django-pglock/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-pglock"; - version = "1.7.2"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "AmbitionEng"; repo = "django-pglock"; tag = version; - hash = "sha256-FKAIftHNpfGzED0nkrLv3gVhfS7lyqfwZ1mEKsw/Vc8="; + hash = "sha256-IXP7iZmGx0Odn73Tje/UkIpEkHCLhz42kLJppgy2nuU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 201c5546a2aa..7e60dc34252e 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { homepage = "https://github.com/owais/django-webpack-loader"; changelog = "https://github.com/django-webpack/django-webpack-loader/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ peterromfeldhk ]; }; } diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index f36ed73d6c36..43aa75b82a99 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -83,6 +83,5 @@ buildPythonPackage rec { homepage = "https://github.com/ecederstrand/exchangelib"; changelog = "https://github.com/ecederstrand/exchangelib/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/expandvars/default.nix b/pkgs/development/python-modules/expandvars/default.nix index 627093b5d5b1..63533d7f8a0c 100644 --- a/pkgs/development/python-modules/expandvars/default.nix +++ b/pkgs/development/python-modules/expandvars/default.nix @@ -33,6 +33,5 @@ buildPythonPackage rec { description = "Expand system variables Unix style"; homepage = "https://github.com/sayanarijit/expandvars"; license = licenses.mit; - maintainers = with maintainers; [ geluk ]; }; } diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index bf758df6f5e3..480c1389cb81 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -46,6 +46,5 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/immutables"; changelog = "https://github.com/MagicStack/immutables/releases/tag/v${version}"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index 339c062244c7..c375566b1848 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -37,6 +37,5 @@ buildPythonPackage rec { changelog = "https://github.com/noamgat/lm-format-enforcer/releases/tag/${src.tag}"; homepage = "https://github.com/noamgat/lm-format-enforcer"; license = licenses.mit; - maintainers = with maintainers; [ cfhammill ]; }; } diff --git a/pkgs/development/python-modules/mamba-ssm/default.nix b/pkgs/development/python-modules/mamba-ssm/default.nix index 54c45d18d90a..edbda8265577 100644 --- a/pkgs/development/python-modules/mamba-ssm/default.nix +++ b/pkgs/development/python-modules/mamba-ssm/default.nix @@ -70,7 +70,6 @@ buildPythonPackage rec { description = "Linear-Time Sequence Modeling with Selective State Spaces"; homepage = "https://github.com/state-spaces/mamba"; license = licenses.asl20; - maintainers = with maintainers; [ cfhammill ]; # The package requires CUDA or ROCm, the ROCm build hasn't # been completed or tested, so broken if not using cuda. broken = !cudaSupport; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 4f84eaea2641..1dfa66daed9d 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -63,7 +63,6 @@ buildPythonPackage rec { description = "Simple APIs to access any Amazon S3 compatible object storage server"; homepage = "https://github.com/minio/minio-py"; changelog = "https://github.com/minio/minio-py/releases/tag/${src.tag}"; - maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix index ff926ff5305e..395c92a70145 100644 --- a/pkgs/development/python-modules/mlx-lm/default.nix +++ b/pkgs/development/python-modules/mlx-lm/default.nix @@ -82,6 +82,5 @@ buildPythonPackage rec { platforms = [ "aarch64-darwin" ]; - maintainers = with lib.maintainers; [ ferrine ]; }; } diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 45cc91854ec7..4ba0c3baf3c9 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,21 +1,11 @@ { - lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - cmake, - pybind11, - setuptools, - - # buildInputs - abseil-cpp, - protobuf, - gtest, + onnx, # pkgs.onnx # dependencies ml-dtypes, numpy, + protobuf, typing-extensions, # tests @@ -24,32 +14,26 @@ pytestCheckHook, writableTmpDirAsHomeHook, }: +buildPythonPackage { + inherit (onnx) + pname + src # Needed for testing. + version + ; -let - gtestStatic = gtest.override { static = true; }; -in -buildPythonPackage rec { - pname = "onnx"; - version = "1.19.0"; - pyproject = true; + format = "wheel"; - src = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - tag = "v${version}"; - hash = "sha256-dDc7ugzQHcArf9TRcF9Ofv16jc3gqhMWCZrYKJ7Udfw="; - }; + dontUseWheelUnpack = true; - build-system = [ - cmake - protobuf - setuptools - ]; + postUnpack = '' + cp -rv "${onnx.dist}" "$sourceRoot/dist" + chmod +w "$sourceRoot/dist" + ''; buildInputs = [ - abseil-cpp - gtestStatic - pybind11 + # onnx must be included to avoid shrinking during fixupPhase removing the RUNPATH entry on + # onnx_cpp2py_export.cpython-*.so. + onnx ]; dependencies = [ @@ -66,26 +50,11 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - preConfigure = '' - # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set - # to lib64 and cmake incorrectly looks for the protobuf library in lib64 - export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" - export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a" - export ONNX_BUILD_TESTS=1 - ''; - - preBuild = '' - export MAX_JOBS=$NIX_BUILD_CORES - ''; - # The executables are just utility scripts that aren't too important postInstall = '' - rm -r $out/bin + rm -rv $out/bin ''; - # The setup.py does all the configuration - dontUseCmakeConfigure = true; - # detecting source dir as a python package confuses pytest preCheck = '' rm onnx/__init__.py @@ -98,18 +67,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - postCheck = '' - # run "cpp" tests - .setuptools-cmake-build/onnx_gtests - ''; - pythonImportsCheck = [ "onnx" ]; meta = { - description = "Open Neural Network Exchange"; - homepage = "https://onnx.ai"; - changelog = "https://github.com/onnx/onnx/releases/tag/v${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ acairncross ]; + # Explicitly inherit from ONNX's meta to avoid pulling in attributes added by stdenv.mkDerivation. + inherit (onnx.meta) + changelog + description + homepage + license + maintainers + ; }; } diff --git a/pkgs/development/python-modules/onnxslim/default.nix b/pkgs/development/python-modules/onnxslim/default.nix index a231ec0254e7..28eba0d1bb28 100644 --- a/pkgs/development/python-modules/onnxslim/default.nix +++ b/pkgs/development/python-modules/onnxslim/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { description = "Toolkit to Help Optimize Onnx Model"; homepage = "https://pypi.org/project/onnxslim/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ferrine ]; }; } diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index ff3de95d32e7..a8c2ff9d0724 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { mit asl20 ]; - maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 99e6a481e26e..c9d7f11aa6af 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -44,6 +44,5 @@ buildPythonPackage rec { homepage = "https://pdoc3.github.io/pdoc/"; license = lib.licenses.agpl3Plus; mainProgram = "pdoc"; - maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ce2ab2e57b44..1cb96a27a078 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -32,6 +32,5 @@ buildPythonPackage rec { homepage = "https://github.com/daviddrysdale/python-phonenumbers"; changelog = "https://github.com/daviddrysdale/python-phonenumbers/blob/v${version}/python/HISTORY.md"; license = licenses.asl20; - maintainers = with maintainers; [ fadenb ]; }; } diff --git a/pkgs/development/python-modules/pmw/default.nix b/pkgs/development/python-modules/pmw/default.nix index 98988926b21e..292fd677114e 100644 --- a/pkgs/development/python-modules/pmw/default.nix +++ b/pkgs/development/python-modules/pmw/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { description = "Toolkit for building high-level compound widgets in Python using the Tkinter module"; homepage = "https://pmw.sourceforge.net/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ mounium ]; }; } diff --git a/pkgs/development/python-modules/py2bit/default.nix b/pkgs/development/python-modules/py2bit/default.nix index c529e47f1fc9..c6c1006cd531 100644 --- a/pkgs/development/python-modules/py2bit/default.nix +++ b/pkgs/development/python-modules/py2bit/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { A python extension, written in C, for quick access to 2bit files. The extension uses lib2bit for file access. ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ scalavision ]; }; } diff --git a/pkgs/development/python-modules/pyairports/default.nix b/pkgs/development/python-modules/pyairports/default.nix index 6153be35d8ef..8b5918e7bf75 100644 --- a/pkgs/development/python-modules/pyairports/default.nix +++ b/pkgs/development/python-modules/pyairports/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { description = "Package which enables airport lookup by 3-letter IATA code"; homepage = "https://github.com/ozeliger/pyairports"; license = licenses.asl20; - maintainers = with maintainers; [ cfhammill ]; }; } diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index 02db5e236319..86c1a852e4f4 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { homepage = "https://github.com/deeptools/pyBigWig"; changelog = "https://github.com/deeptools/pyBigWig/releases/tag/${src.tag}"; license = licenses.mit; - maintainers = with maintainers; [ scalavision ]; }; } diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 8b8be76b12e5..e70c6b87e30c 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { meta = with lib; { description = "High-level interface to Kerberos"; license = licenses.asl20; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 519b7fe40d5e..a017f9320c59 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -63,7 +63,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nidabdella - ferrine ]; }; } diff --git a/pkgs/development/python-modules/pysigma-backend-loki/default.nix b/pkgs/development/python-modules/pysigma-backend-loki/default.nix index 1ebd91d9c197..058fad6c4941 100644 --- a/pkgs/development/python-modules/pysigma-backend-loki/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-loki/default.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { description = "Library to support the loki backend for pySigma"; homepage = "https://github.com/grafana/pySigma-backend-loki"; license = with licenses; [ lgpl21Only ]; - maintainers = with maintainers; [ peterromfeldhk ]; }; } diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index d49dcbc7f087..40134295ee7a 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -177,7 +177,6 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin - ferrine ]; }; } diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix index 71fddc53da0a..3976e1996a2c 100644 --- a/pkgs/development/python-modules/python-logstash/default.nix +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -20,7 +20,6 @@ buildPythonPackage rec { meta = with lib; { description = "Python logging handler for Logstash"; homepage = "https://github.com/vklochan/python-logstash"; - maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index b4c3731a76cb..e5b132bb885b 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { homepage = "https://github.com/seveas/python-prctl"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 17ff2702c781..04006a4684c6 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -44,6 +44,5 @@ buildPythonPackage rec { description = "Authentication handler for using Kerberos with Python Requests"; homepage = "https://github.com/requests/requests-kerberos"; license = licenses.isc; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index 0ce1066b03a6..4c935c62372d 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { homepage = "https://github.com/msabramo/requests-unixsocket"; changelog = "https://github.com/msabramo/requests-unixsocket/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix index d626f55d6709..8da11f1551e4 100644 --- a/pkgs/development/python-modules/sagemaker-mlflow/default.nix +++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix @@ -17,21 +17,16 @@ buildPythonPackage rec { pname = "sagemaker-mlflow"; - version = "0.1.1"; + version = ".0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-mlflow"; tag = "v${version}"; - hash = "sha256-mHwlP1bVkUiT6RbVf8YLHG+tzkw5+UVrPzcExgcEoJM="; + hash = "sha256-EmfEqL+J+cZVdBfUJtAPHpUZCoDV4X1yRfVJYWky1HU="; }; - postPatch = '' - substituteInPlace VERSION \ - --replace-fail "${version}.dev0" "${version}" - ''; - build-system = [ setuptools ]; @@ -41,9 +36,7 @@ buildPythonPackage rec { mlflow ]; - pythonImportsCheck = [ - "sagemaker_mlflow" - ]; + pythonImportsCheck = [ "sagemaker_mlflow" ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index ecfe86b2e352..f7fdef8685ed 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, @@ -17,29 +16,17 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "shapely"; repo = "shapely"; tag = version; - hash = "sha256-qIITlPym92wfq0byqjRxofpmYYg7vohbi1qPVEu6hRg="; + hash = "sha256-tnnOJsAI3v52ngFOIUIkeDuRIu2JlZGuHreVv4W8LeE="; }; - patches = [ - # Fix tests for GEOS 3.14 - (fetchpatch { - url = "https://github.com/shapely/shapely/commit/a561132c4e13c1fde597f56a8a7133c3c09b9928.patch"; - hash = "sha256-a9gDfw2Dw+fd82T9f0BufYd/+gxE+ALvWyLm4vHygzU="; - }) - (fetchpatch { - url = "https://github.com/shapely/shapely/commit/56e16e6eb27c54c6c24b9a251c12414e289fb7d0.patch"; - hash = "sha256-JyjPVcJswEozF4C73QotKsPou55H41Ct9oVgkxhDhbk="; - }) - ]; - nativeBuildInputs = [ cython geos # for geos-config diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 9184391af91b..f205e8e60c2d 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { homepage = "https://github.com/da4089/simplefix"; changelog = "https://github.com/da4089/simplefix/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/supervise-api/default.nix b/pkgs/development/python-modules/supervise-api/default.nix index 841663678e56..f7c8ebf7971c 100644 --- a/pkgs/development/python-modules/supervise-api/default.nix +++ b/pkgs/development/python-modules/supervise-api/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { homepage = "https://github.com/catern/supervise"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 99a6a5e5d221..24bac8624a52 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -107,6 +107,5 @@ buildPythonPackage rec { mit asl20 ]; - maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index d9d403e74b97..e909c4868252 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -49,6 +49,5 @@ buildPythonPackage rec { mit asl20 ]; - maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix index 74510a31f128..8d966664098c 100644 --- a/pkgs/development/python-modules/ttach/default.nix +++ b/pkgs/development/python-modules/ttach/default.nix @@ -30,6 +30,5 @@ buildPythonPackage rec { description = "Image Test Time Augmentation with PyTorch"; homepage = "https://github.com/qubvel/ttach"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ cfhammill ]; }; } diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 5f569085bdc6..4c63bb18b3fc 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "wagtail"; - version = "7.2"; + version = "7.2.1"; pyproject = true; # The GitHub source requires some assets to be compiled, which in turn @@ -40,7 +40,7 @@ buildPythonPackage rec { # until https://github.com/wagtail/wagtail/pull/13136 gets merged. src = fetchPypi { inherit pname version; - hash = "sha256-ijnfkIvWSrAp4IvxkfR19UzJFPhKpB6a55tBv0HVXsM="; + hash = "sha256-OIu0LEgYwIGk3fNub0Upv7xU7SYqkbZbDl+VFHbyz3Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/wagtail/tests.nix b/pkgs/development/python-modules/wagtail/tests.nix index dc65d54a0d4f..7f44c13aed74 100644 --- a/pkgs/development/python-modules/wagtail/tests.nix +++ b/pkgs/development/python-modules/wagtail/tests.nix @@ -11,6 +11,7 @@ python-dateutil, python, pytz, + responses, wagtail, wagtail-factories, }: @@ -34,6 +35,7 @@ buildPythonPackage { msrest python-dateutil pytz + responses wagtail wagtail-factories ]; diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 8dfeb074c16b..679fdd4e62e2 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -148,8 +148,8 @@ buildPythonPackage rec { ''; # The majority of the tests require a graphical environment, but xvfb-run is available only on Linux. - # Tests on aarch64-linux fail randomly on OfBorg. - doCheck = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux; + # Tests fail randomly on OfBorg and Hydra. + doCheck = false; checkPhase = let diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 04937aa0e725..f31dc8c4c783 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.11.2"; + version = "1.11.3"; pyproject = true; src = fetchFromGitHub { owner = "sigma67"; repo = "ytmusicapi"; tag = version; - hash = "sha256-Q7+vc8wc4imHBHImAvxQZHkk3dT4HM3BifDivNjCMtU="; + hash = "sha256-q0VVoKj0N9dvp57Qah4Aeba/JG29Wp8ptIuHz8AvLeM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index c32239120ba7..13604180ae22 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -23,7 +23,6 @@ buildPythonPackage rec { meta = with lib; { description = "Verifying Yubico OTPs based on the validation protocol version 2.0"; homepage = "https://github.com/Kami/python-yubico-client/"; - maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.bsd3; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 13c7ce8e3979..8f5b8d607c3a 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -32,7 +32,6 @@ let homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ - fadenb basvandijk dfithian ]; diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix index 1b7dfe28a073..98eba39d5384 100644 --- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix @@ -43,6 +43,5 @@ buildHomeAssistantComponent rec { description = "Controlling Yandex.Station and other smart home devices with Alice from Home Assistant"; homepage = "https://github.com/AlexxIT/YandexStation"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ferrine ]; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix index bf240083f806..9a478cbc399f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-logs-datasource"; - version = "0.21.1"; - zipHash = "sha256-mhGxUt+JWX4i/CYcJOAYpCszF4F2ieaosERVoFUg/mU="; + version = "0.22.3"; + zipHash = "sha256-j4cH6b3nZcl9rWrUXBox/EaEm8V7KHXvFAOMRw+9fzU="; meta = { description = "Grafana datasource for VictoriaLogs"; license = lib.licenses.asl20; diff --git a/pkgs/shells/fish/plugins/bass.nix b/pkgs/shells/fish/plugins/bass.nix index f14be816f7af..d651f9f3af7b 100644 --- a/pkgs/shells/fish/plugins/bass.nix +++ b/pkgs/shells/fish/plugins/bass.nix @@ -30,6 +30,5 @@ buildFishPlugin rec { description = "Fish function making it easy to use utilities written for Bash in Fish shell"; homepage = "https://github.com/edc/bass"; license = licenses.mit; - maintainers = with maintainers; [ beezow ]; }; } diff --git a/pkgs/shells/nushell/plugins/semver.nix b/pkgs/shells/nushell/plugins/semver.nix index a02cad83c534..8ee173376782 100644 --- a/pkgs/shells/nushell/plugins/semver.nix +++ b/pkgs/shells/nushell/plugins/semver.nix @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ koffydrop ]; mainProgram = "nu_plugin_semver"; - platforms = lib.platforms.linux; }; }) diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix index 2e5376442c88..05932f950772 100644 --- a/pkgs/tools/admin/pulumi-bin/default.nix +++ b/pkgs/tools/admin/pulumi-bin/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation { platforms = builtins.attrNames data.pulumiPkgs; maintainers = with maintainers; [ ghuntley - peterromfeldhk jlesquembre cpcloud wrbbz diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 4f5e5d1e7bc0..95b0c09039e6 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -32,7 +32,6 @@ let nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = graylogPackage.meta.platforms; - maintainers = (a.meta.maintainers or [ ]) ++ [ maintainers.fadenb ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6051daa09f6a..4bbc973724f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11087,7 +11087,11 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; - onnx = callPackage ../development/python-modules/onnx { }; + onnx = callPackage ../development/python-modules/onnx { + onnx = pkgs.onnx.override { + python3Packages = self; + }; + }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { };